开源软件构建与测试

_service:tar_scm:libtraceevent.spec Changed

@@ -1,5 +1,5 @@
 Name:	 	libtraceevent
-Version: 	1.8.3
+Version: 	1.8.2
 Release: 	1
 License: 	LGPLv2+ and GPLv2+
 Summary: 	Library to parse raw trace event formats
@@ -7,8 +7,6 @@
 URL: 	       	https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
 Source0:       	https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-%{version}.tar.gz
 
-Patch0000:      0001-fix-missing-fstack-protector-strong.patch
-
 BuildRequires: 	gcc
 BuildRequires: 	xmlto
 BuildRequires: 	asciidoc
@@ -26,12 +24,12 @@
 Development headers of %{name}-libs
 
 %prep
-%autosetup  -n %{name}-%{version} -p1
+%setup -q
 
 %build
 MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl`
-%set_build_flags
-%make_build prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc
+
+make -O -j1 V=1 VERBOSE=1 CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc
 
 %install
 %make_install prefix=%{_prefix} libdir=%{_libdir} install doc-install
@@ -55,8 +53,8 @@
 %{_libdir}/pkgconfig/libtraceevent.pc
 
 %changelog
-* Sun Jun 30 2024 shafeipaozi <sunbo.oerv@isrc.iscas.ac.cn> - 1.8.3-1
-- update to 1.8.3
+* Sun Jun 30 2024 shafeipaozi <sunbo.oerv@isrc.iscas.ac.cn> - 1.8.2-1
+- update to 1.8.2
 
 * Thu Jul 13 2023 liyanan <thistleslyn@163.com> - 1.2.1-4
 - Delete confilt with perf when the kernel is greater than 6.2

_service:tar_scm:0001-fix-missing-fstack-protector-strong.patch Deleted

@@ -1,39 +0,0 @@
-From abb3f67fc0bb0875cba471338be990262152d5bc Mon Sep 17 00:00:00 2001
-From: shafeipaozi <2829702579@qq.com>
-Date: Tue, 16 Jul 2024 01:26:55 +0800
-Subject: PATCH 2
-
----
- Makefile         | 2 +-
- plugins/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 41ad866..20ae048 100644
---- a/Makefile
-+++ b/Makefile
-@@ -127,7 +127,7 @@ export LIBTRACEEVENT_STATIC LIBTRACEEVENT_SHARED EP_HEADERS_DIR
- ifdef EXTRA_CFLAGS
-   CFLAGS := $(EXTRA_CFLAGS)
- else
--  CFLAGS := -g -Wall
-+  CFLAGS := -g -Wall -fstack-protector-strong
- endif
- 
- LIBS ?= -ldl
-diff --git a/plugins/Makefile b/plugins/Makefile
-index 4c8cb17..56b5646 100644
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -68,7 +68,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include -I $(EP_HEADERS_DIR) $(CONFIG
- ifdef EXTRA_CFLAGS
-   CFLAGS := $(EXTRA_CFLAGS)
- else
--  CFLAGS := -g -Wall
-+  CFLAGS := -g -Wall -fstack-protector-strong
- endif
- 
- # Append required CFLAGS
--- 
-2.42.0
-

_service:tar_scm:libtraceevent-1.8.3.tar.gz/Makefile -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/Makefile Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/meson.build -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/meson.build Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/plugins/meson.build -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/plugins/meson.build Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/src/event-parse.c -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/src/event-parse.c Changed

@@ -1232,11 +1232,9 @@
 	switch (type) {
 	case TEP_EVENT_NEWLINE:
 	case TEP_EVENT_DELIM:
-		*tok = malloc(2);
-		if (!*tok)
+		if (asprintf(tok, "%c", ch) < 0)
 			return TEP_EVENT_ERROR;
-		(*tok)0 = ch;
-		(*tok)1 = '\0';
+
 		return type;
 
 	case TEP_EVENT_OP:
@@ -2197,24 +2195,21 @@
 	return arg->op.prio;
 }
 
-static int consolidate_op_arg(enum tep_event_type type, struct tep_print_arg *arg)
+static int consolidate_op_arg(struct tep_print_arg *arg)
 {
 	unsigned long long val, left, right;
 	int ret = 0;
 
-	if (type == TEP_EVENT_ERROR)
-		return -1;
-
 	if (arg->type != TEP_PRINT_OP)
 		return 0;
 
 	if (arg->op.left)
-		ret = consolidate_op_arg(type, arg->op.left);
+		ret = consolidate_op_arg(arg->op.left);
 	if (ret < 0)
 		return ret;
 
 	if (arg->op.right)
-		ret = consolidate_op_arg(type, arg->op.right);
+		ret = consolidate_op_arg(arg->op.right);
 	if (ret < 0)
 		return ret;
 
@@ -2588,7 +2583,7 @@
 	if (type == TEP_EVENT_OP) {
 		type = process_op(event, field, &token);
 
-		if (consolidate_op_arg(type, field) < 0)
+		if (consolidate_op_arg(field) < 0)
 			type = TEP_EVENT_ERROR;
 
 		if (type == TEP_EVENT_ERROR)
@@ -2964,7 +2959,7 @@
 		free_arg(arg);
 		arg = alloc_arg();
 		if (!arg)
-			goto out_free_field;
+			goto out_free;
 
 		free_token(token);
 		type = process_arg(event, arg, &token);
@@ -3737,19 +3732,8 @@
 		arg->atom.atom = atom;
 		break;
 
-	case TEP_EVENT_SQUOTE:
-		arg->type = TEP_PRINT_ATOM;
-		/* Make characters into numbers */
-		if (asprintf(&arg->atom.atom, "%d", token0) < 0) {
-			free_token(token);
-			*tok = NULL;
-			arg->atom.atom = NULL;
-			return TEP_EVENT_ERROR;
-		}
-		free_token(token);
-		type = read_token_item(event->tep, &token);
-		break;
 	case TEP_EVENT_DQUOTE:
+	case TEP_EVENT_SQUOTE:
 		arg->type = TEP_PRINT_ATOM;
 		arg->atom.atom = token;
 		type = read_token_item(event->tep, &token);
@@ -3819,7 +3803,7 @@
 			type = process_op(event, arg, &token);
 			free_token(token);
 
-			if (consolidate_op_arg(type, arg) < 0)
+			if (consolidate_op_arg(arg) < 0)
 				type = TEP_EVENT_ERROR;
 
 			if (type == TEP_EVENT_ERROR) {

_service:tar_scm:libtraceevent-1.8.3.tar.gz/src/event-plugin.c -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/src/event-plugin.c Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/src/parse-filter.c -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/src/parse-filter.c Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/utest/trace-utest.c -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/utest/trace-utest.c Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/utest/traceevent-utest.c -> _service:tar_scm:libtraceevent-1.8.2.tar.gz/utest/traceevent-utest.c Changed

_service:tar_scm:libtraceevent-1.8.3.tar.gz/Makefile.meson Deleted

@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-undefine CFLAGS
-
-# Makefiles suck: This macro sets a default value of $(2) for the
-# variable named by $(1), unless the variable has been set by
-# environment or command line. This is necessary for CC and AR
-# because make sets default values, so the simpler ?= approach
-# won't work as expected.
-define allow-override
-  $(if $(or $(findstring environment,$(origin $(1))),\
-            $(findstring command line,$(origin $(1)))),,\
-    $(eval $(1) = $(2)))
-endef
-
-$(call allow-override,MESON,meson)
-$(call allow-override,MESON_BUILD_DIR,build)
-
-
-all: compile
-
-PHONY += compile
-compile: $(MESON_BUILD_DIR) force
-	$(MESON) compile -C $(MESON_BUILD_DIR)
-
-$(MESON_BUILD_DIR):
-	$(MESON) setup --prefix=$(prefix) $(MESON_BUILD_DIR)
-
-install: compile
-	$(MESON) install -C $(MESON_BUILD_DIR)
-
-docs: $(MESON_BUILD_DIR)
-	$(MESON) compile -C build docs
-
-PHONY += clean_meson
-clean_meson:
-	$(Q)$(RM) -rf $(MESON_BUILD_DIR)
-
-PHONY += force
-force:

Changes of Revision 3