.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,68 @@
-SOURCES/systemtap-4.9.tar.gz
+/systemtap-3.1.tar.gz
+/systemtap-3.2-0.20170321git272146660f54.tar.gz
+/systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz
+/systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz
+/systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz
+/systemtap-3.2.tar.gz
+/systemtap-3.3-0.20180222git5ef0c24456e3.tar.gz
+/systemtap-3.3-0.20180315gitc2585f2b58cd.tar.gz
+/systemtap-3.3-0.20180420gitd4a446c.tar.gz
+/systemtap-3.3-0.20180508git9c6ac6cda49e.tar.gz
+/systemtap-3.3.tar.gz
+/systemtap-4.0-0.20180810git.tar.gz
+/systemtap-4.0-0.20180906git37598c4fee7c.tar.gz
+/systemtap-4.0-0.20180914gitc51d4e55d285.tar.gz
+/systemtap-4.0-0.20180914gitc1befcceae01.tar.gz
+/systemtap-4.0-0.20180914git11a0a7aea387.tar.gz
+/systemtap-4.0-0.20180914gitfe4e14f4af16.tar.gz
+/systemtap-4.0-0.20180914gitfe4e14f4af16.1.tar.gz
+/systemtap-4.0-0.20181003git4ad1e11de831.tar.gz
+/systemtap-4.0.tar.gz
+/systemtap-4.1-0.20181126gitf082df49dd91.tar.gz
+/systemtap-4.1-0.20181126git47ce37a149b6.tar.gz
+/systemtap-4.1-0.20181203gitec3b46eb9b19.tar.gz
+/systemtap-4.1-0.20181204git891810c246d6.tar.gz
+/systemtap-4.1-0.20190123gitc8084763b75f.tar.gz
+/systemtap-4.1-0.20190125git905865da1024.tar.gz
+/systemtap-4.1-0.20190207git4e76869512d2.tar.gz
+/systemtap-4.1-0.20190307gitf7fb9c9182dc.tar.gz
+/systemtap-4.1-0.20190308gitb3627d9aa037.tar.gz
+/systemtap-4.1-0.20190327git2ede4cecb20c.tar.gz
+/systemtap-4.1-0.20190502git446e7c358247.tar.gz
+/systemtap-4.1.tar.gz
+/systemtap-4.2-0.20190513git8b868f3dd030.tar.gz
+/systemtap-4.2-0.20190613git2d77f531a5d1.tar.gz
+/systemtap-4.2-0.20190618git47c3f6c60174.tar.gz
+/systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz
+/systemtap-4.2-0.20190827git8ffab23ff.tar.gz
+/systemtap-4.2.tar.gz
+/systemtap-4.3-0.20200112gitb1e6a6645bba.tar.gz
+/systemtap-4.3-0.20200203git6c0b74f5910a.tar.gz
+/systemtap-4.3-0.20200211git91ffb97ad335.tar.gz
+/systemtap-4.3-0.20200529git6d50a5cadb64.tar.gz
+/systemtap-4.3.tar.gz
+/systemtap-4.4-0.20200714git8212024da2ae.tar.gz
+/systemtap-4.4-0.20200714gite5a63d9c000a.tar.gz
+/systemtap-4.4-0.20200715gitce0fa621eb35.tar.gz
+/systemtap-4.4-0.20200731git87344e948606.tar.gz
+/systemtap-4.4-0.20200805git82b8e1a07.tar.gz
+/systemtap-4.4-0.20200922git05179173e71c.tar.gz
+/systemtap-4.4.tar.gz
+/systemtap-4.4-0.20201203gitf02f08bc6eff.tar.gz
+/systemtap-4.5-0.20201203git963c215e781e.tar.gz
+/systemtap-4.5-0.20201204git0d80048e02ec.tar.gz
+/systemtap-4.5-0.20201210gitd86b64029598.tar.gz
+/systemtap-4.5-0.20210105git6cb54128e005.tar.gz
+/systemtap-4.5-0.20210107gita4d01e48d435.tar.gz
+/systemtap-4.5-0.20210128gita790dc64a9d8.tar.gz
+/systemtap-4.5-0.20210129gitea81249b90b9.tar.gz
+/systemtap-4.5-0.202101291559git9e1a0f5703ad.tar.gz
+/systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz
+/systemtap-4.5.tar.gz
+/systemtap-4.6.tar.gz
+/systemtap-4.7.tar.gz
+/systemtap-4.8.tar.gz
+/systemtap-4.9.tar.gz
+/systemtap-5.0.tar.gz
+/systemtap-5.1.tar.gz
+/systemtap-5.2.tar.gz

.systemtap.metadata

@@ -1 +0,0 @@
-7ba2ad579a5ba66ccfd36ad6df0896c9e136f9e9 SOURCES/systemtap-4.9.tar.gz

PR32302.patch

@@ -0,0 +1,223 @@
+commit 8b87bd584dcadb3713eaf6d0c9b540b4f54124bf
+gpg: Signature made Mon 11 Nov 2024 11:48:03 AM EST
+gpg:                using RSA key D8F2E95271BA794E222FBEE0DB83606EC7DAAB26
+gpg: Can't check signature: No public key
+Author: Martin Cermak <mcermak@redhat.com>
+Date:   Mon Nov 11 17:41:53 2024 +0100
+
+    PR32302:  Emit forward decls within tracepoint_derived_probe_group() too
+    
+    Forward decls added in commit 069def0ae9184 need to actually be
+    emitted in 2 locations, roughtly corresponding to where
+    tracepoint_extra_decls() is used.
+    
+    It would be ideal to put them directly to tracepoint_extra_decls()
+    but that gives significantly less recognized tracepoints.
+    
+    The plan is toreview this again though and try to merge the
+    tracepoint_forward_decls() body into tracepoint_extra_decls()
+    if possible.
+
+diff --git a/tapsets.cxx b/tapsets.cxx
+index b4ad7e14e..06540cafc 100644
+--- a/tapsets.cxx
++++ b/tapsets.cxx
+@@ -11729,6 +11729,89 @@ static bool header_exists(systemtap_session& s, const string& header)
+   return false;
+ }
+ 
++static vector<string> tracepoint_forward_decls ()
++{
++    vector<string> retval;
++    // Kernel 6.12
++    retval.push_back("enum cachefiles_content;");
++    retval.push_back("enum extent_type;");
++    retval.push_back("struct bch_fs;");
++    retval.push_back("struct bch_move_stats;");
++    retval.push_back("struct bpos;");
++    retval.push_back("struct btree_bkey_cached_common;");
++    retval.push_back("struct btree_insert_entry;");
++    retval.push_back("struct btree_path;");
++    retval.push_back("struct btree_trans;");
++    retval.push_back("struct cachefiles_msg;");
++    retval.push_back("struct cachefiles_open;");
++    retval.push_back("struct cachefiles_read;");
++    retval.push_back("struct cachefiles_volume;");
++    retval.push_back("struct clk_rate_request;");
++    retval.push_back("struct compact_control;");
++    retval.push_back("struct fsi_device;");
++    retval.push_back("struct fsi_msg;");
++    retval.push_back("struct fsi_slave;");
++    retval.push_back("struct fuse_req;");
++    retval.push_back("struct get_locks_fail;");
++    retval.push_back("struct gss_cred;");
++    retval.push_back("struct handshake_req;");
++    retval.push_back("struct i2c_client;");
++    retval.push_back("struct ib_mad_agent_private;");
++    retval.push_back("struct ib_mad_qp_info;");
++    retval.push_back("struct ib_mad_send_wr_private;");
++    retval.push_back("struct ib_smp;");
++    retval.push_back("struct iomap;");
++    retval.push_back("struct iomap_iter;");
++    retval.push_back("struct mctp_sk_key;");
++    retval.push_back("struct mptcp_ext;");
++    retval.push_back("struct mptcp_subflow_context;");
++    retval.push_back("struct nbd_request;");
++    retval.push_back("struct netfs_io_request;");
++    retval.push_back("struct netfs_io_stream;");
++    retval.push_back("struct netfs_io_subrequest;");
++    retval.push_back("struct nfs42_clone_args;");
++    retval.push_back("struct nfs42_copy_args;");
++    retval.push_back("struct nfs42_copy_notify_args;");
++    retval.push_back("struct nfs42_copy_notify_res;");
++    retval.push_back("struct nfs42_copy_res;");
++    retval.push_back("struct nfs42_falloc_args;");
++    retval.push_back("struct nfs42_offload_status_args;");
++    retval.push_back("struct nfs42_seek_args;");
++    retval.push_back("struct nfs42_seek_res;");
++    retval.push_back("struct nfs_direct_req;");
++    retval.push_back("struct nfs_page;");
++    retval.push_back("struct opa_smp;");
++    retval.push_back("struct p9_fid;");
++    retval.push_back("struct pwc_device;");
++    retval.push_back("struct request;");
++    retval.push_back("struct rpc_auth;");
++    retval.push_back("struct rpc_gss_wire_cred;");
++    retval.push_back("struct rpcrdma_ep;");
++    retval.push_back("struct rpcrdma_mr;");
++    retval.push_back("struct rpcrdma_notification;");
++    retval.push_back("struct rpcrdma_rep;");
++    retval.push_back("struct rpcrdma_req;");
++    retval.push_back("struct rpcrdma_xprt;");
++    retval.push_back("struct rpc_rqst;");
++    retval.push_back("struct rpc_task;");
++    retval.push_back("struct selinux_audit_data;");
++    retval.push_back("struct spi_device;");
++    retval.push_back("struct svc_rdma_chunk;");
++    retval.push_back("struct svc_rdma_recv_ctxt;");
++    retval.push_back("struct svc_rdma_segment;");
++    retval.push_back("struct svc_rdma_send_ctxt;");
++    retval.push_back("struct svc_rqst;");
++    retval.push_back("struct svcxprt_rdma;");
++    retval.push_back("struct tmigr_cpu;");
++    retval.push_back("struct tmigr_group;");
++    retval.push_back("struct virtio_gpu_ctrl_hdr;");
++    retval.push_back("struct virtqueue;");
++    retval.push_back("struct somenonexistentstruct_123;");
++    retval.push_back("union ifs_sbaf;");
++    retval.push_back("union ifs_sbaf_status;");
++    retval.push_back("union tmigr_state;");
++    return retval;
++}
+ 
+ static vector<string> tracepoint_extra_decls (systemtap_session& s,
+ 					      const string& header,
+@@ -12187,6 +12270,8 @@ tracepoint_derived_probe_group::emit_module_decls (systemtap_session& s)
+   s.op->newline();
+ 
+ 
++
++
+   // We create a MODULE_aux_N.c file for each tracepoint header, to allow them
+   // to be separately compiled.  That's because kernel tracepoint headers sometimes
+   // conflict.  PR13155.
+@@ -12207,6 +12292,11 @@ tracepoint_derived_probe_group::emit_module_decls (systemtap_session& s)
+           tpop = s.op_create_auxiliary();
+           per_header_aux[header] = tpop;
+ 
++          // add needed forward decls/#includes
++          static vector<string> forward_decls = tracepoint_forward_decls();
++          for (unsigned z=0; z<forward_decls.size(); z++)
++             tpop->newline()<< forward_decls[z] << "\n";
++
+           // PR9993: Add extra headers to work around undeclared types in individual
+           // include/trace/foo.h files
+           const vector<string>& extra_decls = tracepoint_extra_decls (s, header,
+@@ -12773,83 +12863,10 @@ tracepoint_builder::get_tracequery_modules(systemtap_session& s,
+       osrc << "#ifdef CONFIG_TRACEPOINTS" << endl;
+       osrc << "#include <linux/tracepoint.h>" << endl;
+ 
+-      osrc << "enum cachefiles_content;" << endl;
+-      osrc << "enum extent_type;" << endl;
+-      osrc << "struct bch_fs;" << endl;
+-      osrc << "struct bch_move_stats;" << endl;
+-      osrc << "struct bpos;" << endl;
+-      osrc << "struct btree_bkey_cached_common;" << endl;
+-      osrc << "struct btree_insert_entry;" << endl;
+-      osrc << "struct btree_path;" << endl;
+-      osrc << "struct btree_trans;" << endl;
+-      osrc << "struct cachefiles_msg;" << endl;
+-      osrc << "struct cachefiles_open;" << endl;
+-      osrc << "struct cachefiles_read;" << endl;
+-      osrc << "struct cachefiles_volume;" << endl;
+-      osrc << "struct clk_rate_request;" << endl;
+-      osrc << "struct compact_control;" << endl;
+-      osrc << "struct fsi_device;" << endl;
+-      osrc << "struct fsi_msg;" << endl;
+-      osrc << "struct fsi_slave;" << endl;
+-      osrc << "struct fuse_req;" << endl;
+-      osrc << "struct get_locks_fail;" << endl;
+-      osrc << "struct gss_cred;" << endl;
+-      osrc << "struct handshake_req;" << endl;
+-      osrc << "struct i2c_client;" << endl;
+-      osrc << "struct ib_mad_agent_private;" << endl;
+-      osrc << "struct ib_mad_qp_info;" << endl;
+-      osrc << "struct ib_mad_send_wr_private;" << endl;
+-      osrc << "struct ib_smp;" << endl;
+-      osrc << "struct iomap;" << endl;
+-      osrc << "struct iomap_iter;" << endl;
+-      osrc << "struct mctp_sk_key;" << endl;
+-      osrc << "struct mptcp_ext;" << endl;
+-      osrc << "struct mptcp_subflow_context;" << endl;
+-      osrc << "struct nbd_request;" << endl;
+-      osrc << "struct netfs_io_request;" << endl;
+-      osrc << "struct netfs_io_stream;" << endl;
+-      osrc << "struct netfs_io_subrequest;" << endl;
+-      osrc << "struct nfs42_clone_args;" << endl;
+-      osrc << "struct nfs42_copy_args;" << endl;
+-      osrc << "struct nfs42_copy_notify_args;" << endl;
+-      osrc << "struct nfs42_copy_notify_res;" << endl;
+-      osrc << "struct nfs42_copy_res;" << endl;
+-      osrc << "struct nfs42_falloc_args;" << endl;
+-      osrc << "struct nfs42_offload_status_args;" << endl;
+-      osrc << "struct nfs42_seek_args;" << endl;
+-      osrc << "struct nfs42_seek_res;" << endl;
+-      osrc << "struct nfs_direct_req;" << endl;
+-      osrc << "struct nfs_page;" << endl;
+-      osrc << "struct opa_smp;" << endl;
+-      osrc << "struct p9_fid;" << endl;
+-      osrc << "struct pwc_device;" << endl;
+-      osrc << "struct request;" << endl;
+-      osrc << "struct rpc_auth;" << endl;
+-      osrc << "struct rpc_gss_wire_cred;" << endl;
+-      osrc << "struct rpcrdma_ep;" << endl;
+-      osrc << "struct rpcrdma_mr;" << endl;
+-      osrc << "struct rpcrdma_notification;" << endl;
+-      osrc << "struct rpcrdma_rep;" << endl;
+-      osrc << "struct rpcrdma_req;" << endl;
+-      osrc << "struct rpcrdma_xprt;" << endl;
+-      osrc << "struct rpc_rqst;" << endl;
+-      osrc << "struct rpc_task;" << endl;
+-      osrc << "struct selinux_audit_data;" << endl;
+-      osrc << "struct spi_device;" << endl;
+-      osrc << "struct svc_rdma_chunk;" << endl;
+-      osrc << "struct svc_rdma_recv_ctxt;" << endl;
+-      osrc << "struct svc_rdma_segment;" << endl;
+-      osrc << "struct svc_rdma_send_ctxt;" << endl;
+-      osrc << "struct svc_rqst;" << endl;
+-      osrc << "struct svcxprt_rdma;" << endl;
+-      osrc << "struct tmigr_cpu;" << endl;
+-      osrc << "struct tmigr_group;" << endl;
+-      osrc << "struct virtio_gpu_ctrl_hdr;" << endl;
+-      osrc << "struct virtqueue;" << endl;
+-      osrc << "struct somenonexistentstruct_123;" << endl;
+-      osrc << "union ifs_sbaf;" << endl;
+-      osrc << "union ifs_sbaf_status;" << endl;
+-      osrc << "union tmigr_state;" << endl;
++      // add needed forward decls/#includes
++      static vector<string> forward_decls = tracepoint_forward_decls();
++      for (unsigned z=0; z<forward_decls.size(); z++)
++        osrc << forward_decls[z] << "\n";
+ 
+       // BPF raw tracepoint macros for creating the multiple fields
+       // of the data struct that describes the raw tracepoint.

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.

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}

plans/ci.fmf

@@ -0,0 +1,12 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/systemtap-gating.git
+    ref: main
+    directory: tests
+prepare:
+    - name: prepare
+      how: shell
+      script: ./plans/prepare.sh
+execute:
+    how: tmt

plans/prepare.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -xe
+
+# Install needed packages
+dnf -y install /usr/bin/stap-prep
+stap-prep
+
+# Report installed packages
+stap-report
+
+# Set up SELinux so that it allows for userspace probing
+setsebool allow_execmod on
+setsebool allow_execstack on
+setsebool deny_ptrace off
+
+set +xe

rpminspect.yaml

@@ -0,0 +1,28 @@
+# exclude ownership tests; we need setuid/gids as is
+ownership:
+  ignore:
+    - /usr/bin/staprun
+
+# this SO is for JNI only, so annobin/etc. don't know what to do with it
+annocheck:
+  ignore:
+    - /usr/libexec/systemtap/libHelperSDT.so
+
+# bytecode version 43 vs 55 complaint is a misconfiguration according to msrb
+javabytecode:
+  ignore:
+    - /usr/libexec/systemtap/HelperSDT.jar
+
+# setuid binary
+permissions:
+  ignore:
+    - /usr/bin/staprun
+
+# some stap scripts are wrapped within /bin/sh that confuses rpminspect
+shellsyntax:
+  ignore:
+    - /usr/share/systemtap/examples/stapgames/2048.stp
+    - /usr/share/systemtap/testsuite/semko/autocast10.stp
+    - /usr/share/systemtap/testsuite/semok/autocast10.stp
+    - /usr/share/systemtap/testsuite/parseko/autocast02.stp
+    - /usr/share/systemtap/testsuite/systemtap.examples/stapgames/2048.stp

sources

@@ -0,0 +1 @@
+SHA512 (systemtap-5.2.tar.gz) = 30137e232e44abe98747ae61a71a162eff5abc89e9a922f86ade834eac2cac1923ae06d4ed17710718adba082ad06d2fb544822003a54e13b97eea9e183bdf9d

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.2
-Release: 3%{?release_override}%{?dist}
+Release: 1%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -135,7 +133,8 @@ Release: 3%{?release_override}%{?dist}
 # systemtap-runtime      /usr/bin/staprun, /usr/bin/stapsh, /usr/bin/stapdyn
 # systemtap-client       /usr/bin/stap, samples, docs, tapset(bonus), req:-runtime
 # systemtap-initscript   /etc/init.d/systemtap, dracut module, req:systemtap
-# systemtap-sdt-devel    /usr/include/sys/sdt.h /usr/bin/dtrace
+# systemtap-sdt-devel    /usr/include/sys/sdt.h
+# systemtap-sdt-dtrace   /usr/bin/dtrace
 # systemtap-testsuite    /usr/share/systemtap/testsuite*, req:systemtap, req:sdt-devel
 # systemtap-runtime-java libHelperSDT.so, HelperSDT.jar, stapbm, req:-runtime
 # systemtap-runtime-virthost  /usr/bin/stapvirt, req:libvirt req:libxml2
@@ -156,15 +155,10 @@ 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/
+URL: https://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
-
+Patch0: PR32302.patch
-Patch1: rhbz2223733.patch
-Patch2: rhbz2223735.patch
-Patch3: pr29108.patch
-Patch4: pr30749.patch
-
 
 # Build*
 BuildRequires: make
@@ -175,6 +169,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
@@ -215,7 +210,7 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 %endif
 %if %{with_emacsvim}
 # for _emacs_sitelispdir macros etc.
-BuildRequires: emacs
+BuildRequires: emacs-common
 %endif
 %if %{with_java}
 BuildRequires: java-devel
@@ -226,9 +221,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,8 +260,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap-devel = %{version}-%{release}
 Conflicts: systemtap-devel < %{version}-%{release}
 Conflicts: systemtap-runtime < %{version}-%{release}
@@ -298,8 +290,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
 Recommends: (kernel-debug-devel if kernel-debug)
@@ -328,8 +320,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires(pre): shadow-utils
 Conflicts: systemtap-devel < %{version}-%{release}
 Conflicts: systemtap-server < %{version}-%{release}
@@ -343,8 +335,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: zip unzip
 Requires: systemtap-runtime = %{version}-%{release}
 Requires: coreutils grep sed unzip zip
@@ -357,17 +349,19 @@ Requires: mokutil
 %endif
 
 %description client
-This package contains/requires the components needed to develop
+This package contains/requires only the components needed to
-systemtap scripts, and compile them using a local systemtap-devel
+use systemtap scripts by compiling them using a local or a remote
-or a remote systemtap-server installation, then run them using a
+systemtap-server service, then run them using a local or
-local or remote systemtap-runtime.  It includes script samples and
+remote systemtap-runtime.  It includes script samples and
 documentation, and a copy of the tapset library for reference.
-
+It does NOT include all the components for running a systemtap
+script in a self-contained fashion; for that, use the -devel
+subpackage instead.
 
 %package initscript
 Summary: Systemtap Initscripts
-License: GPLv2+
+License: GPL-2.0-or-later
-URL: http://sourceware.org/systemtap/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap = %{version}-%{release}
 %if %{with_systemd}
 Requires: systemd
@@ -385,9 +379,20 @@ boot-time probing if supported.
 
 
 %package sdt-devel
-Summary: Static probe support tools
+Summary: Static probe support header files
-License: GPLv2+ and Public Domain
+License: GPL-2.0-or-later AND CC0-1.0
-URL: http://sourceware.org/systemtap/
+URL: https://sourceware.org/systemtap/
+
+%description sdt-devel
+This package includes the <sys/sdt.h> header file used for static
+instrumentation compiled into userspace programs.
+
+
+%package sdt-dtrace
+Summary: Static probe support dtrace tool
+License: GPL-2.0-or-later AND CC0-1.0
+URL: https://sourceware.org/systemtap/
+Provides: dtrace = %{version}-%{release}
 %if %{with_pyparsing}
 %if %{with_python3}
 Requires: python3-pyparsing
@@ -400,21 +405,19 @@ Requires: python2-pyparsing
 %endif
 %endif
 
-%description sdt-devel
+%description sdt-dtrace
-This package includes the <sys/sdt.h> header file used for static
+This package includes the dtrace-compatibility preprocessor
-instrumentation compiled into userspace programs and libraries, along
+to process related .d files into tracing-macro-laden .h headers.
-with the optional dtrace-compatibility preprocessor to process related
-.d files into tracing-macro-laden .h headers.
 
 
 %package testsuite
 Summary: Instrumentation System Testsuite
-License: GPLv2+
+License: GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later AND MIT
-URL: http://sourceware.org/systemtap/
+URL: https://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,8 +484,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 # work around fedora ci gating kvetching about i686<->x86-64 conflicts
 %ifarch x86_64
@@ -503,8 +506,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
 %description runtime-python2
@@ -515,8 +518,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
 %if ! (%{with_python2_probes})
@@ -532,8 +535,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
 %description exporter
@@ -545,8 +548,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 # only require libvirt-libs really
 #Requires: libvirt >= 1.0.2
 Requires: libxml2
@@ -560,8 +563,8 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 %if %{with_systemd}
 Requires(post): findutils coreutils
@@ -578,26 +581,22 @@ 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/
+URL: https://sourceware.org/systemtap/
 Requires: systemtap = %{version}-%{release}
 
 %description jupyter
 This package includes files needed to build and run
 the interactive systemtap Jupyter kernel, either locally
 or within a container.
-%endif
+
 # ------------------------------------------------------------------------
 
 %prep
 %setup -q
-%patch -P1 -p1
+%patch -P0 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
 
 %build
 
@@ -608,6 +607,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 +701,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
 
 
@@ -735,9 +741,6 @@ find testsuite -type f -name '.gitignore' -print0 | xargs -0 rm -f
 # permissions back to 04110 in the %files section below.
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun
 
-#install the useful stap-prep script
-install -c -m 755 stap-prep $RPM_BUILD_ROOT%{_bindir}/stap-prep
-
 # Copy over the testsuite
 cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
 
@@ -853,6 +856,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
 
@@ -1132,13 +1138,14 @@ exit 0
 %if %{with_emacsvim}
 %{_emacs_sitelispdir}/*.el*
 %{_emacs_sitestartdir}/systemtap-init.el
-%{_datadir}/vim/vimfiles/*/*.vim
+%{_datadir}/vim/vimfiles
 %endif
 # Notice that the stap-resolve-module-function.py file is used by
 # *both* the python2 and python3 subrpms.  Both subrpms use that same
 # python script to help list python probes.
 %if %{with_python3_probes} || %{with_python2_probes}
 %{_libexecdir}/systemtap/python/stap-resolve-module-function.py
+%dir %{_libexecdir}/systemtap/python
 %exclude %{_libexecdir}/systemtap/python/stap-resolve-module-function.py?
 %endif
 
@@ -1233,16 +1240,22 @@ exit 0
 
 
 %files sdt-devel
-%{_bindir}/dtrace
 %{_includedir}/sys/sdt.h
 %{_includedir}/sys/sdt-config.h
-%{_mandir}/man1/dtrace.1*
 %{_rpmmacrodir}/macros.systemtap
 %doc README AUTHORS NEWS 
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 
 
+%files sdt-dtrace
+%{_bindir}/dtrace
+%doc README AUTHORS NEWS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%{_mandir}/man1/dtrace.1*
+
+
 %files testsuite
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/testsuite
@@ -1299,250 +1312,138 @@ 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
 
 # ------------------------------------------------------------------------
 
 # Future new-release entries should be of the form
 # * DDD MMM DD YYYY YOURNAME <YOUREMAIL> - V-R
 # - Upstream release, see wiki page below for detailed notes.
-#   http://sourceware.org/systemtap/wiki/SystemTapReleases
+#   https://sourceware.org/systemtap/wiki/SystemTapReleases
 
 # PRERELEASE
 %changelog
-* Mon Aug 14 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-3
+* Mon Nov 11 2024 Frank Ch. Eigler <fche@redhat.com> - 5.2-1
-- rhbz2231619
+- Upstream release, see wiki page below for detailed notes.
-- rhbz2095359
+- https://sourceware.org/systemtap/wiki/SystemTapReleases
 
-* Tue Jul 18 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-2
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.1-10
-- rhbz2223733 = rhbz2211288
+- Bump release for October 2024 mass rebuild:
-- rhbz2223735 = rhbz2223739
+  Resolves: RHEL-64018
 
+* Fri Aug 9 2024 Martin Cermak <mcermak@redhat.com> - 5.1-9
+- RHEL-52491
+
+* Fri Jul 26 2024 Martin Cermak <mcermak@redhat.com> - 5.1-8
+- RHEL-43481
+
+* Wed Jul 24 2024 Martin Cermak <mcermak@redhat.com> - 5.1-7
+- RHEL-50107
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.1-6
+- Bump release for June 2024 mass rebuild
+
+* Tue Jun 18 2024 Martin Cermak <mcermak@redhat.com> - 5.1-5
+- RHEL-42605 add upstream commits 1fd6fb4d, de8aba9a, da72d043
+
+* Mon Jun 17 2024 Martin Cermak <mcermak@redhat.com> - 5.1-4
+- RHEL-42605
+
+* Thu May 16 2024 Martin Cermak <mcermak@redhat.com> - 5.1-3
+- RHEL-29529
+- RHEL-7318
+- RHELMISC-3948
+
+* Tue May 14 2024 William Cohen <wcohen@redhat.com> - 5.1-2
+- RHEL-36201
+
+* 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
+
+  * Thu Jan 25 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-17062192g5fd8daba
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
+* Thu Jan 25 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-17062114g2604d135
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
+* Tue Jan 23 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-17060399gb6abf4bd
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
+* Mon Jan 22 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-17059382g67086c54
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
+* Thu Jan 18 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-17056139g6c0b92b3
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
+* Thu Jan 18 2024 Frank Ch. Eigler <fche@redhat.com> - 5.1-17056120g2ccc0c4c
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
+* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 5.0-4
+- Rebuilt for Boost 1.83
+
+* 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
+
+* Sat Nov 04 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
+- migrated to SPDX license
+  
 * 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
+* Thu Nov 03 2022 Serhei Makarov <serhei@serhei.io> - 4.8-1
-- rhbz2156092 = rhbz1997192
+- Upstream release, see wiki page below for detailed notes.
-- rhbz2145241 = rhbz2145242
+  https://sourceware.org/systemtap/wiki/SystemTapReleases
-- rhbz2156093 = rhbz2149223
+  
-- rhbz2156095 = rhbz2149666
+* Mon May 02 2022 Frank Ch. Eigler <fche@redhat.com> - 4.7-1
-- rhbz2156094 = 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
 - 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
+* Mon Nov 15 2021 Serhei Makarov <me@serhei.io> - 4.6-1
-- sys/sdt.h remove aarch64 and s390 float constraints
+- Upstream release, see wiki page below for detailed notes.
+  https://sourceware.org/systemtap/wiki/SystemTapReleases
 
-* Mon Dec 06 2021 Stan Cox <scox@redhat.com> - 4.6.3
+* Fri May 07 2021 Serhei Makarov <me@serhei.io> - 4.5-1
-- 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
-- sys/sdt.h fixes for glibc ftbfs
-
-* Mon Nov 15 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
-- rhbz1991631 iommu tracepoints break ppc64le
-
-* Tue Jul 27 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-2
-- rhbz1986543 rebuild against dyninst 11
-
-* 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
-- rhbz1927497 enable debuginfod client for buildid probing
-
-* 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 +1463,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.