Merge pull request 'Factory' (#1 ) from factory into main

2025-10-08 12:57:48 +02:00
19 changed files with 271 additions and 237 deletions
--- a/2
+++ b/2
@@ -4,7 +4,7 @@ How to update the systemtap keyring
 2. run 'osc service localrun download_files' to download the new tarball and signatrure files (the signature file may be .sig or .asc, it varies depending on who
 made the release)
 3. run 'gpg systemtap-${ver}.tar.gz.{sig,asc}' -- look for "gpg: Signature made {date} using RSA key ID {key}" in output
-4. run 'gpg --keyserver https://keys.openpgp.org/ --recv-key $key' to obtain the key from the public keyserver
+4. run 'gpg --keyserver pgp.mit.edu --recv-key $key' to obtain the key from the public keyserver
 5. run 'gpg --export --armor --output systemtap.keyring $key'.   Select 'y' to
   overwrite existing file (previous is backed up in .osc)

--- a/elaborate.cxx-fix-32-bit-build.patch
+++ b/elaborate.cxx-fix-32-bit-build.patch
@@ -1,95 +0,0 @@
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Sun Nov 30 20:58:01 2025 +0000
-Subject: elaborate.cxx: fix 32-bit build
-Git-commit: 94efb7c4eb02de0e3565cb165b53963602d3dcb6
-References: none, fix OBS reported build failure on 32-bit
-Signed-off-by: Tony Jones <tonyj@suse.de>
-
-    elaborate.cxx: fix 32-bit build
-    
-    Without the change the build fails on i686-linux as:
-    
-        elaborate.cxx:5119:33: error:
-          format '%ld' expects argument of type 'long int',
-          but argument 2 has type 'int64_t' {aka 'long long int'} [-Werror=format=]
-         5119 |       session.print_warning (_F("Collapsing unresolved @define to %ld [stapprobes]", value), e->tok);
-              |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-diff --git a/elaborate.cxx b/elaborate.cxx
-index 93ecffa1a..3ad3614e7 100644
--- a/elaborate.cxx
-+++ b/elaborate.cxx
-@@ -5116,7 +5116,7 @@ const_folder::visit_defined_op (defined_op* e)
-       // Don't be greedy... we'll only collapse one at a time so type
-       // resolution can have another go at it.
-       relaxed_p = false;
-      session.print_warning (_F("Collapsing unresolved @define to %ld [stapprobes]", value), e->tok);
-+      session.print_warning (_F("Collapsing unresolved @define to %lld [stapprobes]", (long long)value), e->tok);
-       literal_number* n = new literal_number (value);
-       n->tok = e->tok;
-       n->visit (this);
-diff --git a/po/cs.po b/po/cs.po
-index df6412772..92fdef7ad 100644
--- a/po/cs.po
-+++ b/po/cs.po
-@@ -2039,7 +2039,7 @@ msgstr "Zahazuji kontrolu '@defined' bez vedlejších účinků "
- 
- #: elaborate.cxx:5119
- #, fuzzy, c-format
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
-+msgid "Collapsing unresolved @define to %lld [stapprobes]"
- msgstr "Zahazuji kontrolu '@defined' bez vedlejších účinků "
- 
- #: elaborate.cxx:5127
-diff --git a/po/en.po b/po/en.po
-index 8847639e8..1db2292bd 100644
--- a/po/en.po
-+++ b/po/en.po
-@@ -2050,7 +2050,7 @@ msgstr ""
- 
- #: elaborate.cxx:5119
- #, c-format
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
-+msgid "Collapsing unresolved @define to %lld [stapprobes]"
- msgstr ""
- 
- #: elaborate.cxx:5127
-diff --git a/po/fr.po b/po/fr.po
-index b8677707b..55e409919 100644
--- a/po/fr.po
-+++ b/po/fr.po
-@@ -2090,7 +2090,7 @@ msgstr ""
- 
- #: elaborate.cxx:5119
- #, c-format
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
-+msgid "Collapsing unresolved @define to %lld [stapprobes]"
- msgstr ""
- 
- #: elaborate.cxx:5127
-diff --git a/po/pl.po b/po/pl.po
-index e3b6700ee..0b35880c1 100644
--- a/po/pl.po
-+++ b/po/pl.po
-@@ -1977,7 +1977,7 @@ msgstr ""
- 
- #: elaborate.cxx:5119
- #, c-format
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
-+msgid "Collapsing unresolved @define to %lld [stapprobes]"
- msgstr ""
- 
- #: elaborate.cxx:5127
-diff --git a/po/systemtap.pot b/po/systemtap.pot
-index 32ddb2290..4ec0d9a8c 100644
--- a/po/systemtap.pot
-+++ b/po/systemtap.pot
-@@ -1973,7 +1973,7 @@ msgstr ""
- 
- #: elaborate.cxx:5119
- #, c-format
-msgid "Collapsing unresolved @define to %ld [stapprobes]"
-+msgid "Collapsing unresolved @define to %lld [stapprobes]"
- msgstr ""
- 
- #: elaborate.cxx:5127
--- a/guard-usage-of-vmlinux.h.patch
+++ b/guard-usage-of-vmlinux.h.patch
@@ -1,28 +0,0 @@
-From: Tony Jones <tonyj@suse.de>
-Subject: guard usage of vmlinux.h
-References: jsc#PED-15105
-Upstream: pending
-Signed-off-by: Tony Jones <tonyj@suse.de>
-
-Temporary workaround until jsc#PED-15105 is resolved.
-Check that .../build/vmlinux.h actually exists before using it.
-
-diff --git a/buildrun.cxx b/buildrun.cxx
-index c3e38a2db..4c9251653 100644
--- a/buildrun.cxx
-+++ b/buildrun.cxx
-@@ -1209,8 +1209,12 @@ make_typequery_kmod(systemtap_session& s, const vector<string>& headers, string&
-       const string& h = headers[i];
-       if (h == string("vmlinux.h")) // PR33428: vmlinux.h special case
-         {
-          omf << " -include " << lex_cast_qstring(s.kernel_build_tree) << "/" << lex_cast_qstring("vmlinux.h");
-          no_vmlinux_h = false;
-+          string vh = s.kernel_build_tree + "/vmlinux.h";
-+          if (access(vh.c_str(), R_OK) == 0)
-+            {
-+              omf << " -include " << lex_cast_qstring(s.kernel_build_tree) << "/" << lex_cast_qstring("vmlinux.h");
-+              no_vmlinux_h = false;
-+            }
-         }
-       else
-         omf << " -include " << lex_cast_qstring(h); // XXX right quoting?
--- a/linux-6.13-fedora-compatibility.patch
+++ b/linux-6.13-fedora-compatibility.patch
@@ -0,0 +1,54 @@
+From: Frank Ch. Eigler <fche@redhat.com>
+Date:   Thu Jan 9 18:30:13 2025 -0500
+Subject: linux 6.13/fedora compatibility
+Git-commit: ebee5ff5bda46f331ae5eade5185f1816e4b45f0
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+    PR32458: linux 6.13/fedora compatibility
+    
+    It appears as though an unnecessarily complicated bit of our
+    module-building process, invoking a nested $(MAKE) to generate the
+    STAPCONF_HEADER header file.  This stopped working with a fedora
+    rawhide 6.13-rc thing, leading to frankly mystifying phenomena,
+    including our own generated Makefile being rewritten (!!!).  This
+    is now simplified.
+
+diff --git a/buildrun.cxx b/buildrun.cxx
+index e5cb563b8..1dae071d1 100644
+--- a/buildrun.cxx
+++ b/buildrun.cxx
+@@ -345,11 +345,6 @@ compile_pass (systemtap_session& s)
+   
+   o << "STAPCONF_HEADER := " << s.tmpdir << "/" << s.stapconf_name << endl;
+   o << ".DELETE_ON_ERROR: $(STAPCONF_HEADER)" << endl;
+-  o << "$(STAPCONF_HEADER):" << endl;
+-  o << "\t";
+-  if (s.verbose < 4)
+-    o << "@";
+-  o << "$(MAKE) -f \"$(firstword $(MAKEFILE_LIST))\" gen-stapconf" << endl;
+ 
+   vector<string> cs;  // to hold autoconf C file names
+ 
+@@ -570,8 +565,10 @@ compile_pass (systemtap_session& s)
+ 
+   o2.close ();
+ 
+-  o << ".PHONY: gen-stapconf" << endl;
+-  o << "gen-stapconf: " << stap_export_nm;
+  // PR32458 (!) Build the combined conf header as an ordinary
+  // dependency of the module.o file.  Don't invoke a sub-$(MAKE) with
+  // crude command line parsing.
+  o << "$(STAPCONF_HEADER): " << stap_export_nm;
+   for (unsigned i=0; i<cs.size(); i++)
+     o << " " << s.tmpdir << "/" << cs[i] << ".h";
+   o << endl;
+@@ -580,7 +577,8 @@ compile_pass (systemtap_session& s)
+   if (s.verbose < 4)
+     o << "@";
+   o << "cat $^ > $(STAPCONF_HEADER)" << endl;
+-
+  o << s.module_name <<".o : $(STAPCONF_HEADER)" << endl;
+  
+   o << module_cflags << " += -include $(STAPCONF_HEADER)" << endl;
+ 
+   for (unsigned i=0; i<s.c_macros.size(); i++)
--- a/rawhide-6.13-kbuild-compatibility.patch
+++ b/rawhide-6.13-kbuild-compatibility.patch
@@ -0,0 +1,101 @@
+From: Frank Ch. Eigler <fche@redhat.com>
+Date:   Fri Jan 17 19:40:56 2025 -0500
+Subject: rawhide (6.13) kbuild compatibility
+Git-commit: 048ee97b8d57209e824c7078b34f4a130da40363
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+    PR32458: rawhide (6.13) kbuild compatibility
+    
+    Subject kernel versions introduce changes to the kbuild $(MAKE)
+    invocations process command line options, and twiddle with working
+    directories, making our systemtap module Makefile not quite
+    compatible.  Sprinkle $(obj)/ liberally around all the generated
+    header files (used for autoconf* purposes) and nearby.  This appears
+    to make both >6.13 and <6.13 kbuilds happy.
+
+diff --git a/buildrun.cxx b/buildrun.cxx
+index 1dae071d1..f369135af 100644
+--- a/buildrun.cxx
+++ b/buildrun.cxx
+@@ -186,7 +186,7 @@ output_autoconf(systemtap_session& s, ofstream& o,
+                 const char *deffalse)
+ {
+   autoconf_c_files.push_back (autoconf_c);
+-  o << endl << s.tmpdir << "/" << autoconf_c << ".h:" << endl;
+  o << endl << "$(obj)/" << autoconf_c << ".h:" << endl;
+   o << "\t";
+   if (s.verbose < 4)
+     o << "@";
+@@ -286,7 +286,8 @@ compile_pass (systemtap_session& s)
+   string makefile_nm = s.tmpdir + "/Makefile";
+   ofstream o (makefile_nm.c_str());
+ 
+-  string stap_export_nm = s.tmpdir + "/stapconf_export.h";
+  string stap_export_basenm = "stapconf_export.h";
+  string stap_export_nm = s.tmpdir + "/" + stap_export_basenm;
+   ofstream o2 (stap_export_nm.c_str());
+ 
+   // Create makefile
+@@ -343,7 +344,7 @@ compile_pass (systemtap_session& s)
+ 
+   o << module_cflags << " += -Wmissing-prototypes" << endl; // GCC14 prep, PR31288
+   
+-  o << "STAPCONF_HEADER := " << s.tmpdir << "/" << s.stapconf_name << endl;
+  o << "STAPCONF_HEADER := " << "$(obj)/" << s.stapconf_name << endl;
+   o << ".DELETE_ON_ERROR: $(STAPCONF_HEADER)" << endl;
+ 
+   vector<string> cs;  // to hold autoconf C file names
+@@ -568,16 +569,16 @@ compile_pass (systemtap_session& s)
+   // PR32458 (!) Build the combined conf header as an ordinary
+   // dependency of the module.o file.  Don't invoke a sub-$(MAKE) with
+   // crude command line parsing.
+-  o << "$(STAPCONF_HEADER): " << stap_export_nm;
+  o << "$(STAPCONF_HEADER): " << "$(obj)/" << stap_export_basenm;
+   for (unsigned i=0; i<cs.size(); i++)
+-    o << " " << s.tmpdir << "/" << cs[i] << ".h";
+    o << " " << "$(obj)/" << cs[i] << ".h";
+   o << endl;
+ 
+   o << "\t";
+   if (s.verbose < 4)
+     o << "@";
+   o << "cat $^ > $(STAPCONF_HEADER)" << endl;
+-  o << s.module_name <<".o : $(STAPCONF_HEADER)" << endl;
+  o << "$(obj)/" << s.module_name <<".o : $(STAPCONF_HEADER)" << endl;
+   
+   o << module_cflags << " += -include $(STAPCONF_HEADER)" << endl;
+ 
+@@ -692,18 +693,20 @@ compile_pass (systemtap_session& s)
+     }
+   o << " stap_symbols.o" << endl;
+ 
+-  o << s.tmpdir << "/stap_symbols.o: $(STAPCONF_HEADER)" << endl;
+  o << "$(obj)/stap_symbols.o: $(STAPCONF_HEADER)" << endl;
+ 
+   // add all stapconf dependencies
+   string translated = s.translated_source;
+  translated = translated.substr(translated.rfind('/')+1); // basename
+   translated[translated.size()-1] = 'o';
+-  o << translated << ": $(STAPCONF_HEADER)" << endl;
+  o << "$(obj)/" << translated << ": $(STAPCONF_HEADER)" << endl;
+   translated[translated.size()-1] = 'i';
+-  o << translated << ": $(STAPCONF_HEADER)" << endl;
+  o << "$(obj)/" << translated << ": $(STAPCONF_HEADER)" << endl;
+   for (unsigned i=0; i<s.auxiliary_outputs.size(); i++) {
+     translated = s.auxiliary_outputs[i]->filename;
+    translated = translated.substr(translated.rfind('/')+1); // basename
+     translated[translated.size()-1] = 'o';
+-    o << translated << ": $(STAPCONF_HEADER)" << endl;
+    o << "$(obj)/" << translated << ": $(STAPCONF_HEADER)" << endl;
+   }
+ 
+   o.close ();
+@@ -723,7 +726,7 @@ compile_pass (systemtap_session& s)
+ 
+   // Run make
+   vector<string> make_cmd = make_make_cmd(s, s.tmpdir);
+-  if (s.keep_tmpdir)
+  if (false && s.keep_tmpdir) // PR32458: kbuild 6.13+ can't abide multiple make targets
+     {
+       string E_source = s.translated_source.substr(s.translated_source.find_last_of("/")+1);
+       E_source.at(E_source.length() - 1) = 'i'; // overwrite the last character
--- a/stap.conf
+++ b/stap.conf
@@ -1 +0,0 @@
-d /var/cache/systemtap 0755 root root -
--- a/systemtap-5.2.tar.gz
+++ b/systemtap-5.2.tar.gz
--- a/systemtap-5.2.tar.gz.asc
+++ b/systemtap-5.2.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEETdE2SQQRwKQrKIRPJYtu+g8gnSQFAmcufXsACgkQJYtu+g8g
+nSQFDw/+IM5MWVRpqoYIRdkCvZGSGAPCdpTX8Uh7u84LzZO5pF7aRcmVD4GtJ1hd
+gP3rFeN9722N7UctQqMtWanQo7+ngXLIOsKBHhwv8dDhiQyNJ+ix22VxdNrGWsK+
+Lw4D8SvAMhbwRiZmJetPDX+5D+dByEyRj4+SgY/Nphb9j6iHMu1Mt5wNtE2bEb6C
+reFHZRdDgVf6sjhBHcrR/MnOB3Z1m1UbmrZUyUQ2d3EtofLht53KNBHVZNO3dwxt
+951BWPdNbYg2ITooHtJ99qjJo1nXER6ELURzAkYyuouTnWjtCED5K6XuwVMuKeD5
+Io5mmx5Fa1UbiDWFsf3KSnd9v/oFjtC1YvqUQdybN1+hN7yioF7rYyNt7qWt4xxA
+4miElHqM3Co5ex5LuRjIbCC0uB7RDERcOG1A9WSXKYbRvXLB91AbIhT9VfbvBBqE
+iA7au10+vn5ueogEcLk0lrZcEiRNIbXzD9e6hCkxDa0vi1S1CXYMdfJJ4X7gi77n
+dLF+qski+9Z1oxea7Z0y4knbK0cIPKvEhFxJicIEToO4lYsjLiFg4rpwvQ4hU8Vo
+ui14fwHh+n/q9EZM59I0EUVfiVAgWR9/C0NOsJvUS/ZA4CkFiRPRMyWJ4qgZ2v0Y
+8U5rBLudOia+t6jmR5eMOwilcCxoUvzV9IE7wPPd1niKckdxBYk=
+=4K3q
+-----END PGP SIGNATURE-----
--- a/systemtap-5.4.tar.gz
+++ b/systemtap-5.4.tar.gz
--- a/systemtap-5.4.tar.gz.asc
+++ b/systemtap-5.4.tar.gz.asc
@@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQTGDP6fJ0BRAdBt47htjQGt4lOyUgUCaQTtMwAKCRBtjQGt4lOy
-Us21AQCiDwiY6NEvtZt6COmQg9/ClwhqLtF7Ib/KMBO+47+AoAD/V4Mrc+Wk3Sbs
-VhK5+67q4XLxga4vmkeOFNafH3tThwQ=
-=mRku
-----END PGP SIGNATURE-----
--- a/systemtap-docs.changes
+++ b/systemtap-docs.changes
@@ -1,8 +1,3 @@
-------------------------------------------------------------------
-Fri Jan 23 02:36:12 UTC 2026 - Tony Jones <tonyj@suse.com>
-
- Upgrade to version 5.4. See systemtap.changes for changelog
-
 -------------------------------------------------------------------
 Mon Feb 24 18:14:46 UTC 2025 - Tony Jones <tonyj@suse.com>

--- a/systemtap-docs.spec
+++ b/systemtap-docs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap-docs
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@


 Name:           systemtap-docs
-Version:        5.4
+Version:        5.2
 Release:        0
 Summary:        Documents and examples for systemtap
 License:        GPL-2.0-or-later
@@ -25,12 +25,12 @@ Group:          Development/Tools/Debuggers
 URL:            https://sourceware.org/systemtap/
 Source0:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source1:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
+Source2:        systemtap.keyring
+Source3:        README-BEFORE-ADDING-PATCHES
+Source4:        README-KEYRING
 Patch1:         systemtap-docdir-fix.diff
-Patch2:         elaborate.cxx-fix-32-bit-build.patch
-
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  boost-devel
 BuildRequires:  pkgconfig(json-c)
 # for documents
 BuildRequires:  fop
--- a/systemtap-dtrace.changes
+++ b/systemtap-dtrace.changes
@@ -1,8 +1,3 @@
-------------------------------------------------------------------
-Fri Jan 23 02:36:42 UTC 2026 - Tony Jones <tonyj@suse.com>
-
- Upgrade to version 5.4. See systemtap.changes for changelog
-
 -------------------------------------------------------------------
 Mon Feb 24 18:14:46 UTC 2025 - Tony Jones <tonyj@suse.com>

--- a/systemtap-dtrace.spec
+++ b/systemtap-dtrace.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap-dtrace
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define _rundir %{_localstatedir}/run
 %endif
 Name:           systemtap-dtrace
-Version:        5.4
+Version:        5.2
 Release:        0
 Summary:        SystemTap dtrace utility
 License:        GPL-2.0-or-later
@@ -28,6 +28,9 @@ Group:          Development/Tools/Debuggers
 URL:            http://sourceware.org/systemtap/
 Source0:        http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source1:        http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
+Source2:        systemtap.keyring
+Source3:        README-BEFORE-ADDING-PATCHES
+Source4:        README-KEYRING

 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
--- a/systemtap-headers.changes
+++ b/systemtap-headers.changes
@@ -1,14 +1,3 @@
-------------------------------------------------------------------
-Thu Feb 19 21:59:13 UTC 2026 - Tony Jones <tonyj@suse.com>
-
- Add R section headers to sed rule (for support_section_retain added
-  in 5.4). Solves build error for packages which BuildRequire: this.
-
-------------------------------------------------------------------
-Fri Jan 23 02:36:56 UTC 2026 - Tony Jones <tonyj@suse.com>
-
- Upgrade to version 5.4. See systemtap.changes for changelog
-
 -------------------------------------------------------------------
 Mon Feb 24 18:14:46 UTC 2025 - Tony Jones <tonyj@suse.com>

--- a/systemtap-headers.spec
+++ b/systemtap-headers.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap-headers
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 %define _rundir %{_localstatedir}/run
 %endif
 Name:           systemtap-headers
-Version:        5.4
+Version:        5.2
 Release:        0
 Summary:        SystemTap headers
 License:        GPL-2.0-or-later
@@ -32,6 +32,10 @@ Group:          Development/Tools/Debuggers
 URL:            http://sourceware.org/systemtap/
 Source0:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source1:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
+Source2:        systemtap.keyring
+Source3:        README-BEFORE-ADDING-PATCHES
+Source4:        README-KEYRING
+Source5:        stap-server.conf
 Patch1:         systemtap-build-source-dir.patch

 # sdt-devel provides the same header files as us, so we
@@ -49,10 +53,9 @@ systemtap-sdt-devel, which also contains these headers.
 %autopatch -p1

 %build
-# Directly set necessary config flags without need to depend/run autoconf.
-#
-# Our binutils always support '?'/'R' in the section characters on all archs.
-sed -e 's/@support_section_question@/1/' -e 's/@support_section_retain@/1/' < includes/sys/sdt-config.h.in > includes/sys/sdt-config.h
+# Our binutils always support '?' in the section characters on all
+# architectures, no need for configure tests
+sed -e 's/@support_section_question@/1/' < includes/sys/sdt-config.h.in > includes/sys/sdt-config.h

 %install
 mkdir -p %{buildroot}%{_includedir}/sys
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,44 +1,17 @@
 -------------------------------------------------------------------
-Wed Jan 21 18:37:14 UTC 2026 - Tony Jones <tonyj@suse.com>
+Tue Feb 25 21:07:47 UTC 2025 - Tony Jones <tonyj@suse.com>

- Upgrade to version 5.4
+- Resolve errors with linux-6.13 based kernels.

-  Add patch:  elaborate.cxx-fix-32-bit-build.patch (resolve 32-bit build error)
-  Add patch:  guard-usage-of-vmlinux.h.patch (temporary fix)
+  Building trivial 'hello world' failed with:
+    <command-line>: fatal error: {path_to}stapconf.h: No such file or directory

-  Drop explicit packaging of /var/cache/systemtap (jsc#PED-14770)
+  Attemptng to preserve build directory (-k) caused an infinite loop of:
+    /usr/src/linux-6.13.4-1/scripts/Makefile.build:370: warning: overriding 
+      recipe for target 'modules.order'

-  Summary of changes (v5.4):
-    - The kernel-context @cast operator now implicitly searches a kernel's
-      <vmlinux.h> generated header file first, if available (kernel 5.7+),
-      for type declarations.  This can make some debuginfo access
-      unnecessary, and thus processing faster.  It can work around kernel
-      API changes where type declarations move between headers.
-      Use --compatible=5.3 to disable this behaviour.
-      Use @cast(..., "kernel<vmlinux.h>") manually if desired.
-
-    - Type checking and autocast processing have been made more thorough,
-      so elided variables are checked more and @defined() tests may be
-      more complicated.  Preexisting scripts that rely on elision for
-      bypassing type violations may now get caught.  No --compatible
-      option exists to suppress this new behaviour.
-
-    - The sys/sdt.h file now arranges to include the section flag "R"
-      (RETAIN) for the .stapsdt.base elf sections related to sdt markers,
-       for compatibility with aggressive GC operations in some linkers.
-
-    - Kernel portability changes
-
-    - The dropwatch.stp [script] adds numeric drop-reason codes to the 
-      statistics.
-
-  Summary of changes (v5.3):
-
-    - The first pass (-p1) now runs parse operations concurrently over of
-      the hundreds of tapset .stp files, potentially saving seconds of
-      time at startup.
-
-    - Numerous kernel portability changes
+  New patch: linux-6.13-fedora-compatibility.patch
+  New patch: rawhide-6.13-kbuild-compatibility.patch

 -------------------------------------------------------------------
 Mon Feb 24 18:11:09 UTC 2025 - Tony Jones <tonyj@suse.com>
--- a/systemtap.keyring
+++ b/systemtap.keyring
@@ -1,23 +1,65 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-mDMEZ1oPURYJKwYBBAHaRw8BAQdASa6wJUY8kcnuRfIiVGpxB781Je0jyl48yDZ2
-uq2f7Za0I0ZyYW5rIENoLiBFaWdsZXIgPGZjaGVAZWxhc3RpYy5vcmc+iJMEExYK
-ADsWIQTGDP6fJ0BRAdBt47htjQGt4lOyUgUCZ1oPUQIbAwULCQgHAgIiAgYVCgkI
-CwIEFgIDAQIeBwIXgAAKCRBtjQGt4lOyUgcVAP9aCeAFoWjIHMEg+hj0X3Y/YzYI
-zJ7H1y1lTH5dbrin/QD/Xypf6bLtSML17X3nK7iBN+SwW31BB3CCbazUAlWZ9QyI
-XQQQEQIAHRYhBEGgwRJ0seh/4o5MU+PXfh+VFhmRBQJnWg96AAoJEOPXfh+VFhmR
-4sEAn3kuGCLN3I4z0wTI9S7izjAjUH6yAJ4pIa0Q9Yfauei9yJk4bUGzhpDQ84hd
-BBARAgAdFiEE8PYP2bgDkl3pi48bVZbdDOm/ZT0FAmdaD7sACgkQVZbdDOm/ZT07
-ugCcCA5lHBXdt4rT/QBTihxBlUCwJBUAnj4/bUSA1Zna7iVnpE0cg3GNJGyaiF0E
-EBECAB0WIQTw9g/ZuAOSXemLjxtVlt0M6b9lPQUCZ1oQIgAKCRBVlt0M6b9lPVUz
-AJ94r3y/H2IEAc6dV2h8otv/95i/jwCeJ79IQWf9ba6quTWJ9Axr63j44U60JkZy
-YW5rIENoLiBFaWdsZXIgPGZjaGVAc291cmNld2FyZS5vcmc+iJMEExYKADsWIQTG
-DP6fJ0BRAdBt47htjQGt4lOyUgUCZ1oRBgIbAwULCQgHAgIiAgYVCgkICwIEFgID
-AQIeBwIXgAAKCRBtjQGt4lOyUtv6AQDDxGFpOgGJDzDaj8b3nZlR0AQfTMQ9XH4F
-TEdRmm6ytgEAjqyuL7GcDsQGkIdH+iIg41/DBlsXudRdZ6Kqe0ltzwy4OARnWg9R
-EgorBgEEAZdVAQUBAQdA4Te4B5jO2mxhoovg4RGxZWflvE4FxWgftQ2NipVJ5kED
-AQgHiHgEGBYKACAWIQTGDP6fJ0BRAdBt47htjQGt4lOyUgUCZ1oPUQIbDAAKCRBt
-jQGt4lOyUoeOAP9ouz8+oEcwrIgtKTlYZ4kyMjThZo9jlEyvpSOvIr/eTQEA99ex
-e7Mus97ZGIx4cD9Aur/TUxnSKW+14EazkXk49gA=
-=TEiu
+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
+=AUk/
 -----END PGP PUBLIC KEY BLOCK-----
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define _rundir %{_localstatedir}/run
 %endif
 Name:           systemtap
-Version:        5.4
+Version:        5.2
 Release:        0
 Summary:        Instrumentation System
 License:        GPL-2.0-or-later
@@ -32,14 +32,12 @@ Source2:        %{name}.keyring
 Source3:        README-BEFORE-ADDING-PATCHES
 Source4:        README-KEYRING
 Source5:        stap-server.conf
-Source6:        stap.conf
 Patch1:         systemtap-build-source-dir.patch
-Patch2:         elaborate.cxx-fix-32-bit-build.patch
-Patch3:         guard-usage-of-vmlinux.h.patch
+Patch2:         linux-6.13-fedora-compatibility.patch
+Patch3:         rawhide-6.13-kbuild-compatibility.patch

 BuildRequires:  autoconf >= 2.71
 BuildRequires:  automake
-BuildRequires:  boost-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libavahi-devel
@@ -129,17 +127,12 @@ touch %{buildroot}%{_localstatedir}/log/stap-server.log
 # config file for stap-server (/run now on tmpfs)
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}
-install -m 644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}

 %fdupes %{buildroot}%{_datadir}/%{name}
 %python3_fix_shebang

 %find_lang systemtap

-%post
-# Create tmpfiles
-%tmpfiles_create %{_tmpfilesdir}/stap.conf
-
 %post server
 # Create tmpfiles
 %tmpfiles_create %{_tmpfilesdir}/stap-server.conf
@@ -156,7 +149,8 @@ install -m 644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}
 %{_datadir}/%{name}/runtime
 %{_datadir}/%{name}/interactive-notebook
 %{_datadir}/%{name}/tapset
-%{_tmpfilesdir}/stap.conf
+#packaged by systemtap-initscript in upstream
+%dir %{_localstatedir}/cache/systemtap

 %files runtime -f systemtap.lang
 %doc %{_docdir}/systemtap