.gitignore

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

.systemtap.metadata

@@ -1 +1 @@
-7ba2ad579a5ba66ccfd36ad6df0896c9e136f9e9 SOURCES/systemtap-4.9.tar.gz
+fc943fc3233b111fd80c9cbd063859dc1b699dcb SOURCES/systemtap-4.7.tar.gz

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/rhbz2081102.patch

@@ -0,0 +1,258 @@
+commit 093b972294256b3ad68712daecdfdc5da1418a13
+Author: Martin Cermak <mcermak@redhat.com>
+Date:   Mon May 9 20:00:15 2022 +0200
+
+    refix PR28634 for rhel8+ kernels
+    
+    The rhel kernel backports do not always align to upstream, so that
+    the KERNEL_VERSION() based gate needs to be updated using a version
+    that does the expected thing for the rhel{7,8,9} kernels.
+
+diff --git a/tapset/linux/ioscheduler.stp b/tapset/linux/ioscheduler.stp
+index 3096a73ea..c7231878d 100644
+--- a/tapset/linux/ioscheduler.stp
++++ b/tapset/linux/ioscheduler.stp
+@@ -11,7 +11,7 @@
+ // </tapsetdescription>
+ %{
+ #include <linux/blkdev.h>
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,16,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,18,0)
+ #include <linux/elevator.h>
+ #endif
+ %}
+@@ -41,7 +41,7 @@ probe ioscheduler.elv_next_request = kernel.function("blk_peek_request") !,
+  */
+ probe ioscheduler.elv_next_request.return =
+ 		kernel.function("blk_peek_request").return !,
+-		kernel.function("elv_next_request").return
++		kernel.function("elv_next_request").return ?
+ {
+ 	name = "elv_next_request"
+ 	if ($return == 0)  {
+@@ -80,18 +80,14 @@ probe ioscheduler.elv_completed_request
+ 			@choose_defined($q->elevator->elevator_type->elevator_name,
+                                         @choose_defined($q->elevator->elevator_name,
+                                                         0))), "")
+-	if($rq == 0)  {
+-		disk_major = -1
+-		disk_minor = -1
+-	} else {
+-		if($rq->rq_disk == 0)  {
+-			disk_major = -1
+-			disk_minor = -1
+-		} else {
+-			disk_major = $rq->rq_disk->major
+-			disk_minor = $rq->rq_disk->first_minor
+-		}
+-	}
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
++            disk_major = $rq->rq_disk->major
++            disk_minor = $rq->rq_disk->first_minor
++        }
+ 
+ 	rq = $rq
+ 	rq_flags = ($rq == 0) ? 0
+@@ -111,7 +107,7 @@ probe ioscheduler.elv_completed_request
+ // when a request is added to the request queue
+ probe ioscheduler.elv_add_request.kp =
+ 		kernel.function("elv_insert") !,
+-		kernel.function("__elv_add_request")
++		kernel.function("__elv_add_request") ?
+ {
+ 	name = "elv_add_request"
+ 	elevator_name = kernel_string(
+@@ -120,18 +116,15 @@ probe ioscheduler.elv_add_request.kp =
+                                         @choose_defined($q->elevator->elevator_name,
+                                                         0))), "")
+ 	q = $q
+-	if($rq == 0)  {
+-		disk_major = -1
+-		disk_minor = -1
+-	} else {
+-		if($rq->rq_disk == 0)  {
+-			disk_major = -1
+-			disk_minor = -1
+-		} else {
+-			disk_major = $rq->rq_disk->major
+-			disk_minor = $rq->rq_disk->first_minor
+-		}
+-	}
++
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
++            disk_major = $rq->rq_disk->major
++            disk_minor = $rq->rq_disk->first_minor
++        }
+ 
+ 	rq = $rq
+ 	rq_flags = ($rq == 0) ? 0
+@@ -160,11 +153,11 @@ probe ioscheduler.elv_add_request.tp = kernel.trace("block_rq_insert") ?
+                                                                 0))), "")
+ 	rq = $rq
+ 
+-	if ($rq == 0 || $rq->rq_disk ==0) {
+-		disk_major = -1
+-		disk_minor = -1
+-	}
+-	else {
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
+ 		disk_major = $rq->rq_disk->major
+ 		disk_minor = $rq->rq_disk->first_minor
+ 	}
+@@ -184,7 +177,7 @@ probe ioscheduler.elv_add_request.tp = kernel.trace("block_rq_insert") ?
+  *
+  */
+ probe ioscheduler.elv_add_request =
+-	ioscheduler.elv_add_request.tp !, ioscheduler.elv_add_request.kp
++	ioscheduler.elv_add_request.tp !, ioscheduler.elv_add_request.kp ?
+ {}
+ 
+ /**
+@@ -211,14 +204,14 @@ probe ioscheduler_trace.elv_completed_request
+ 
+ 	rq = $rq
+ 
+-	if ($rq == 0 || $rq->rq_disk ==0) {
+-		disk_major = -1
+-		disk_minor = -1
+-	}
+-	else {
+-		disk_major = $rq->rq_disk->major
+-		disk_minor = $rq->rq_disk->first_minor
+-	}
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
++            disk_major = $rq->rq_disk->major
++            disk_minor = $rq->rq_disk->first_minor
++        }
+ 
+ 	rq_flags = ($rq == 0) ? 0
+ 		: @choose_defined($rq->cmd_flags, $rq->flags)
+@@ -247,14 +240,14 @@ probe ioscheduler_trace.elv_issue_request
+                                                                 0))), "")
+ 	rq = $rq
+ 
+-	if ($rq == 0 || $rq->rq_disk ==0) {
+-		disk_major = -1
+-		disk_minor = -1
+-	}
+-	else {
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
+ 		disk_major = $rq->rq_disk->major
+ 		disk_minor = $rq->rq_disk->first_minor
+-	}
++        }
+ 
+ 	rq_flags = ($rq == 0) ? 0
+ 		: @choose_defined($rq->cmd_flags, $rq->flags)
+@@ -283,14 +276,14 @@ probe ioscheduler_trace.elv_requeue_request
+                                                                 0))), "")
+ 	rq = $rq
+ 
+-	if ($rq == 0 || $rq->rq_disk ==0) {
+-		disk_major = -1
+-		disk_minor = -1
+-	}
+-	else {
+-		disk_major = $rq->rq_disk->major
+-		disk_minor = $rq->rq_disk->first_minor
+-	}
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
++            disk_major = $rq->rq_disk->major
++            disk_minor = $rq->rq_disk->first_minor
++        }
+ 
+ 	rq_flags = ($rq == 0) ? 0
+ 		: @choose_defined($rq->cmd_flags, $rq->flags)
+@@ -318,14 +311,14 @@ probe ioscheduler_trace.elv_abort_request
+                                                                 0))), "")
+ 	rq = $rq
+ 
+-	if ($rq == 0 || $rq->rq_disk ==0) {
+-		disk_major = -1
+-		disk_minor = -1
+-	}
+-	else {
+-		disk_major = $rq->rq_disk->major
+-		disk_minor = $rq->rq_disk->first_minor
+-	}
++        disk_major = -1
++        disk_minor = -1
++        // kernel f3fa33acca9f0058157214800f68b10d8e71ab7a
++        // block: remove the ->rq_disk field in struct request
++        if(@defined($rq->rq_disk) && ($rq->rq_disk != 0)) {
++            disk_major = $rq->rq_disk->major
++            disk_minor = $rq->rq_disk->first_minor
++        }
+ 
+ 	rq_flags = ($rq == 0) ? 0
+ 		: @choose_defined($rq->cmd_flags, $rq->flags)
+diff --git a/testsuite/buildok/ioscheduler-all-probes.stp b/testsuite/buildok/ioscheduler-all-probes.stp
+index da182c774..a8d8e08c5 100755
+--- a/testsuite/buildok/ioscheduler-all-probes.stp
++++ b/testsuite/buildok/ioscheduler-all-probes.stp
+@@ -2,6 +2,6 @@
+ 
+ // Tests if all probes in the ioscheduler tapset are resolvable.
+ 
+-probe ioscheduler.*, ioscheduler.*.return {}
++probe ioscheduler.* ?, ioscheduler.*.return ? {}
+ 
+ probe ioscheduler_trace.* ? {}
+diff --git a/testsuite/buildok/ioscheduler-detailed.stp b/testsuite/buildok/ioscheduler-detailed.stp
+index 143f20cd6..033e955dc 100755
+--- a/testsuite/buildok/ioscheduler-detailed.stp
++++ b/testsuite/buildok/ioscheduler-detailed.stp
+@@ -6,24 +6,24 @@
+ # test the kprobes aliases (*.kp).  This could cause them to get out
+ # of sync with the kprobed functions.  So, we test them explicitly.
+ 
+-probe ioscheduler.elv_next_request
++probe ioscheduler.elv_next_request ?
+ {
+ 	printf("%s: %s\n", name, elevator_name)
+ }
+-probe ioscheduler.elv_next_request.return
++probe ioscheduler.elv_next_request.return ?
+ {
+ 	printf("name: %s, %d, %d, %p, %d", name, disk_major,
+ 	       disk_minor, rq, rq_flags)
+ }
+ 
+-probe ioscheduler.elv_completed_request
++probe ioscheduler.elv_completed_request ?
+ {
+ 	printf("name: %s, elv_name: %s, %d, %d, %p, %d", name, elevator_name,
+ 	       disk_major, disk_minor, rq, rq_flags)
+ }
+ 
+-probe ioscheduler.elv_add_request,
+-      ioscheduler.elv_add_request.kp,
++probe ioscheduler.elv_add_request ?,
++      ioscheduler.elv_add_request.kp ?,
+       ioscheduler.elv_add_request.tp ?
+ {
+ 	printf("name: %s, elv_name: %s, %d, %d, %p, %d", name, elevator_name,

SOURCES/rhbz2085647.patch

@@ -0,0 +1,66 @@
+commit a0fa7bf0b68058d8f41a5fde608362172a2c3d77
+Author: Martin Cermak <mcermak@redhat.com>
+Date:   Wed May 11 22:22:00 2022 +0200
+
+    Update examples/io/iostat-scsi.stp for modern rhel9 kernels.
+    
+    Update examples/io/iostat-scsi.stp for kernels having following
+    upstream kernel commit backported:
+    
+    commit f3fa33acca9f0058157214800f68b10d8e71ab7a
+    Author: Christoph Hellwig <hch@lst.de>
+    Date:   Fri Nov 26 13:18:00 2021 +0100
+    
+        block: remove the ->rq_disk field in struct request
+    
+        Just use the disk attached to the request_queue instead.
+    
+    [ ... stuff deleted ... ]
+
+diff --git a/testsuite/systemtap.examples/io/iostat-scsi.stp b/testsuite/systemtap.examples/io/iostat-scsi.stp
+index 3faf32fe9..aa0238a7b 100755
+--- a/testsuite/systemtap.examples/io/iostat-scsi.stp
++++ b/testsuite/systemtap.examples/io/iostat-scsi.stp
+@@ -2,12 +2,18 @@
+ 
+ global devices, reads, writes
+ 
++/* kernel commit f3fa33acca9f0058157214800f68b10d8e71ab7a */
++@define __disk_name(__request)
++%(
++    ( @choose_defined(@__request->rq_disk->disk_name, @__request->q->disk->disk_name ) )
++%)
++
+ /* data collection: SCSI disk */
+ %(kernel_v < "2.6.24" %?
+ probe module("sd_mod").function("sd_init_command") !,
+       kernel.function("sd_init_command")
+ {
+-  device = kernel_string($SCpnt->request->rq_disk->disk_name)
++  device = kernel_string(@__disk_name($SCpnt->request))
+   sector_size = $SCpnt->device->sector_size
+   nr_sectors = $SCpnt->request->nr_sectors
+   devices[device] = 1
+@@ -38,7 +44,7 @@ function get_nr_sectors:long(rq:long)
+ probe sd_prep_fn = module("sd_mod").function("sd_prep_fn") !,
+ 		   kernel.function("sd_prep_fn")
+ {
+-  device = kernel_string($rq->rq_disk->disk_name)
++  device = kernel_string(@__disk_name($rq))
+   sector_size = @cast($q->queuedata, "scsi_device", "kernel<scsi/scsi_device.h>")->sector_size
+ %(kernel_v>="2.6.31" %?
+   nr_sectors = get_nr_sectors($rq)
+@@ -58,11 +64,11 @@ probe sd_init_command = module("sd_mod").function("sd_init_command") !,
+     sector_size = @choose_defined($cmd, $SCpnt)->device->sector_size
+     # Kernel commits aa8e25e5006aac52c943c84e9056ab488630ee19 2266a2def97ce11ec979b6c58a1b637a16eca7dd
+     if (@defined(@choose_defined($cmd, $SCpnt)->request)) {
+-      device = kernel_string(@choose_defined($cmd, $SCpnt)->request->rq_disk->disk_name)
++      device = kernel_string(@__disk_name(@choose_defined($cmd, $SCpnt)->request))
+       nr_sectors = get_nr_sectors(@choose_defined($cmd, $SCpnt)->request)
+       _cmd_flags = @choose_defined($cmd, $SCpnt)->request->cmd_flags
+     } else {
+-      device = kernel_string(@cast(scsi_cmd_to_rq(@choose_defined($cmd, $SCpnt)), "request", "kernel")->rq_disk->disk_name)
++      device = kernel_string(@__disk_name(@cast(scsi_cmd_to_rq(@choose_defined($cmd, $SCpnt)), "request", "kernel")))
+       nr_sectors = get_nr_sectors(scsi_cmd_to_rq(@choose_defined($cmd, $SCpnt)))
+       _cmd_flags = @cast(scsi_cmd_to_rq(@choose_defined($cmd, $SCpnt)), "request", "kernel")->cmd_flags
+   }

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

@@ -20,11 +20,7 @@
 %{!?with_bpf: %global with_bpf 0%{?fedora} >= 22 || 0%{?rhel} >= 8}
 %{!?with_systemd: %global with_systemd 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_emacsvim: %global with_emacsvim 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
-%ifarch %{ix86}
-%{!?with_java: %global with_java 0}
-%else
 %{!?with_java: %global with_java 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
-%endif
 %{!?with_debuginfod: %global with_debuginfod 0%{?fedora} >= 25 || 0%{?rhel} >= 7}
 %{!?with_virthost: %global with_virthost 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_virtguest: %global with_virtguest 1}
@@ -121,9 +117,8 @@ m     stapdev  stapdev
 
 
 Name: systemtap
-# PRERELEASE
-Version: 4.9
-Release: 3%{?release_override}%{?dist}
+Version: 4.7
+Release: 2%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -142,7 +137,6 @@ Release: 3%{?release_override}%{?dist}
 # systemtap-runtime-virtguest udev rules, init scripts/systemd service, req:-runtime
 # systemtap-runtime-python2 HelperSDT python2 module, req:-runtime
 # systemtap-runtime-python3 HelperSDT python3 module, req:-runtime
-# systemtap-jupyter      /usr/bin/stap-jupyter-* interactive-notebook req:systemtap
 #
 # Typical scenarios:
 #
@@ -160,11 +154,8 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
-Patch1: rhbz2223733.patch
-Patch2: rhbz2223735.patch
-Patch3: pr29108.patch
-Patch4: pr30749.patch
-
+Patch1: rhbz2081102.patch
+Patch2: rhbz2085647.patch
 
 # Build*
 BuildRequires: make
@@ -244,6 +235,9 @@ BuildRequires: python3
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 %endif
+%if %{with_specific_python}
+BuildRequires: /usr/bin/pathfix.py
+%endif
 
 %if %{with_httpd}
 BuildRequires: libmicrohttpd-devel
@@ -578,26 +572,12 @@ 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+
-URL: http://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 -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -701,11 +681,6 @@ make %{?_smp_mflags} V=1
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-
-%if ! (%{with_python3})
-rm -v $RPM_BUILD_ROOT%{_bindir}/stap-profile-annotate
-%endif
-
 %find_lang %{name}
 for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
     dir=$(echo $dir | sed -e "s|^$RPM_BUILD_ROOT||")
@@ -843,7 +818,7 @@ done
 
 %if %{with_specific_python}
 # Some files got ambiguous python shebangs, we fix them after everything else is done
-%py3_shebang_fix %{buildroot}%{python3_sitearch} %{buildroot}%{_bindir}/*
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch} %{buildroot}%{_bindir}/*
 %endif
 
 %pre runtime
@@ -898,8 +873,7 @@ if [ ! -f ~stap-server/.systemtap/rc ]; then
   numcpu=`/usr/bin/getconf _NPROCESSORS_ONLN`
   if [ -z "$numcpu" -o "$numcpu" -lt 1 ]; then numcpu=1; fi
   nproc=`expr $numcpu \* 30`
-  # PR29661 -> 4G
-  echo "--rlimit-as=4294967296 --rlimit-cpu=60 --rlimit-nproc=$nproc --rlimit-stack=1024000 --rlimit-fsize=51200000" > ~stap-server/.systemtap/rc
+  echo "--rlimit-as=614400000 --rlimit-cpu=60 --rlimit-nproc=$nproc --rlimit-stack=1024000 --rlimit-fsize=51200000" > ~stap-server/.systemtap/rc
   chown stap-server:stap-server ~stap-server/.systemtap/rc
 fi
 
@@ -1109,9 +1083,7 @@ exit 0
 %files devel -f systemtap.lang
 %{_bindir}/stap
 %{_bindir}/stap-prep
-%if %{with_python3}
 %{_bindir}/stap-profile-annotate
-%endif
 %{_bindir}/stap-report
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/runtime
@@ -1299,15 +1271,6 @@ 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
@@ -1317,232 +1280,85 @@ exit 0
 
 # PRERELEASE
 %changelog
-* Mon Aug 14 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-3
-- rhbz2231619
-- rhbz2095359
+* Tue May 17 2022 Martin Cermak <mcermak@redhat.com> - 4.1-2
+- Fix rhbz2081102 and rhbz2085647
 
-* Tue Jul 18 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-2
-- rhbz2223733 = rhbz2211288
-- rhbz2223735 = rhbz2223739
-
-* Fri Apr 28 2023 Frank Ch. Eigler <fche@redhat.com> - 4.9-1
+* 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
 
-* Fri Dec 23 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-2
-- rhbz2156092 = rhbz1997192
-- rhbz2145241 = rhbz2145242
-- rhbz2156093 = rhbz2149223
-- rhbz2156095 = rhbz2149666
-- rhbz2156094 = rhbz2154430
+* Wed Feb 2 2022 Stan Cox <scox@redhat.com> - 4.6-11
+- rhbz2039207: Attempt userspace string access if kernel access fails
 
-* Thu Nov 03 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-1
-- Upstream release.
+* Tue Feb 1 2022 Martin Cermak <mcermak@redhat.com> - 4.6-10
+- rhbz2047256: [ppc64le] Assertion `index >= 0' failed
 
-* 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
+* Fri Jan 21 2022 Martin Cermak <mcermak@redhat.com> - 4.6-9
+- rhbz2027683: python tapset regression
+- rhbz2027683: systemtap.examples/io/iostat-scsi.stp PR28633
 
-* Tue Dec 07 2021 Stan Cox <scox@redhat.com> - 4.6.4
+* 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
-- rhbz1991631 iommu tracepoints break ppc64le
+* Thu Sep 09 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-8
+- rhbz1985124: Kernel 5.14 compatibility omnibus cont'd.
 
-* Tue Jul 27 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-2
-- rhbz1986543 rebuild against dyninst 11
+* Thu Aug 12 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-7
+- 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
-- 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
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.5-0.202102101545git8d5e0abc542c
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * 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
-- rhbz1868095: Refix including PR26379.
+* Thu Jun 11 2020 Frank Ch. Eigler <fche@redhat.com> - 4.3-1
+- Upstream release.
 
-* Wed Aug 12 2020 Martin Cermak <mcermak@redhat.com> - 4.3-3
-- rhbz1868095: byteman-java-methods-probing
-
-* 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.
+* Mon Nov 18 2019 Sagar Patel <sapatel@redhat.com> - 4.2-1
+- Upstream release.
 
 * 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
-- Enable brp-mangle for python scripts (rhbz1619413).
-
-* 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)
+* Thu Jun 07 2018 Frank Ch. Eigler <fche@redhat.com> - 3.3-1
+- Upstream release.
 
 * 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 +1378,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.