.gitignore

@@ -1 +1 @@
-SOURCES/trace-cmd-v2.9.2.tar.gz
+SOURCES/trace-cmd-v3.3.1.tar.gz

.trace-cmd.metadata

@@ -1 +1 @@
-46cdc142262b2e4f7a4eb8aa192b601bbc6238eb SOURCES/trace-cmd-v2.9.2.tar.gz
+64519b528debd300fe6734767b314df8d534994f SOURCES/trace-cmd-v3.3.1.tar.gz

SOURCES/trace-cmd-Fix-broken-profile-command.patch

@@ -1,35 +0,0 @@
-From 7e12e8ba4001f51869f28770246f0ac3dbfb9999 Mon Sep 17 00:00:00 2001
-From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
-Date: Fri, 14 May 2021 10:52:41 +0300
-Subject: [PATCH] trace-cmd: Fix broken profile command
-
-Recent changes in creating trace.dat files broke the streams, used
-internaly by the trace-cmd profile command.
-
-Link: https://lore.kernel.org/linux-trace-devel/20210514075241.65418-1-tz.stoyanov@gmail.com
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213045
-Reported-by: Jerome Marchand  <jmarchan@redhat.com>
-Fixes: 1762536da ("trace-cmd: Have tracecmd_read_headers() specify the state to read up to")
-Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
----
- tracecmd/trace-stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tracecmd/trace-stream.c b/tracecmd/trace-stream.c
-index f503bf7..b47b208 100644
---- a/tracecmd/trace-stream.c
-+++ b/tracecmd/trace-stream.c
-@@ -59,7 +59,7 @@ trace_stream_init(struct buffer_instance *instance, int cpu, int fd, int cpus,
- 		goto fail;
- 	}
- 
--	if (tracecmd_read_headers(trace_input, 0) < 0)
-+	if (tracecmd_read_headers(trace_input, TRACECMD_FILE_PRINTK) < 0)
- 		goto fail_free_input;
- 
- 	if (handle_init)
--- 
-2.31.1
-

SOURCES/trace-cmd-dump-Prevent-buffer-overrun-in-dump_clock.patch

@@ -0,0 +1,34 @@
+From 7a0d3baf2ab09f7a729e4de592b784e307caa70f Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:13 +0100
+Subject: [PATCH 4/8] trace-cmd dump: Prevent buffer overrun in dump_clock()
+
+The clock isn't big enough to hold the string with the null
+terminating character. Worse, clock[size], which is out of range, is
+set to 0. Allocate a big enough buffer.
+
+Fixes an OVERRUN error (CWE-119)
+
+Link: https://lore.kernel.org/20241029080117.625177-5-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-dump.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tracecmd/trace-dump.c b/tracecmd/trace-dump.c
+index 11c1baf1..0a21356e 100644
+--- a/tracecmd/trace-dump.c
++++ b/tracecmd/trace-dump.c
+@@ -961,7 +961,7 @@ static void dump_clock(int fd)
+ 	}
+ 	if (read_file_number(fd, &size, 8))
+ 		die("cannot read clock size");
+-	clock = calloc(1, size);
++	clock = calloc(1, size + 1);
+ 	if (!clock)
+ 		die("cannot allocate clock %lld bytes", size);
+ 
+-- 
+2.47.0
+

SOURCES/trace-cmd-lib-Check-the-return-value-of-do_lseek-in-.patch

@@ -0,0 +1,36 @@
+From ea419e8e8f5e56c166b14aef26be814daebe2832 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:12 +0100
+Subject: [PATCH 3/8] trace-cmd lib: Check the return value of do_lseek() in
+ trace_get_options()
+
+Check that do_lseek doesn't fail before calling malloc() with a -1
+argument.
+
+This is flagged as an overrun error (CWE-119) by static anaysis
+because of the call to read() later, but I don't imagine that malloc
+would succeed.
+
+Link: https://lore.kernel.org/20241029080117.625177-4-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ lib/trace-cmd/trace-output.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
+index 66e11ddc..8bc9325c 100644
+--- a/lib/trace-cmd/trace-output.c
++++ b/lib/trace-cmd/trace-output.c
+@@ -2070,6 +2070,8 @@ __hidden void *trace_get_options(struct tracecmd_output *handle, size_t *len)
+ 	}
+ 
+ 	offset = do_lseek(&out_handle, 0, SEEK_CUR);
++	if (offset == (off_t)-1)
++		goto out;
+ 	buf = malloc(offset);
+ 	if (!buf)
+ 		goto out;
+-- 
+2.47.0
+

SOURCES/trace-cmd-lib-Prevent-a-memory-leak-in-handle_option.patch

@@ -0,0 +1,57 @@
+From 3be4066b9a9c6a76a824fc7a7a6a983fd23088a7 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:10 +0100
+Subject: [PATCH 1/8] trace-cmd lib: Prevent a memory leak in handle_options()
+
+Buf isn't always fred in the error path. Instead of freing buf at the
+end of the loop, free it in the exit path and before reallocating it.
+
+Fixes a RESOURCE_LEAK error (CWE-772)
+
+Link: https://lore.kernel.org/20241029080117.625177-2-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ lib/trace-cmd/trace-input.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
+index 8b6e3d0c..ad662fc6 100644
+--- a/lib/trace-cmd/trace-input.c
++++ b/lib/trace-cmd/trace-input.c
+@@ -4006,7 +4006,7 @@ static int handle_options(struct tracecmd_input *handle)
+ 	char *cpustats = NULL;
+ 	struct hook_list *hook;
+ 	bool compress = false;
+-	char *buf;
++	char *buf = NULL;
+ 	int cpus;
+ 	int ret;
+ 
+@@ -4036,6 +4036,7 @@ static int handle_options(struct tracecmd_input *handle)
+ 		ret = read4(handle, &size);
+ 		if (ret)
+ 			goto out;
++		free(buf);
+ 		buf = malloc(size);
+ 		if (!buf) {
+ 			ret = -ENOMEM;
+@@ -4189,14 +4190,12 @@ static int handle_options(struct tracecmd_input *handle)
+ 			tracecmd_warning("unknown option %d", option);
+ 			break;
+ 		}
+-
+-		free(buf);
+-
+ 	}
+ 
+ 	ret = 0;
+ 
+ out:
++	free(buf);
+ 	if (compress)
+ 		in_uncompress_reset(handle);
+ 	return ret;
+-- 
+2.47.0
+

SOURCES/trace-cmd-lib-Prevent-memory-leak-in-tracecmd_create.patch

@@ -0,0 +1,33 @@
+From cbe42ab193ac866e9a6644b8509ab341a8aa474d Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:15 +0100
+Subject: [PATCH 6/8] trace-cmd lib: Prevent memory leak in
+ tracecmd_create_event_hook()
+
+Free hook and hook->str in the error path.
+
+Fixes a RESOURCE_LEAK error (CWE-772)
+
+Link: https://lore.kernel.org/20241029080117.625177-7-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ lib/trace-cmd/trace-hooks.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/trace-cmd/trace-hooks.c b/lib/trace-cmd/trace-hooks.c
+index a58b5356..aa12f6e9 100644
+--- a/lib/trace-cmd/trace-hooks.c
++++ b/lib/trace-cmd/trace-hooks.c
+@@ -151,6 +151,8 @@ struct hook_list *tracecmd_create_event_hook(const char *arg)
+ 
+ invalid_tok:
+ 	tracecmd_warning("Invalid hook format '%s'", arg);
++	free(hook->str);
++	free(hook);
+ 	return NULL;
+ }
+ 
+-- 
+2.47.0
+

SOURCES/trace-cmd-mem-Prevent-a-memory-leak-in-trace_mem.patch

@@ -0,0 +1,36 @@
+From b0e1a9c5c099282d30fee8f6aa89bd12ce5e8a73 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:16 +0100
+Subject: [PATCH 7/8] trace-cmd mem: Prevent a memory leak in trace_mem()
+
+Close the tracecmd handle in the error path.
+
+Fixes a RESOURCE_LEAK error (CWE-772)
+
+Link: https://lore.kernel.org/20241029080117.625177-8-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-mem.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c
+index 3e1ac9f3..b8babbbc 100644
+--- a/tracecmd/trace-mem.c
++++ b/tracecmd/trace-mem.c
+@@ -554,10 +554,8 @@ void trace_mem(int argc, char **argv)
+ 		die("can't open %s\n", input_file);
+ 
+ 	ret = tracecmd_read_headers(handle, 0);
+-	if (ret)
+-		return;
+-
+-	do_trace_mem(handle);
++	if (!ret)
++		do_trace_mem(handle);
+ 
+ 	tracecmd_close(handle);
+ }
+-- 
+2.47.0
+

SOURCES/trace-cmd-record-Check-the-length-of-the-protocol-ve.patch

@@ -0,0 +1,39 @@
+From 75d8bba90d8b4cbe1a80381f1dfbd80cbb0fbd60 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:17 +0100
+Subject: [PATCH 8/8] trace-cmd record: Check the length of the protocol
+ version received
+
+In check_protocol_version we compare the protocol version string with
+the expected one ("V3") with memcmp(). The received string could be
+longer than the constant string used for the comparison. That could
+lead to out of range access.
+
+Use the known length of the fixed "V3" string for the comparison and
+check that the received protocol version is not too short.
+
+Fixes a OVERRUN error (CWE-119)
+
+Link: https://lore.kernel.org/20241029080117.625177-9-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-record.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
+index d78c13c2..febf8578 100644
+--- a/tracecmd/trace-record.c
++++ b/tracecmd/trace-record.c
+@@ -3811,7 +3811,7 @@ static void check_protocol_version(struct tracecmd_msg_handle *msg_handle)
+ 		msg_handle->version = V1_PROTOCOL;
+ 		tracecmd_plog("Use the v1 protocol\n");
+ 	} else {
+-		if (memcmp(buf, "V3", n) != 0)
++		if (n < 3 || memcmp(buf, "V3", 3) != 0)
+ 			die("Cannot handle the protocol %s", buf);
+ 		/* OK, let's use v3 protocol */
+ 		write(fd, V3_MAGIC, sizeof(V3_MAGIC));
+-- 
+2.47.0
+

SOURCES/trace-cmd-record-Prevent-a-memory-leak-in-show_error.patch

@@ -0,0 +1,38 @@
+From 8e7de34bca5fdfcd8276116db4dd02308de0e194 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:11 +0100
+Subject: [PATCH 2/8] trace-cmd record: Prevent a memory leak in show_error()
+
+In show_error() the pointer p is used for several functions. At first,
+it contain a substring of path.
+
+Then it is replaced by either an allocated string containing the path
+to the error log file or the result of read_path(), neither of which
+are freed when exiting.
+
+Free p in both case in the exit path.
+
+Fixes a RESOURCE_LEAK error (CWE-772)
+
+Link: https://lore.kernel.org/20241029080117.625177-3-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-record.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
+index 0063d528..bdfa57b0 100644
+--- a/tracecmd/trace-record.c
++++ b/tracecmd/trace-record.c
+@@ -2374,6 +2374,7 @@ static void show_error(const char *file, const char *type)
+ 
+  out:
+ 	printf("Failed %s of %s\n", type, file);
++	free(p);
+ 	free(path);
+ 	return;
+ }
+-- 
+2.47.0
+

SOURCES/trace-cmd-record-Prevent-memory-leak-in-setup_networ.patch

@@ -0,0 +1,41 @@
+From e48db64dcb0dfddb6b8f6cd8624e1e2ff2c1302c Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Tue, 29 Oct 2024 09:01:14 +0100
+Subject: [PATCH 5/8] trace-cmd record: Prevent memory leak in setup_network()
+
+Because of the again label, msg_handle can be already allocated if we
+exit after we got a negative socket file descriptor. Free it there.
+Also unassign msg_handle->fd as to not double close sfd.
+
+Fixes a RESOURCE_LEAK error (CWE-772)
+
+Link: https://lore.kernel.org/20241029080117.625177-6-jmarchan@redhat.com
+Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+---
+ tracecmd/trace-record.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
+index bdfa57b0..d78c13c2 100644
+--- a/tracecmd/trace-record.c
++++ b/tracecmd/trace-record.c
+@@ -3904,6 +3904,7 @@ static struct tracecmd_msg_handle *setup_network(struct buffer_instance *instanc
+ 
+ 	if (sfd < 0) {
+ 		free(thost);
++		tracecmd_msg_handle_close(msg_handle);
+ 		return NULL;
+ 	}
+ 
+@@ -3934,6 +3935,7 @@ static struct tracecmd_msg_handle *setup_network(struct buffer_instance *instanc
+ 		if (msg_handle->version == V1_PROTOCOL) {
+ 			/* reconnect to the server for using the v1 protocol */
+ 			close(sfd);
++			msg_handle->fd = -1;
+ 			free(host);
+ 			host = NULL;
+ 			goto again;
+-- 
+2.47.0
+

SOURCES/trace-cmd-utils.mk-don-t-ignore-LDFLAGS-when-linking-the-share.patch

@@ -1,28 +0,0 @@
-From 31385f8933f00ddecfd4a00a578d7936186f75da Mon Sep 17 00:00:00 2001
-From: Jerome Marchand <jmarchan@redhat.com>
-Date: Thu, 11 Nov 2021 18:22:09 +0100
-Subject: [PATCH] utils.mk: don't ignore LDFLAGS when linking the shared libs
-
-do_compile_shared_library should't ignore LDFLAGS. That makes it
-difficult for packager to follow their distribution packaging
-guidelines.
----
- scripts/utils.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/utils.mk b/scripts/utils.mk
-index ae8c9e77..4a594a9c 100644
---- a/scripts/utils.mk
-+++ b/scripts/utils.mk
-@@ -72,7 +72,7 @@ do_build_static_lib =				\
- 
- do_compile_shared_library =			\
- 	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS))
-+	$(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LDFLAGS) $(LIBS))
- 
- do_compile_plugin_obj =				\
- 	($(print_plugin_obj_compile)		\
--- 
-2.31.1
-

SPECS/trace-cmd.spec

@@ -2,16 +2,15 @@
 #%%global git_commit trace-cmd-v2.6.2
 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36
 
-%global srcversion 2.9.2
+%global srcversion 3.3.1
 
 Name: trace-cmd
 Version: %{srcversion}
-Release: 10%{?dist}
-License: GPLv2 and LGPLv2
+Release: 1%{?dist}
+License: LGPL-2.1-only AND LGPL-2.1-or-later AND GPL-2.0-only AND GPL-2.0-or-later
 Summary: A user interface to Ftrace
-Requires: libtracecmd
-Requires: libtracefs
-Requires: libtraceevent
+
+ExcludeArch: %{ix86} %{arm}
 
 URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
 # If upstream does not provide tarballs, to generate:
@@ -22,27 +21,30 @@ Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/t
 Source1: trace-cmd.conf
 Source2: trace-cmd.service
 Source3: 98-trace-cmd.rules
-Patch0: trace-cmd-Fix-broken-profile-command.patch
-Patch1: trace-cmd-utils.mk-don-t-ignore-LDFLAGS-when-linking-the-share.patch
-Patch2: trace-cmd-Remove-last-elements-of-local-libtracefs-a.patch
+Patch0: trace-cmd-lib-Prevent-a-memory-leak-in-handle_option.patch
+Patch1: trace-cmd-record-Prevent-a-memory-leak-in-show_error.patch
+Patch2: trace-cmd-lib-Check-the-return-value-of-do_lseek-in-.patch
+Patch3: trace-cmd-dump-Prevent-buffer-overrun-in-dump_clock.patch
+Patch4: trace-cmd-record-Prevent-memory-leak-in-setup_networ.patch
+Patch5: trace-cmd-lib-Prevent-memory-leak-in-tracecmd_create.patch
+Patch6: trace-cmd-mem-Prevent-a-memory-leak-in-trace_mem.patch
+Patch7: trace-cmd-record-Check-the-length-of-the-protocol-ve.patch
 
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: xmlto
 BuildRequires: asciidoc
-BuildRequires: mlocate
 BuildRequires: graphviz doxygen
-BuildRequires: libxml2-devel
 BuildRequires: gcc-c++
-BuildRequires: desktop-file-utils
 BuildRequires: cmake
-BuildRequires: qt5-qtbase-devel
-BuildRequires: freeglut-devel
-BuildRequires: json-c-devel
-BuildRequires: libtraceevent-devel
-BuildRequires: libtracefs-devel
+BuildRequires: libtraceevent-devel >= 1.8.0
+BuildRequires: libtracefs-devel >= 1.8.0
+BuildRequires: audit-libs-devel
 BuildRequires: chrpath
+BuildRequires: swig
 BuildRequires: systemd-rpm-macros
+BuildRequires: libtracecmd-devel
+BuildRequires: libzstd-devel
 
 %description
 trace-cmd is a user interface to Ftrace. Instead of needing to use the
@@ -52,27 +54,11 @@ tracers and will record into a data file.
 %package python3
 Summary: Python plugin support for trace-cmd
 Requires: trace-cmd%{_isa} = %{version}-%{release}
-BuildRequires: swig
 BuildRequires: python3-devel
 
 %description  python3
 Python plugin support for trace-cmd
 
-%package -n libtracecmd
-Summary: Libraries of trace-cmd
-Version: 0
-
-%description -n libtracecmd
-The libtracecmd library
-
-%package -n libtracecmd-devel
-Summary: Development files for libtracecmd
-Version: 0
-Requires: libtracecmd%{_isa} = %{version}-%{release}
-
-%description -n libtracecmd-devel
-Development files of the libtracecmd library
-
 %prep
 %autosetup -p1 -n %{name}-v%{srcversion}
 cp %{SOURCE1} .
@@ -80,23 +66,19 @@ cp %{SOURCE2} .
 cp %{SOURCE3} .
 
 %build
-%set_build_flags
-export CFLAGS="%{optflags} -D_GNU_SOURCE"
-export BUILD_TYPE="Release"
-
 # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
 MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl`
-make V=1 MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL \
+CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags}" BUILD_TYPE=Release \
+  make V=9999999999 MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL \
   prefix=%{_prefix} libdir=%{_libdir} \
-  PYTHON_VERS=python3 all_cmd doc libs
+  PYTHON_VERS=python3 all_cmd doc
 for i in python/*.py ; do 
     sed -i 's/env python2/python3/g' $i
 done
-chrpath --delete tracecmd/trace-cmd lib/trace-cmd/libtracecmd.so.0.0.1
+chrpath --delete tracecmd/trace-cmd
 
 %install
-make V=1 libdir=%{_libdir} prefix=%{_prefix} DESTDIR=%{buildroot}/ \
-  install install_doc install_python install_libs
+make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/ CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs " BUILD_TYPE=Release install install_doc install_python
 find %{buildroot}%{_mandir} -type f | xargs chmod u-x,g-x,o-x
 find %{buildroot}%{_datadir} -type f | xargs chmod u-x,g-x,o-x
 find %{buildroot}%{_libdir} -type f -iname "*.so" | xargs chmod 0755
@@ -106,6 +88,8 @@ mkdir -p -m755 %{buildroot}/%{_udevrulesdir}/
 install -p -m 644 trace-cmd.conf %{buildroot}/%{_sysconfdir}/sysconfig/
 install -p -m 644 trace-cmd.service %{buildroot}/%{_unitdir}/
 install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
+rm -rf %{buildroot}/%{_docdir}/libtracecmd-doc
+rm -rf %{buildroot}/%{_mandir}/man3/*
 
 %preun
 %systemd_preun %{name}.service
@@ -115,6 +99,7 @@ install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
 %{_bindir}/trace-cmd
 %{_mandir}/man1/%{name}*
 %{_mandir}/man5/%{name}*
+%{_docdir}/trace-cmd/trace-cmd*.html
 %{_sysconfdir}/bash_completion.d/trace-cmd.bash
 %{_sysconfdir}/sysconfig/trace-cmd.conf
 %{_unitdir}/trace-cmd.service
@@ -124,45 +109,74 @@ install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/
 %doc Documentation/README.PythonPlugin
 %{_libdir}/%{name}/python/
 
-%files -n libtracecmd
-%doc COPYING COPYING.LIB README
-%{_libdir}/libtracecmd.so.0
-%{_libdir}/libtracecmd.so.0.0.1
-%{_docdir}/libtracecmd-doc
-%{_mandir}/man3/libtracecmd*
-%{_mandir}/man3/tracecmd*
+%changelog
+* Thu Nov 28 2024 Jerome Marchand <jmarchan@redhat.com> - 3.3.1-1
+- Rebase to 3.3.1 and backport further SAST patches (RHEL-40111)
 
-%files -n libtracecmd-devel
-%{_libdir}/pkgconfig/libtracecmd.pc
-%{_libdir}/libtracecmd.so
-%{_includedir}/trace-cmd
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.2-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-%changelog
-* Fri Jul 21 2023 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-10
-- Remove remaining trace of libtracefs and libtraceevent
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.2-4
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.2-4
+- Bump release for June 2024 mass rebuild
+
+* Mon Jun 03 2024 Jerome Marchand <jmarchan@redhat.com> - 3.2-3
+- Drop useless mlocate dependency (RHEL-39377)
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 23 2024 Zamir SUN <sztsian@gmail.com> - 3.2
+- Update to 3.2 (#2213350)
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 22 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 3.1.6-3
+- Remove lingering kernelshark dependencies
+
+* Mon Jun 05 2023 Zamir SUN <sztsian@gmail.com> - 3.1.6-2
+- SPDX migration
+
+* Tue Apr 18 2023 Zamir SUN <sztsian@gmail.com> - 3.1.6-1
+- Update to 3.1.6
+
+* Fri Mar 31 2023 Jerome Marchand <jmarchan@redhat.com> - 3.1.4-3
+- Fix build: RHBZ#2171770
+- Also remove explicit lib dependency that fedpkg lint complains about.
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Oct 11 2022 Zamir SUN <sztsian@gmail.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Thu Mar 31 2022 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-9
-- Add flight recorder service
+* Fri Apr 15 2022 Zamir SUN <sztsian@gmail.com> - 3.0.3-2
+- Get rid of the libtracecmd man pages
 
-* Fri Nov 12 2021 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-8
-- Fix remaining gating runpath failure
+* Wed Apr 13 2022 Zamir SUN <sztsian@gmail.com> - 3.0.3-1
+- Update to 3.0.3
 
-* Thu Nov 11 2021 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-7
-- Fix rpminspect gating failures (runpath and annocheck)
-- Specfile cleanups
+* Fri Mar 18 2022 KUDOH Takashi <t-kudoh@fujitsu.com> - 2.9.7-2
+- Add flight recoder service
 
-* Thu Nov 11 2021 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-6
-- Fix trace-cmd profile
+* Wed Feb 16 2022 Zamir SUN <sztsian@gmail.com> - 2.9.7-1
+- Update to 2.9.7
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.2-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Thu Apr 22 2021 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-4
-- Kernelshark rebuild
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Apr 23 2021 Jerome Marchand <jmarchan@redhat.com> - 2.9.2-3
+- Build w/o rpath as per Fedora packaging guideline
 
 * Mon Mar 29 2021 Zamir SUN <sztsian@gmail.com> - 2.9.2-2
 - Fix dependency of libtracecmd