.gitignore

@@ -1 +1 @@
-SOURCES/systemtap-4.9.tar.gz
+SOURCES/systemtap-5.1.tar.gz

.systemtap.metadata

@@ -1 +1 @@
-7ba2ad579a5ba66ccfd36ad6df0896c9e136f9e9 SOURCES/systemtap-4.9.tar.gz
+5a2a16c61e815ead31e655665e6ee9cf7772f1de SOURCES/systemtap-5.1.tar.gz

SOURCES/PR31495.patch

@@ -0,0 +1,29 @@
+commit b87891f5aff91b8ebbda8d9218009495848f7747
+Author: Martin Cermak <mcermak@redhat.com>
+Date:   Thu May 16 16:51:08 2024 +0200
+
+    PR31495: teach stap-prep to work with other RT kernels
+
+diff --git a/stap-prep b/stap-prep
+index 8b429f880..2bbb6bc2f 100755
+--- a/stap-prep
++++ b/stap-prep
+@@ -103,13 +103,16 @@ done
+ # 5.14.0-200.rt14.201.el9 ->
+ #      "kernel-rt-debug-5.14.0-200.rt14.201.el9"
+ # OR?! "kernel-rt-5.14.0-200.rt14.201.el9"
+-if expr "$UNAME" : ".*\.rt.*" >/dev/null;
++# OR??!"kernel-rt-5.14.0-447.el9.x86_64+rt"
++if expr "$UNAME" : ".*\.rt.*" || expr "$UNAME" : ".*\+rt.*" >/dev/null;
+ then
+     KERNEL=`echo $KERNEL | sed -e s,kernel,kernel-rt,`
+ fi
+ 
+ KERN_ARCH=`uname -m`
+-KERN_REV=`echo $UNAME | sed s/.$KERN_ARCH//` # strip arch from uname
++# strip arch from uname, for kernels like 5.14.0-447.el9.x86_64+rt or
++# 6.9.0-0.rc2.1.el10.x86_64+rt strip the +rt suffix too
++KERN_REV=`echo $UNAME | sed s/.$KERN_ARCH// | sed s/\+rt$//`
+ if [ -x /usr/bin/dnf4 ]; then
+     DI="dnf4 debuginfo-install"
+     DI_DEPS=""

SOURCES/RHEL-36199a.patch

@@ -0,0 +1,116 @@
+commit b8d4274d1e7697801c12c512b6724dd3f59f2c72
+Author: William Cohen <wcohen@redhat.com>
+Date:   Mon May 6 11:36:42 2024 -0400
+
+    Support kernels that backported kallsym functions from newer linux kernels
+    
+    Some Linux distributions may have backported
+    module_kallsyms_on_each_symbol and kallsyms_on_each_symbol functions
+    from newer linux kernels.  In these situations checking the kernel
+    version would not detect the proper arguments for these functions.
+    Systemtap now has a couple of autoconf tests to determine what
+    arguments should be used for these functions.
+
+diff --git a/buildrun.cxx b/buildrun.cxx
+index bb7bdcc9d..8ee8c391f 100644
+--- a/buildrun.cxx
++++ b/buildrun.cxx
+@@ -506,6 +506,8 @@ compile_pass (systemtap_session& s)
+ 
+   output_autoconf(s, o, cs, "autoconf-pagefault_disable.c", "STAPCONF_PAGEFAULT_DISABLE", NULL);
+   output_exportconf(s, o2, "kallsyms_lookup_name", "STAPCONF_KALLSYMS_LOOKUP_NAME_EXPORTED");
++  output_autoconf(s, o, cs, "autoconf-kallsyms_6_3.c", "STAPCONF_KALLSYMS_6_3", NULL);
++  output_autoconf(s, o, cs, "autoconf-kallsyms_6_4.c", "STAPCONF_KALLSYMS_6_4", NULL);
+   output_autoconf(s, o, cs, "autoconf-uidgid.c", "STAPCONF_LINUX_UIDGID_H", NULL);
+   output_exportconf(s, o2, "sigset_from_compat", "STAPCONF_SIGSET_FROM_COMPAT_EXPORTED");
+   output_exportconf(s, o2, "vzalloc", "STAPCONF_VZALLOC");
+diff --git a/runtime/linux/autoconf-kallsyms_6_3.c b/runtime/linux/autoconf-kallsyms_6_3.c
+new file mode 100644
+index 000000000..0af1a5c35
+--- /dev/null
++++ b/runtime/linux/autoconf-kallsyms_6_3.c
+@@ -0,0 +1,6 @@
++#include <linux/module.h>
++
++int module_kallsyms_on_each_symbol(const char *modname,
++				   int (*fn)(void *, const char *, struct module*,
++					     unsigned long),
++				   void *data);
+diff --git a/runtime/linux/autoconf-kallsyms_6_4.c b/runtime/linux/autoconf-kallsyms_6_4.c
+new file mode 100644
+index 000000000..3b3680c53
+--- /dev/null
++++ b/runtime/linux/autoconf-kallsyms_6_4.c
+@@ -0,0 +1,3 @@
++#include <linux/kallsyms.h>
++int kallsyms_on_each_symbol(int (*fn)(void *, const char *, unsigned long),
++			    void *data);
+diff --git a/runtime/linux/kprobes.c b/runtime/linux/kprobes.c
+index 6b30f2c52..2fba61cbb 100644
+--- a/runtime/linux/kprobes.c
++++ b/runtime/linux/kprobes.c
+@@ -737,7 +737,7 @@ __stapkp_symbol_callback(void *data, const char *name,
+ }
+ 
+ static int
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,0)
++#if defined(STAPCONF_KALLSYMS_6_4)
+ stapkp_symbol_callback(void *data, const char *name,
+ 			unsigned long addr)
+ {
+@@ -780,7 +780,7 @@ stapkp_init(struct stap_kprobe_probe *probes,
+        mutex_lock(&module_mutex);
+ #endif
+        kallsyms_on_each_symbol(stapkp_symbol_callback, &sd);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
++#if defined(STAPCONF_KALLSYMS_6_3) || defined(STAPCONF_KALLSYMS_6_4)
+        module_kallsyms_on_each_symbol(sd.modname, stapkp_symbol_callback, &sd);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0)
+        module_kallsyms_on_each_symbol(stapkp_symbol_callback, &sd);
+@@ -855,7 +855,7 @@ stapkp_refresh(const char *modname,
+          mutex_lock(&module_mutex);
+ #endif
+ 	 kallsyms_on_each_symbol(stapkp_symbol_callback, &sd);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
++#if defined(STAPCONF_KALLSYMS_6_3)
+ 	 module_kallsyms_on_each_symbol(sd.modname, stapkp_symbol_callback, &sd);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0)
+ 	 module_kallsyms_on_each_symbol(stapkp_symbol_callback, &sd);
+diff --git a/runtime/sym.c b/runtime/sym.c
+index 3947d42f7..23dd3be30 100644
+--- a/runtime/sym.c
++++ b/runtime/sym.c
+@@ -1187,7 +1187,7 @@ unsigned long kallsyms_lookup_name (const char *name)
+ typedef typeof(&kallsyms_on_each_symbol) kallsyms_on_each_symbol_fn;
+ 
+ // XXX Will be linked in place of the kernel's kallsyms_on_each_symbol:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,0)
++#if defined(STAPCONF_KALLSYMS_6_4)
+ int kallsyms_on_each_symbol(int (*fn)(void *, const char *,
+ 				      unsigned long),
+                             void *data)
+@@ -1214,13 +1214,13 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
+ typedef typeof(&module_kallsyms_on_each_symbol) module_kallsyms_on_each_symbol_fn;
+ 
+ // XXX Will be linked in place of the kernel's module_kallsyms_on_each_symbol:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,0)
++#if defined(STAPCONF_KALLSYMS_6_4)
+ int module_kallsyms_on_each_symbol(const char *modname,
+                                    int (*fn)(void *, const char *,
+ 				      unsigned long),
+                             void *data)
+ #else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
++#if defined(STAPCONF_KALLSYMS_6_3)
+ int module_kallsyms_on_each_symbol(const char *modname,
+ 				   int (*fn)(void *, const char *, struct module *,
+ 				      unsigned long),
+@@ -1235,7 +1235,7 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module
+         /* First, try to use a kallsyms_lookup_name address passed to us
+            through the relocation mechanism. */
+         if (_stp_module_kallsyms_on_each_symbol != NULL)
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
++#if defined(STAPCONF_KALLSYMS_6_3) || defined(STAPCONF_KALLSYMS_6_4)
+ 		return ibt_wrapper(int,
+ 				   (* (module_kallsyms_on_each_symbol_fn)_stp_module_kallsyms_on_each_symbol)(modname, fn, data));
+ #else

SOURCES/RHEL-36199b.patch

@@ -0,0 +1,22 @@
+commit ed5649f64a3f8c2e8269f9c4435e9174c4e8c775
+Author: William Cohen <wcohen@redhat.com>
+Date:   Thu May 9 12:23:54 2024 -0400
+
+    Support kernels that backported kallsym functions (part 2)
+    
+    Git commit b8d4274d1e769780 omitted a test for the Linux 6.4 version
+    of kallsyms function in runtime/linux/kprobes.c.
+
+diff --git a/runtime/linux/kprobes.c b/runtime/linux/kprobes.c
+index 2fba61cbb..9ae5565e3 100644
+--- a/runtime/linux/kprobes.c
++++ b/runtime/linux/kprobes.c
+@@ -855,7 +855,7 @@ stapkp_refresh(const char *modname,
+          mutex_lock(&module_mutex);
+ #endif
+ 	 kallsyms_on_each_symbol(stapkp_symbol_callback, &sd);
+-#if defined(STAPCONF_KALLSYMS_6_3)
++#if defined(STAPCONF_KALLSYMS_6_3) || defined(STAPCONF_KALLSYMS_6_4)
+ 	 module_kallsyms_on_each_symbol(sd.modname, stapkp_symbol_callback, &sd);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0)
+ 	 module_kallsyms_on_each_symbol(stapkp_symbol_callback, &sd);

SOURCES/RHEL-50107.patch

@@ -0,0 +1,79 @@
+diff --git a/buildrun.cxx b/buildrun.cxx
+index a7fcd6297..e3f2f83d1 100644
+--- a/buildrun.cxx
++++ b/buildrun.cxx
+@@ -400,6 +400,7 @@ compile_pass (systemtap_session& s)
+   output_exportconf(s, o2, "__module_text_address", "STAPCONF_MODULE_TEXT_ADDRESS");
+   output_exportconf(s, o2, "add_timer_on", "STAPCONF_ADD_TIMER_ON");
+   output_autoconf(s, o, cs, "autoconf-514-panic.c", "STAPCONF_514_PANIC", NULL);
++  output_autoconf(s, o, cs, "autoconf-task_work_cancel_func.c", "STAPCONF_TASK_WORK_CANCEL_FUNC", NULL);
+   
+   output_dual_exportconf(s, o2, "probe_kernel_read", "probe_kernel_write", "STAPCONF_PROBE_KERNEL");
+   output_autoconf(s, o, cs, "autoconf-hw_breakpoint_context.c",
+diff --git a/runtime/linux/autoconf-task_work_cancel_func.c b/runtime/linux/autoconf-task_work_cancel_func.c
+new file mode 100644
+index 000000000..0d460de6c
+--- /dev/null
++++ b/runtime/linux/autoconf-task_work_cancel_func.c
+@@ -0,0 +1,3 @@
++#include <linux/task_work.h>
++
++void* c = & task_work_cancel_func;
+diff --git a/runtime/linux/runtime.h b/runtime/linux/runtime.h
+index 0e9fe3fea..bd9307385 100644
+--- a/runtime/linux/runtime.h
++++ b/runtime/linux/runtime.h
+@@ -265,7 +265,7 @@ static void *kallsyms_uprobe_get_swbp_addr;
+ static void *kallsyms_task_work_add;
+ #endif
+ #if !defined(STAPCONF_TASK_WORK_CANCEL_EXPORTED)
+-static void *kallsyms_task_work_cancel;
++static void *kallsyms_task_work_cancel_fn;
+ #endif
+ 
+ #if !defined(STAPCONF_TRY_TO_WAKE_UP_EXPORTED) && !defined(STAPCONF_WAKE_UP_STATE_EXPORTED)
+diff --git a/runtime/stp_task_work.c b/runtime/stp_task_work.c
+index 0dd3095b6..4818fecbf 100644
+--- a/runtime/stp_task_work.c
++++ b/runtime/stp_task_work.c
+@@ -3,14 +3,25 @@
+ 
+ #include "linux/task_work_compatibility.h"
+ 
++// Handle kernel commit 68cbd415dd4b9c5b9df69f0f091879e56bf5907a
++// task_work: s/task_work_cancel()/task_work_cancel_func()/
++#if defined(STAPCONF_TASK_WORK_CANCEL_FUNC)
++#define TASK_WORK_CANCEL_FN task_work_cancel_func
++#else
++#define TASK_WORK_CANCEL_FN task_work_cancel
++#endif
++
++#define STRINGIFY(x) #x
++#define TOSTRING(x) STRINGIFY(x)
++
+ #if !defined(STAPCONF_TASK_WORK_ADD_EXPORTED)
+ // First typedef from the original decls, then #define as typecasted calls.
+ typedef typeof(&task_work_add) task_work_add_fn;
+ #define task_work_add(a,b,c) ibt_wrapper(int, (* (task_work_add_fn)kallsyms_task_work_add)((a), (b), (c)))
+ #endif
+ #if !defined(STAPCONF_TASK_WORK_CANCEL_EXPORTED)
+-typedef typeof(&task_work_cancel) task_work_cancel_fn;
+-#define task_work_cancel(a,b) ibt_wrapper(struct callback_head *, (* (task_work_cancel_fn)kallsyms_task_work_cancel)((a), (b)))
++typedef typeof(&TASK_WORK_CANCEL_FN) task_work_cancel_fn;
++#define task_work_cancel(a,b) ibt_wrapper(struct callback_head *, (* (task_work_cancel_fn)kallsyms_task_work_cancel_fn)((a), (b)))
+ #endif
+ 
+ /* To avoid a crash when a task_work callback gets called after the
+@@ -35,9 +46,9 @@ stp_task_work_init(void)
+         }
+ #endif
+ #if !defined(STAPCONF_TASK_WORK_CANCEL_EXPORTED)
+-        kallsyms_task_work_cancel = (void *)kallsyms_lookup_name("task_work_cancel");
+-        if (kallsyms_task_work_cancel == NULL) {
+-		_stp_error("Can't resolve task_work_cancel!");
++        kallsyms_task_work_cancel_fn = (void *)kallsyms_lookup_name(TOSTRING(TASK_WORK_CANCEL_FN));
++        if (kallsyms_task_work_cancel_fn == NULL) {
++                _stp_error("Can't resolve %s!", TOSTRING(TASK_WORK_CANCEL_FN));
+ 		return -ENOENT;
+         }
+ #endif

SOURCES/pr30749.patch

@@ -1,99 +0,0 @@
-commit 9839db5514a29cf4f58b3de8cc6155088be6d061
-gpg: Signature made Sat 12 Aug 2023 02:49:26 PM EDT
-gpg:                using RSA key 5D38116FA4D3A7CC77E378D37E83610126DCC2E8
-gpg: Good signature from "Frank Ch. Eigler <fche@elastic.org>" [full]
-Author: Frank Ch. Eigler <fche@redhat.com>
-Date:   Sat Aug 12 14:28:44 2023 -0400
-
-    PR30749: correct stap --sign-module timing
-    
-    Previous code signed the temp directory copy, after it had already
-    been copied into the cache -- so the signature never made it to a
-    permanent artifact.
-    
-    If the module was being fetched from the cache from a previous build
-    run, a sign (re)attempt will still be done.  This may not be
-    necessary, but shouldn't be harmful.
-    
-    Reported-By: Renaud Métrich <rmetrich@redhat.com>
-
-diff --git a/main.cxx b/main.cxx
-index 06adb66ad..9f695cbd8 100644
---- a/main.cxx
-+++ b/main.cxx
-@@ -1190,8 +1190,10 @@ passes_0_4 (systemtap_session &s)
- 		  s.mok_fingerprints.clear();
- 		  s.mok_fingerprints.push_back(mok_fingerprint);
- 		}
--	      rc =
--		sign_module (s.tmpdir, s.module_filename(), s.mok_fingerprints, mok_path, s.kernel_build_tree);
-+              if (s.verbose)
-+                clog << _F("Signing %s with mok key %s", s.module_filename().c_str(), mok_path.c_str())
-+                     << endl;
-+	      rc = sign_module (s.tmpdir, s.module_filename(), s.mok_fingerprints, mok_path, s.kernel_build_tree);
- 	    }
- #endif
- 
-@@ -1310,8 +1312,30 @@ passes_0_4 (systemtap_session &s)
-       if (! s.use_script_cache && s.last_pass <= 4)
-         s.save_module = true;
- 
-+#if HAVE_NSS
-+      // PR30749
-+      if (!rc && s.module_sign_given)
-+        {
-+          // when run on client as --sign-module, mok fingerprints are result of mokutil -l
-+          // when run from server as --sign-module=PATH, mok fingerprint is given by PATH
-+          string mok_path;
-+          if (!s.module_sign_mok_path.empty())
-+            {
-+              string mok_fingerprint;
-+              split_path (s.module_sign_mok_path, mok_path, mok_fingerprint);
-+              s.mok_fingerprints.clear();
-+              s.mok_fingerprints.push_back(mok_fingerprint);
-+            }
-+          
-+          if (s.verbose)
-+            clog << _F("Signing %s with mok key %s", s.module_filename().c_str(), mok_path.c_str())
-+                 << endl;
-+          rc = sign_module (s.tmpdir, s.module_filename(), s.mok_fingerprints, mok_path, s.kernel_build_tree);
-+        }
-+#endif
-+      
-       // Copy module to the current directory.
--      if (s.save_module && !pending_interrupts)
-+      if (!rc && s.save_module && !pending_interrupts)
-         {
- 	  string module_src_path = s.tmpdir + "/" + s.module_filename();
- 	  string module_dest_path = s.module_filename();
-@@ -1327,29 +1351,11 @@ passes_0_4 (systemtap_session &s)
-         }
-     }
-   
--#if HAVE_NSS
--  if (s.module_sign_given)
--    {
--      // when run on client as --sign-module, mok fingerprints are result of mokutil -l
--      // when run from server as --sign-module=PATH, mok fingerprint is given by PATH
--      string mok_path;
--      if (!s.module_sign_mok_path.empty())
--	{
--	  string mok_fingerprint;
--	  split_path (s.module_sign_mok_path, mok_path, mok_fingerprint);
--	  s.mok_fingerprints.clear();
--	  s.mok_fingerprints.push_back(mok_fingerprint);
--	}
--
--      rc = sign_module (s.tmpdir, s.module_filename(), s.mok_fingerprints, mok_path, s.kernel_build_tree);
--    }
--#endif
--  
-   PROBE1(stap, pass4__end, &s);
- 
-   return rc;
- }
--
-+ 
- int
- pass_5 (systemtap_session &s, vector<remote*> targets)
- {

SOURCES/rhbz2223733.patch

@@ -1,24 +0,0 @@
-commit ead30c04c7157fec194c0f6d81e5c51c99bf25cf
-gpg: Signature made Wed 24 May 2023 10:23:54 AM EDT
-gpg:                using RSA key 5D38116FA4D3A7CC77E378D37E83610126DCC2E8
-gpg: Good signature from "Frank Ch. Eigler <fche@elastic.org>" [full]
-Author: Frank Ch. Eigler <fche@redhat.com>
-Date:   Wed May 24 10:22:08 2023 -0400
-
-    PR30484: stap-report: scrape less of /sys /proc
-    
-    Mainly: avoid process/busy parts like /proc/$pid.
-
-diff --git a/stap-report b/stap-report
-index 217ddf840..3b3a1a258 100755
---- a/stap-report
-+++ b/stap-report
-@@ -105,7 +105,7 @@ elif [ -f /var/log/packages ]; then
-   run "cat /var/log/packages | egrep 'systemtap|elfutils|kernel|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu' | sort -k9"
- fi
- run "egrep 'PROBE|RANDOMIZE|RELOC|TRACE|MARKER|KALLSYM|_DEBUG_|LOCKDEP|LOCKING|MODULE|FENTRY|_SIG|BPF' /lib/modules/`uname -r`/build/.config | grep -v not.set | sort | fmt -w 80"
--run "find /debugfs /proc /sys /dev /sys/kernel/debug -type f -path '*kprobe*' -o -path '*yama*' 2>/dev/null | xargs grep -H ."
-+run "find /debugfs /proc/sys /sys/kernel /dev -type f -path '*kprobe*' -o -path '*yama*' 2>/dev/null | xargs grep -H ."
- run "lsmod"
- run "avahi-browse -r -t _stap._tcp"
- run "ifconfig -a"

SOURCES/rhbz2223735.patch

@@ -1,64 +0,0 @@
-commit ab0c5c25509600b7c9cecc9e10baebc984082b50
-gpg: Signature made Fri 12 May 2023 11:18:18 AM EDT
-gpg:                using RSA key 5D38116FA4D3A7CC77E378D37E83610126DCC2E8
-gpg: Good signature from "Frank Ch. Eigler <fche@elastic.org>" [full]
-Author: Frank Ch. Eigler <fche@redhat.com>
-Date:   Fri May 12 11:13:45 2023 -0400
-
-    PR30442: failing optional statement probes should not trigger pass2 exceptions
-    
-    In tapsets.cxx, query_cu() and query_module() aggressively caught &
-    sess-print_error'd semantic_errors from subsidiary call sites.  They
-    are unaware of whether the probe in question is being resolved within
-    an optional (? or !) context.  Instead of this, they now simply let
-    the exceptions propagate out to derive_probes() or similar, which does
-    know whether exceptions are errors in that context.  That means
-    exceptions can propagate through elfutils iteration machinery too,
-    perhaps risking C level memory leaks, but so be it.
-    
-    This fix goes well beyond statement probes per se, but hand-testing
-    and the testsuite appear not to show regressions related to this.
-    
-    Added semok/badstmt.exp to test.
-
-diff --git a/tapsets.cxx b/tapsets.cxx
-index 859160bc5..7b7107371 100644
---- a/tapsets.cxx
-+++ b/tapsets.cxx
-@@ -2453,8 +2453,9 @@ query_cu (Dwarf_Die * cudie, dwarf_query * q)
-     }
-   catch (const semantic_error& e)
-     {
--      q->sess.print_error (e);
--      return DWARF_CB_ABORT;
-+      // q->sess.print_error (e);
-+      throw;
-+      // return DWARF_CB_ABORT;
-     }
- }
- 
-@@ -2696,8 +2697,9 @@ query_module (Dwfl_Module *mod,
-     }
-   catch (const semantic_error& e)
-     {
--      q->sess.print_error (e);
--      return DWARF_CB_ABORT;
-+      // q->sess.print_error (e);
-+      // return DWARF_CB_ABORT;
-+      throw;
-     }
- }
- 
-diff --git a/testsuite/semok/stmtbad.stp b/testsuite/semok/stmtbad.stp
-new file mode 100755
-index 000000000..06780790a
---- /dev/null
-+++ b/testsuite/semok/stmtbad.stp
-@@ -0,0 +1,7 @@
-+#! /bin/sh
-+
-+exec stap -v -p2 -e 'probe oneshot {log("nothing") }
-+                     probe process.statement("main@*:1")? { log("yo") }' -c stap
-+
-+# The optional misaddressed statement probe should let stap still
-+# succeed with the oneshot probe.

SPECS/systemtap.spec

@@ -1,3 +1,5 @@
+# work around flakey gcc warnings
+%{!?with_Werror: %global with_Werror 0}
 %{!?with_sqlite: %global with_sqlite 0%{?fedora} >= 17 || 0%{?rhel} >= 7}
 # prefer prebuilt docs
 %{!?with_docs: %global with_docs 0}
@@ -45,7 +47,7 @@
 %{!?with_sysusers: %global with_sysusers 0%{?fedora} >= 32 || 0%{?rhel} >= 9}
 
 # Virt is supported on these arches, even on el7, but it's not in core EL7
-%if 0%{?rhel} <= 7
+%if 0%{?rhel} && 0%{?rhel} <= 7
 %ifarch ppc64le aarch64
 %global with_virthost 0
 %endif
@@ -64,9 +66,6 @@
    %else
       %if 0%{?rhel} >= 6
          %define udevrulesdir /lib/udev/rules.d
-      %else
-         # RHEL5
-         %define udevrulesdir /etc/udev/rules.d
       %endif
    %endif
 %endif
@@ -83,11 +82,7 @@
     %define dracutbindir %{_bindir}
 %endif
 
-%if 0%{?rhel} == 6
+%{!?_rpmmacrodir: %define _rpmmacrodir %{_rpmconfigdir}/macros.d}
-    %{!?_rpmmacrodir: %define _rpmmacrodir /etc/rpm/}
-%else
-    %{!?_rpmmacrodir: %define _rpmmacrodir %{_rpmconfigdir}/macros.d}
-%endif
 
 # To avoid testsuite/*/*.stp has shebang which doesn't start with '/'
 %define __brp_mangle_shebangs_exclude_from .stp$
@@ -97,7 +92,10 @@
 \
 g     stapusr  156\
 g     stapsys  157\
-g     stapdev  158
+g     stapdev  158\
+g     stapunpriv 159\
+u     stapunpriv 159      "systemtap unprivileged user"   /var/lib/stapunpriv   /sbin/nologin\
+m     stapunpriv stapunpriv
 
 %define _systemtap_server_preinstall \
 # See systemd-sysusers(8) sysusers.d(5)\
@@ -122,8 +120,8 @@ m     stapdev  stapdev
 
 Name: systemtap
 # PRERELEASE
-Version: 4.9
+Version: 5.1
-Release: 3%{?release_override}%{?dist}
+Release: 4%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -156,15 +154,13 @@ Release: 3%{?release_override}%{?dist}
 # intermediary stap-server for --use-server:   systemtap-server (-devel unused)
 
 Summary: Programmable system-wide instrumentation system
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
-
+Patch1: RHEL-36199a.patch
-Patch1: rhbz2223733.patch
+Patch2: RHEL-36199b.patch
-Patch2: rhbz2223735.patch
+Patch3: PR31495.patch
-Patch3: pr29108.patch
+Patch4: RHEL-50107.patch
-Patch4: pr30749.patch
-
 
 # Build*
 BuildRequires: make
@@ -175,6 +171,7 @@ BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(avahi-client)
 %if %{with_debuginfod}
 BuildRequires: pkgconfig(libdebuginfod)
+BuildRequires: pkgconfig(json-c)
 %endif
 %if %{with_dyninst}
 BuildRequires: dyninst-devel >= 10.0
@@ -226,9 +223,6 @@ BuildRequires: pkgconfig(libvirt)
 BuildRequires: pkgconfig(libxml-2.0)
 %endif
 BuildRequires: readline-devel
-%if 0%{?rhel} <= 5
-BuildRequires: pkgconfig(ncurses)
-%endif
 %if %{with_python2_probes}
 BuildRequires: python2-devel
 %if 0%{?fedora} >= 1
@@ -268,7 +262,7 @@ the components needed to locally develop and execute systemtap scripts.
 
 %package server
 Summary: Instrumentation System Server
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-devel = %{version}-%{release}
 Conflicts: systemtap-devel < %{version}-%{release}
@@ -298,7 +292,7 @@ compiles systemtap scripts to kernel objects on their demand.
 
 %package devel
 Summary: Programmable system-wide instrumentation system - development headers, tools
-License: GPLv2+
+License: GPL-2.0-or-later AND GPL-2.0-only AND BSD-3-Clause AND LGPL-2.1-only AND BSD-2-Clause
 URL: http://sourceware.org/systemtap/
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
@@ -328,7 +322,7 @@ a copy of the standard tapset library and the runtime library C files.
 
 %package runtime
 Summary: Programmable system-wide instrumentation system - runtime
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires(pre): shadow-utils
 Conflicts: systemtap-devel < %{version}-%{release}
@@ -343,7 +337,7 @@ using a local or remote systemtap-devel installation.
 
 %package client
 Summary: Programmable system-wide instrumentation system - client
-License: GPLv2+
+License: GPL-2.0-or-later AND GPL-2.0-only AND BSD-3-Clause AND LGPL-2.1-only AND GFDL-1.2-or-later AND BSD-2-Clause
 URL: http://sourceware.org/systemtap/
 Requires: zip unzip
 Requires: systemtap-runtime = %{version}-%{release}
@@ -366,7 +360,7 @@ documentation, and a copy of the tapset library for reference.
 
 %package initscript
 Summary: Systemtap Initscripts
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap = %{version}-%{release}
 %if %{with_systemd}
@@ -386,7 +380,7 @@ boot-time probing if supported.
 
 %package sdt-devel
 Summary: Static probe support tools
-License: GPLv2+ and Public Domain
+License: GPL-2.0-or-later AND CC0-1.0
 URL: http://sourceware.org/systemtap/
 %if %{with_pyparsing}
 %if %{with_python3}
@@ -409,12 +403,12 @@ with the optional dtrace-compatibility preprocessor to process related
 
 %package testsuite
 Summary: Instrumentation System Testsuite
-License: GPLv2+
+License: GPL-2.0-or-later AND GPL AND GPL-2.0-only AND GPL-3.0-or-later AND MIT
 URL: http://sourceware.org/systemtap/
 Requires: systemtap = %{version}-%{release}
 Requires: systemtap-sdt-devel = %{version}-%{release}
 Requires: systemtap-server = %{version}-%{release}
-Requires: dejagnu which elfutils grep nc
+Requires: dejagnu which elfutils grep nc wget
 %if %{with_debuginfod}
 Requires: elfutils-debuginfod
 %endif
@@ -481,7 +475,7 @@ systemtap on the current system.
 %if %{with_java}
 %package runtime-java
 Summary: Systemtap Java Runtime Support
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 # work around fedora ci gating kvetching about i686<->x86-64 conflicts
@@ -503,7 +497,7 @@ that probe Java processes running on the OpenJDK runtimes using Byteman.
 %if %{with_python2_probes}
 %package runtime-python2
 Summary: Systemtap Python 2 Runtime Support
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
@@ -515,7 +509,7 @@ that probe python 2 processes.
 %if %{with_python3_probes}
 %package runtime-python3
 Summary: Systemtap Python 3 Runtime Support
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
@@ -532,7 +526,7 @@ that probe python 3 processes.
 %if %{with_python3_probes}
 %package exporter
 Summary: Systemtap-prometheus interoperation mechanism
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
@@ -545,7 +539,7 @@ to remote requesters on demand.
 %if %{with_virthost}
 %package runtime-virthost
 Summary: Systemtap Cross-VM Instrumentation - host
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 # only require libvirt-libs really
 #Requires: libvirt >= 1.0.2
@@ -560,7 +554,7 @@ connection.
 %if %{with_virtguest}
 %package runtime-virtguest
 Summary: Systemtap Cross-VM Instrumentation - guest
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 %if %{with_systemd}
@@ -578,10 +572,9 @@ This package installs the services necessary on a virtual machine for a
 systemtap-runtime-virthost machine to execute systemtap scripts.
 %endif
 
-%if %{with_python3} && %{with_monitor}
 %package jupyter
 Summary: ISystemtap jupyter kernel and examples
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://sourceware.org/systemtap/
 Requires: systemtap = %{version}-%{release}
 
@@ -589,7 +582,7 @@ Requires: systemtap = %{version}-%{release}
 This package includes files needed to build and run
 the interactive systemtap Jupyter kernel, either locally
 or within a container.
-%endif
+
 # ------------------------------------------------------------------------
 
 %prep
@@ -608,6 +601,13 @@ or within a container.
 %global dyninst_config --without-dyninst
 %endif
 
+# Enable/disable the dyninst pure-userspace backend
+%if %{with_Werror}
+%global Werror_config --enable-Werror
+%else
+%global Werror_config --disable-Werror
+%endif
+
 # Enable/disable the sqlite coverage testing support
 %if %{with_sqlite}
 %global sqlite_config --enable-sqlite
@@ -695,7 +695,7 @@ or within a container.
 # We don't ship compileworthy python code, just oddball samples
 %global py_auto_byte_compile 0
 
-%configure %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} %{debuginfod_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
+%configure %{Werror_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} %{debuginfod_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
 make %{?_smp_mflags} V=1
 
 
@@ -853,6 +853,9 @@ echo '%_systemtap_runtime_preinstall' | systemd-sysusers --replace=%{_sysusersdi
 getent group stapusr >/dev/null || groupadd -f -g 156 -r stapusr
 getent group stapsys >/dev/null || groupadd -f -g 157 -r stapsys
 getent group stapdev >/dev/null || groupadd -f -g 158 -r stapdev
+getent passwd stapunpriv >/dev/null || \
+  useradd -c "Systemtap Unprivileged User" -u 159 -g stapunpriv -d %{_localstatedir}/lib/stapunpriv -r -s /sbin/nologin stapunpriv 2>/dev/null || \
+  useradd -c "Systemtap Unprivileged User" -g stapunpriv -d %{_localstatedir}/lib/stapunpriv -r -s /sbin/nologin stapunpriv
 %endif
 exit 0
 
@@ -1299,14 +1302,12 @@ exit 0
 %{_sbindir}/stap-exporter
 %endif
 
-%if %{with_python3} && %{with_monitor}
 %files jupyter
 %{_bindir}/stap-jupyter-container
 %{_bindir}/stap-jupyter-install
 %{_mandir}/man1/stap-jupyter.1*
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/interactive-notebook
-%endif
 
 # ------------------------------------------------------------------------
 
@@ -1317,232 +1318,134 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Mon Sep 9 2024 Martin Cermak <mcermak@redhat.com> - 5.1-4
+- RHEL-50107.patch:  Make systemtap compatible with kernel
+  commit 68cbd415dd4b .  Related: RHEL-56962 .
+
+* Thu May 16 2024 Martin Cermak <mcermak@redhat.com> - 5.1-3
+- RHEL-7318
+
+* Tue May 14 2024 William Cohen <wcohen@redhat.com> - 5.1-2
+- RHEL-36199
+
+* Fri Apr 26 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-1
+- Upstream release, see wiki page below for detailed notes.
+  https://sourceware.org/systemtap/wiki/SystemTapReleases
+
+* Wed Dec 6 2023 William Cohen <wcohen@redhat.com> - 5.0-4
+- RHEL-18334
+
+* Tue Nov 14 2023 Frank Ch. Eigler <fche@redhat.com> - 5.0-3
+- RHEL-16549
+
+* Mon Nov 06 2023 Frank Ch. Eigler <fche@redhat.com> - 5.0-2
+- License header tweak
+
+* Fri Nov 03 2023 Frank Ch. Eigler <fche@redhat.com> - 5.0-1
+- Upstream release, see wiki page below for detailed notes.
+  https://sourceware.org/systemtap/wiki/SystemTapReleases
+
 * Mon Aug 14 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-3
-- rhbz2231619
+- rhbz2231632
-- rhbz2095359
+- rhbz2231635
 
 * Tue Jul 18 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-2
-- rhbz2223733 = rhbz2211288
+- rhbz2223733
-- rhbz2223735 = rhbz2223739
+- rhbz2223735
 
 * Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1
 - Upstream release, see wiki page below for detailed notes.
   https://sourceware.org/systemtap/wiki/SystemTapReleases
 
-* Fri Dec 23 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-2
+* Fri Dec 16 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-2
-- rhbz2156092 = rhbz1997192
+- rhbz1997192
-- rhbz2145241 = rhbz2145242
+- rhbz2145242
-- rhbz2156093 = rhbz2149223
+- rhbz2149223
-- rhbz2156095 = rhbz2149666
+- rhbz2149666
-- rhbz2156094 = rhbz2154430
+- rhbz2154430
 
 * Thu Nov 03 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-1
 - Upstream release.
 
-* Mon May 02 2022 Stan Cox <scox@redhat.com> - 4.7-1
+* Tue May 17 2022 Martin Cermak <mcermak@redhat.com> - 4.7-2
+- Fix rhbz2081102 and rhbz2085647
+
+* Mon May 02 2022 Frank Ch. Eigler <fche@redhat.com> - 4.7-1
 - Upstream release, see wiki page below for detailed notes.
   https://sourceware.org/systemtap/wiki/SystemTapReleases
 
-* Tue Dec 07 2021 Stan Cox <scox@redhat.com> - 4.6.4
+* Wed Feb 2 2022 Stan Cox <scox@redhat.com> - 4.6-11
+- rhbz2039207: Attempt userspace string access if kernel access fails
+
+* Tue Feb 1 2022 Martin Cermak <mcermak@redhat.com> - 4.6-10
+- rhbz2047256: [ppc64le] Assertion `index >= 0' failed
+
+* Fri Jan 21 2022 Martin Cermak <mcermak@redhat.com> - 4.6-9
+- rhbz2027683: python tapset regression
+- rhbz2027683: systemtap.examples/io/iostat-scsi.stp PR28633
+
+* Mon Jan 17 2022 Martin Cermak <mcermak@redhat.com> - 4.6-6
+- rhbz2041526/pr28634: move elevator.h to block/
+
+* Tue Dec 07 2021 Stan Cox <scox@redhat.com> - 4.6.5
 - sys/sdt.h remove aarch64 and s390 float constraints
 
-* Mon Dec 06 2021 Stan Cox <scox@redhat.com> - 4.6.3
+* Mon Dec 06 2021 Stan Cox <scox@redhat.com> - 4.6.4
 - sys/sdt.h remove float constraints that may cause gcc reload issues.
 
-* Thu Dec 02 2021 Frank Ch. Eigler <fche@redhat.com> - 4.6.2
+* Thu Dec 02 2021 Frank Ch. Eigler <fche@redhat.com> - 4.6.3
+- rhbz2972798 - nfs tapset tweaks
 - sys/sdt.h fixes for glibc ftbfs
 
-* Mon Nov 15 2021 Frank Ch. Eigler <fche@redhat.com> - 4.6-1
+* Thu Nov 25 2021 Martin Cermak <mcermak@redhat.com> - 4.6.2
+- rhbz2012907: Fix use of sysuser.d/* for user/group management
+
+* Fri Nov 19 2021 Frank Ch. Eigler <fche@redhat.com> - 4.6-1
 - Upstream release.
 
-* Thu Aug 12 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-3
+* Thu Sep 09 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-8
-- rhbz1991631 iommu tracepoints break ppc64le
+- rhbz1985124: Kernel 5.14 compatibility omnibus cont'd.
 
-* Tue Jul 27 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-2
+* Thu Aug 12 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-7
-- rhbz1986543 rebuild against dyninst 11
+- rhbz1985124: Kernel 5.14 compatibility omnibus.
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.5-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Jul 26 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-3
+- rhbz1982908: Import hardening c*flags from specs/rhel standards
+
+* Tue May 18 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-2
+- Respin against newer dyninst.
 
 * Fri May 07 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-1
 - Upstream release.
 
-* Tue Jan 26 2021 Frank Ch. Eigler <fche@redhat.com> - 4.4-9
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.5-0.202102101545git8d5e0abc542c
-- rhbz1927497 enable debuginfod client for buildid probing
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Frank Ch. Eigler <fche@redhat.com> - 4.4-8
-- rhbz1902696 fix invocation as stapusr with procfs/lockdown
-
-* Wed Jan 20 2021 Martin Cermak <mcermak@redhat.com> - 4.4-7
-- rhbz1650594 fix boot time probing feature
-
-* Mon Jan 04 2021 Frank Ch. Eigler <fche@redhat.com> - 4.4-6
-- rhbz1906662 backport transport/utrace/locking patches
-
-* Thu Dec 17 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-5
-- rhbz1908904 fix lock-pushdown codegen for conditional probes
-
-* Tue Dec 15 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-4
-- rhbz1902696 fix invocation as stapusr vs. root
-
-* Tue Nov 17 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-3
-- rhbz1873492 related: rhel8 kernel_is_locked_down detection
-
-* Mon Nov 16 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-2
-- rhbz1898288: stability for exhausted UTRACE_TASK_WORK_POOL
-- rhbz1873492 related: mokutil parser robustness for RH keys
 
 * Mon Nov 09 2020 Frank Ch. Eigler <fche@redhat.com> - 4.4-1
 - Upstream release.
 
-* Wed Aug 12 2020 Martin Cermak <mcermak@redhat.com> - 4.3-4
+* Thu Jun 11 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-1
-- rhbz1868095: Refix including PR26379.
+- Upstream release.
 
-* Wed Aug 12 2020 Martin Cermak <mcermak@redhat.com> - 4.3-3
+* Mon Nov 18 2019 Sagar Patel <sapatel@redhat.com> - 4.2-1
-- rhbz1868095: byteman-java-methods-probing
+- Upstream release.
-
-* Tue Jul 28 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-2
-- rhbz1857749: uprobes-inode changes
-- rhbz1855264: @cast adaptations
-
-* Thu Jun 11 2020 Stan Cox <scox@redhat.com> - 4.3-1
-- rhbz1804319: Upstream release.
-
-* Tue Feb 11 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-6
-- rhbz1795196 cont'd: autoconf fix for kernel change to stack_trace_save_regs
-
-* Tue Jan 28 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-5
-- rhbz1795196: kallsyms vs. elfutils/vmlinuz
-
-* Thu Jan 23 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-4
-- rhbz1788662: check for rcu_is_watching() during prologue
-
-* Fri Jan 10 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-3
-- rhbz1788544: stop bytecompiling systemtap-mode.el
-
-* Fri Jan 10 2020 Frank Ch. Eigler <fche@redhat.com> - 4.2-2
-- rhbz1788648: aarch64 sdt.h parse [x0, x1]
-
-* Tue Nov 19 2019 Frank Ch. Eigler <fche@redhat.com> - 4.2-1
-- rhbz1744989: Upstream release.
-
-* Tue Aug 06 2019 Frank Ch. Eigler <fche@redhat.com> - 4.1-6
-- rhbz1732514: add java-devel prereq to systemtap-runtime-java
-
-* Wed Jul 31 2019 Serguei Makarov <smakarov@redhat.com> - 4.1-5
-- rhbz1734973: Fix possible stapbpf segfault with foreach string key iteration.
-
-* Mon Jul 29 2019 Frank Ch. Eigler <fche@redhat.com> - 4.1-4
-- rhbz1732173 (arm64 syscall parameters)
-
-* Tue Jun 04 2019 Stan Cox <scox@redhat.com> - 4.1-3
-- Rebuilt for dyninst 10.1.0
-
-* Tue May 14 2019 Frank Ch. Eigler <fche@redhat.com> - 4.1-2
-- Correct GNU_parameter_ref dwarf feature typo.
 
 * Tue May 07 2019 Serguei Makarov <smakarov@redhat.com> - 4.1-1
 - Upstream release.
 
-* Mon Dec 17 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-7
-- rhbz1657909: vfs tapset fixes for $cred
-
-* Mon Dec 10 2018 William Cohen <wcohen@redhat.com> - 4.0-6
-- rhbz1657857: Please, backport periodic.stp from current upstream aacee6563.
-
-* Fri Dec 07 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-5
-- rhbz1657186: fix/port nfsd.proc4.[read,commit] tapset aliases
-
-* Thu Dec 06 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-4
-- rhbz1656795: support bdflush syscall
-
-* Tue Dec 04 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-3
-- rhbz1655631: change kernel-devel* deps to Recommends:
-
-* Wed Nov 14 2018 Serhei Makarov <smakarov@redhat.com> - 4.0-2
-- rhbz1643997: backported string tapset functionality and bugfixes
-
 * Sat Oct 13 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-1
 - Upstream release.
 
-* Thu Aug 30 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-0.20180830git
+* Thu Jun 07 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-1
-- Enable brp-mangle for python scripts (rhbz1619413).
+- Upstream release.
-
-* Fri Aug 10 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-0.20180810git
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Mon May 14 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-0.20180508git9c6ac6cda49e.2
-- respin w/ fixed glibc
-
-* Tue May 08 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-0.20180508git9c6ac6cda49e
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Apr 19 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.2-11
-- Add rhbz1549063.patch (/bin/env -> /usr/bin/env)
-- Add rhbz1566745.patch (4.15 kernel tapset updates)
-- Enable accidentially disabled Suggests: kernel-devel again.
-
-* Wed Apr 18 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.2-10
-- Add unwind-fallback.patch
-- rhbz1566422.patch
-
-* Tue Apr 17 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.2-9
-- Add unwind-fallback.patch.
-
-* Tue Mar 27 2018 Björn Esser <besser82@fedoraproject.org> - 3.2-8
-- Rebuilt for libjson-c.so.4 (json-c v0.13.1) on fc28
-
-* Thu Feb 22 2018 Sergey Avseyev <sergey.avseyev@gmail.com> - 3.2-7
-- rhbz1546563 (backport fix for removed timers in kernel 4.15)
-
-* Tue Feb 13 2018 Stan Cox <scox@redhat.com> - 3.2-6
-- rebuilt
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.2-5
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.2-4
-- Fix very old Requires
-
-* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 3.2-3
-- Rebuilt for libjson-c.so.3
-
-* Fri Oct 20 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-2 
-- rhbz1504009 (dtrace -G -o /dev/null)
 
 * Wed Oct 18 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-1
 - Upstream release.
 
-* Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.2-0.20170516gitc67d8f274b21
-- Rebuilt after RPM update (№ 3)
-
-* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.2-0.20170515gitc67d8f274b21
-- Rebuilt for RPM soname bump
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-0.20170514gitc67d8f274b21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-0.20170513gitc67d8f274b21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri May 12 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-0.20170512gitc67d8f274b21
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Mon Apr 10 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-0.20170410gitcbf2583808d6
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Thu Apr 06 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-0.20170406git83d186dc7f5c
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Mar 21 2017 Frank Ch. Eigler <fche@redhat.com> - 3.2-0.20170321git272146660f54
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Fri Mar 10 2017 Stan Cox <scox@redhat.com> - 3.1-2
-- Rebuild for dyninst 9.3
-
 * Fri Feb 17 2017 Frank Ch. Eigler <fche@redhat.com> - 3.1-1
 - Upstream release.
 
@@ -1562,7 +1465,7 @@ exit 0
 - Upstream release.
 
 * Mon Jul 07 2014 Josh Stone <jistone@redhat.com>
-- Flip with_dyninst to an %%ifarch whitelist.
+- Flip with_dyninst to an %%ifarch passlist.
 
 * Wed Apr 30 2014 Jonathan Lebon <jlebon@redhat.com> - 2.5-1
 - Upstream release.