Package: release.debian.org
Control: affects -1 + src:kernelshark
User: release.debian....@packages.debian.org
Usertags: pu
Tags: bookworm
Severity: normal

Upstream released a new version which contains two fixes:
- kernel-shark: Fix segfault in libkshark-tepdata
  
https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/commit/?id=9f2097c9669fb7d5f72351343f34fb86649d1365
- kernel-shark: Fix Capture if directory contains space
  
https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/commit/?id=e2dc994a60e539e2db3ea9dd58fb11bf18255051

The former is critical since a lot of traces are affected by this bug
which results in segfault of kernelshark. The latter is nice to have and
easy to review.
I didn't figure out why some traces are not affected and some are not.
Kurt tested the 2.2.1 version before reporting #1049866 and confirmed
that the problems are gone.
The 2.2.1 version has been uploaded to unstable and testing by Sudipm.
He also uploaded the 2.2.1 version to Bookworm-Backports. However given
the impact of the bug and code change I think it is best address it in
Bookworm. Otherwise every regular user has to figure out that it is
fixed in -bpo and enable it.

Besides the new upstream version, the update also contains an updated
package description. This package (kernelshark) is basically a fronted
for the output for the trace data recorded by trace-cmd and does not
contain the utility (as claimed by the package description).

I didn't do any additional changes compared to what is unstable. If this
update is approved then I would file a rm for the bpo version which is
superseded.

Sebastian
diff -Nru kernelshark-2.2.0/bin/kshark-su-record kernelshark-2.2.1/bin/kshark-su-record
--- kernelshark-2.2.0/bin/kshark-su-record	2023-01-21 11:42:13.000000000 +0100
+++ kernelshark-2.2.1/bin/kshark-su-record	2023-06-07 19:46:20.000000000 +0200
@@ -2,4 +2,4 @@
 
 xhost +si:localuser:root &>/dev/null
 
-pkexec kshark-record -o ${PWD}/trace.dat
+pkexec kshark-record -o "${PWD}/trace.dat"
diff -Nru kernelshark-2.2.0/CMakeLists.txt kernelshark-2.2.1/CMakeLists.txt
--- kernelshark-2.2.0/CMakeLists.txt	2023-01-21 11:42:13.000000000 +0100
+++ kernelshark-2.2.1/CMakeLists.txt	2023-06-07 19:46:20.000000000 +0200
@@ -7,7 +7,7 @@
 set(KS_APP_NAME "kernelshark")
 set(KS_VERSION_MAJOR 2)
 set(KS_VERSION_MINOR 2)
-set(KS_VERSION_PATCH 0)
+set(KS_VERSION_PATCH 1)
 set(KS_VERSION_STRING ${KS_VERSION_MAJOR}.${KS_VERSION_MINOR}.${KS_VERSION_PATCH})
 message("\n project: Kernel Shark: (version: ${KS_VERSION_STRING})\n")
 
diff -Nru kernelshark-2.2.0/debian/changelog kernelshark-2.2.1/debian/changelog
--- kernelshark-2.2.0/debian/changelog	2023-05-05 21:37:24.000000000 +0200
+++ kernelshark-2.2.1/debian/changelog	2023-09-02 15:29:41.000000000 +0200
@@ -1,3 +1,12 @@
+kernelshark (2.2.1-1~deb12u1) bookworm; urgency=medium
+
+  [ Sudip Mukherjee ]
+  * New upstream version 2.2.1 (Closes: #1049866)
+    - Update links for version update.
+  * Fix package description. (Closes: #1028585)
+
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc>  Sat, 02 Sep 2023 15:29:41 +0200
+
 kernelshark (2.2.0-2) unstable; urgency=medium
 
   * Fix symlink names. (Closes: #1035449)
diff -Nru kernelshark-2.2.0/debian/control kernelshark-2.2.1/debian/control
--- kernelshark-2.2.0/debian/control	2023-02-05 01:46:52.000000000 +0100
+++ kernelshark-2.2.1/debian/control	2023-08-16 22:00:24.000000000 +0200
@@ -29,9 +29,9 @@
 Depends: ${shlibs:Depends}, ${misc:Depends},
          trace-cmd (>= 2.9.3), fonts-freefont-ttf,
          pkexec
-Description: Utility for retrieving and analyzing function tracing in the kernel
- This package contains the trace-cmd utility. Trace-cmd makes it easy to
- retrieve and analyze function traces from the Linux kernel while it is running.
+Description: Utilities for graphically analyzing function tracing in the kernel
+ KernelShark is a front end reader of trace-cmd output. It reads a trace-cmd.dat
+ formatted file and produces a graph and list view of the data.
 
 Package: libkshark2
 Section: libs
diff -Nru kernelshark-2.2.0/debian/libkshark2.links kernelshark-2.2.1/debian/libkshark2.links
--- kernelshark-2.2.0/debian/libkshark2.links	2023-05-05 21:05:16.000000000 +0200
+++ kernelshark-2.2.1/debian/libkshark2.links	2023-08-16 21:55:47.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libkshark-gui.so.2.2.0 usr/lib/${DEB_HOST_MULTIARCH}/libkshark-gui.so.2
-usr/lib/${DEB_HOST_MULTIARCH}/libkshark-plot.so.2.2.0 usr/lib/${DEB_HOST_MULTIARCH}/libkshark-plot.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libkshark-gui.so.2.2.1 usr/lib/${DEB_HOST_MULTIARCH}/libkshark-gui.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libkshark-plot.so.2.2.1 usr/lib/${DEB_HOST_MULTIARCH}/libkshark-plot.so.2
diff -Nru kernelshark-2.2.0/src/libkshark-tepdata.c kernelshark-2.2.1/src/libkshark-tepdata.c
--- kernelshark-2.2.0/src/libkshark-tepdata.c	2023-01-21 11:42:13.000000000 +0100
+++ kernelshark-2.2.1/src/libkshark-tepdata.c	2023-06-07 19:46:20.000000000 +0200
@@ -825,6 +825,8 @@
 	tep_print_event(kshark_get_tep(stream), &seq, record,
 			"%s", TEP_PRINT_INFO);
 
+	if (!seq.len)
+		return NULL;
 	/*
 	 * The event info string contains a trailing newline.
 	 * Remove this newline.

Reply via email to