--- Begin Message ---
Package: release.debian.org
Severity: normal
Control: affects -1 + src:systemtap
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package systemtap.
[ Reason ]
This update includes an upstream patch to fix a runtime error with Linux
kernels >= 6.12. The issue was spotted by a autopkgtest regression. See
#1108541.
[ Impact ]
Without this patch, all SystemTap scripts in Trixie fail with the
following runtime error: asm/unaligned.h: No such file or directory
[ Tests ]
I manually verified in a clean Trixie VM that SystemTap built with the
patch works again. Additionally, autopkgtests are now green:
https://ci.debian.net/packages/s/systemtap/
[ Risks ]
None to the best of my knowledge.
[ Checklist ]
[√] all changes are documented in the d/changelog
[√] I reviewed all changes and I approve them
[√] attach debdiff against the package in testing
unblock systemtap/5.1-5
Thanks,
ema
diff -Nru systemtap-5.1/debian/changelog systemtap-5.1/debian/changelog
--- systemtap-5.1/debian/changelog 2025-02-28 21:20:54.000000000 +0100
+++ systemtap-5.1/debian/changelog 2025-07-01 15:52:26.000000000 +0200
@@ -1,3 +1,10 @@
+systemtap (5.1-5) unstable; urgency=medium
+
+ * Add upstream patch move-unaligned.patch for Linux kernels >= 6.12
+ (Closes: #1108541)
+
+ -- Emanuele Rocca <ema@debian.org> Tue, 01 Jul 2025 15:52:26 +0200
+
systemtap (5.1-4.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru systemtap-5.1/debian/patches/move-unaligned.patch systemtap-5.1/debian/patches/move-unaligned.patch
--- systemtap-5.1/debian/patches/move-unaligned.patch 1970-01-01 01:00:00.000000000 +0100
+++ systemtap-5.1/debian/patches/move-unaligned.patch 2025-07-01 15:50:59.000000000 +0200
@@ -0,0 +1,26 @@
+commit c5774e18b7241cc484ef9d5e17214651b9b9d439
+Author: William Cohen <wcohen@redhat.com>
+Date: Mon Oct 7 11:27:10 2024 -0400
+
+ Address the Linux 6.12 move of the unaligned.h include file
+
+ The Linux git commit 5f60d5f6bb moved unaligned.h from asm/unaligned.h
+ to linux/unaligned.h. Adjusted runtime/sym.c to include the
+ unaligned.h from the appropriate location.
+
+diff --git a/runtime/sym.c b/runtime/sym.c
+index 102257965..acae95818 100644
+--- a/runtime/sym.c
++++ b/runtime/sym.c
+@@ -18,7 +18,11 @@
+ #ifdef STP_NEED_LINE_DATA
+ #include "unwind/unwind.h"
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,12,0)
++#include <linux/unaligned.h>
++#else
+ #include <asm/unaligned.h>
++#endif
+ #include <asm/uaccess.h>
+ #include <linux/list.h>
+ #include <linux/module.h>
diff -Nru systemtap-5.1/debian/patches/series systemtap-5.1/debian/patches/series
--- systemtap-5.1/debian/patches/series 2025-02-26 21:46:33.000000000 +0100
+++ systemtap-5.1/debian/patches/series 2025-07-01 15:51:15.000000000 +0200
@@ -9,3 +9,4 @@
error-empty-body-debug-macros.patch
old-style-declaration-stap-probes.patch
debian-debug-system-map.patch
+move-unaligned.patch
--- End Message ---