Merge branch 'master' into f25

* master:
  rhbz1504009 - python2 ftbfs
  upstream release 3.2
  Rebuilt after RPM update (№ 3)
  Update systemtap to use modern (rpm >= 4.6) API
  Rebuilt for RPM soname bump
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
  Automated weekly systemtap rawhide release: 0.20170512gitc67d8f274b21
  Automated weekly systemtap rawhide release: 0.20170410gitcbf2583808d6
  Automated weekly systemtap rawhide release: 0.20170406git83d186dc7f5c
  Automated weekly systemtap rawhide release: 0.20170321git272146660f54
  Rebuild for dyninst 9.3

.fmf/version

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

.gitignore

@@ -4,112 +4,3 @@
 /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-0.202102191905git0f623095ee3e.tar.gz
-/systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
-/systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
-/systemtap-4.5-0.202104140933gitad00fb87e.tar.gz
-/systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz
-/systemtap-4.5.tar.gz
-/systemtap-4.6-16261989g7c2751e3.tar.gz
-/systemtap-4.6~pre16262008gbff2b2ff.tar.gz
-/systemtap-4.6~pre16262012gc7f1c12e.tar.gz
-/systemtap-4.6~pre16262021g84ef6bd9.tar.gz
-/systemtap-4.6~pre16291338gf2c14776.tar.gz
-/systemtap-4.6.tar.gz
-/systemtap-4.7~pre16378386g61a4c8f8.tar.gz
-/systemtap-4.7~pre16383943gecab2afe.tar.gz
-/systemtap-4.7~pre16388948g209b5a19.tar.gz
-/systemtap-4.7~pre16395042gefae8a3d.tar.gz
-/systemtap-4.7~pre16432070g1d2cb8b3.tar.gz
-/systemtap-4.7~pre16433134g7d871ab5.tar.gz
-/systemtap-4.7~pre16468670g9f253544.tar.gz
-/systemtap-4.7.tar.gz
-/systemtap-4.8~pre16557277g2882dcc9.tar.gz
-/systemtap-4.8~pre16578235g069e109c.tar.gz
-/systemtap-4.8~pre16594727g09f1b7bb.tar.gz
-/systemtap-4.8~pre16594741g5bdc37b9.tar.gz
-/systemtap-4.8~pre16650659g6a096a7d.tar.gz
-/systemtap-4.8.tar.gz
-/systemtap-4.9.tar.gz
-/systemtap-5.0~pre16885197g6b17715f.tar.gz
-/systemtap-5.0~pre16885234gd98d6c2d.tar.gz
-/systemtap-5.0~pre16890184ge891a37e.tar.gz
-/systemtap-5.0~pre16891249ge891a37e.tar.gz
-/systemtap-5.0~pre16958465gca71442b.tar.gz
-/systemtap-5.0.tar.gz
-/systemtap-5.1~pre17056120g2ccc0c4c.tar.gz
-/systemtap-5.1~pre17056139g6c0b92b3.tar.gz
-/systemtap-5.1~pre17059382g67086c54.tar.gz
-/systemtap-5.1~pre17060399gb6abf4bd.tar.gz
-/systemtap-5.1~pre17062114g2604d135.tar.gz
-/systemtap-5.1~pre17062192g5fd8daba.tar.gz
-/systemtap-5.1.tar.gz
-/systemtap-5.1~pre17206206ge48abca5.tar.gz
-/systemtap-5.2~pre17206355g1a07290a.tar.gz
-/systemtap-5.2~pre17224323g98d1ea34.tar.gz
-/systemtap-5.2~pre17250223gd07e4284.tar.gz
-/systemtap-5.2~pre17277956g0b7f6722.tar.gz
-/systemtap-5.2~pre17283218gc5774e18.tar.gz
-/systemtap-5.2.tar.gz
-/systemtap-5.2~pre17373420g1e894ff0.tar.gz
-/systemtap-5.3~pre17373422g9a48fbea.tar.gz
-/systemtap-5.3~pre17373794g3efe129d.tar.gz
-/systemtap-5.3~pre17373816g7a71d34b.tar.gz
-/systemtap-5.3.tar.gz
-/systemtap-5.4~pre17585473g1fe4178d.tar.gz
-/systemtap-5.4~pre17585496g86ab88eb.tar.gz
-/systemtap-5.4.tar.gz

gating.yaml

@@ -1,30 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_testing]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_stable]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}

plans/ci.fmf

@@ -1,12 +0,0 @@
-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

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# On Rawhide, the running kernel packages won't probably be avail in
-# configured repos.  Debuginfo isn't a problem, we access that using
-# the debuginfod.
-__fedora_install_deps ()
-{
-    TMPD=$(mktemp -d)
-    pushd $TMPD
-    koji download-build --rpm kernel-`uname -r` --arch `uname -i`
-    koji download-build --rpm kernel-devel-`uname -r` --arch `uname -i`
-    koji download-build --rpm kernel-modules-`uname -r` --arch `uname -i`
-    dnf -y install kernel{,-devel,-modules}-`uname -r`.rpm
-    popd
-    rm -rf $TMPD
-}
-
-set -xe
-
-source /etc/os-release
-
-# Install needed packages
-if [ "$ID" == "fedora" ]; then
-    stap-prep || __fedora_install_deps
-fi
-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

rhbz1504009.patch

@@ -0,0 +1,49 @@
+commit 9f81f10b0caf6dfc49c4b7ceb7902f45d37b532a (HEAD -> master, origin/master, origin/HEAD)
+Author: Frank Ch. Eigler <fche@redhat.com>
+Date:   Fri Oct 20 10:01:58 2017 -0400
+
+    rhbz1504009: let dtrace -G -o /dev/null run, as in autoconf
+    
+    commit c245153ca193c471a8c broke the ability of dtrace to be tested in
+    autoconf "-G -o /dev/null" usage, because its output file name was too
+    simple a function of the input name, and normal users can't write to
+    /dev/null.dtrace-temp.c .  Now we back down to mkstemp, like before,
+    upon a failure of the simple concatenated name.
+
+diff --git a/dtrace.in b/dtrace.in
+index 2e2e002a5c56..25efc253b708 100644
+--- a/dtrace.in
++++ b/dtrace.in
+@@ -410,8 +410,12 @@ from tempfile import mkstemp
+         else:
+             print("header: " + fname)
+ 
+-        fname = filename + ".dtrace-temp.c"
+-        fdesc = open(fname, mode='w')
++        try: # for reproducible-builds purposes, prefer a fixed path name pattern
++            fname = filename + ".dtrace-temp.c"
++            fdesc = open(fname, mode='w')
++        except: # but that doesn't work for  -o /dev/null - see rhbz1504009
++            (ignore,fname) = mkstemp(suffix=".c")
++            fdesc = open(fname, mode='w')
+         providers.semaphore_write(fdesc)
+         fdesc.close()
+         cc1 = os.environ.get("CC", "gcc")
+diff --git a/testsuite/systemtap.base/dtrace.exp b/testsuite/systemtap.base/dtrace.exp
+index fa6b3ec3f6d3..7c60f09d70b8 100644
+--- a/testsuite/systemtap.base/dtrace.exp
++++ b/testsuite/systemtap.base/dtrace.exp
+@@ -83,6 +83,13 @@ if {[file exists /tmp/XXX.o]} then {
+ }
+ exec rm -f /tmp/XXX.o
+ 
++verbose -log "$dtrace -G -s $dpath -o /dev/null"
++if [as_non_root "$python $dtrace -G -s $dpath -o /dev/null"] {
++    fail "$test -G -o /dev/null"
++} else {
++    pass "$test -G -o /dev/null"
++}
++
+ verbose -log "$dtrace -G -s $dpath -o /tmp/XXX"
+ catch {exec $python $dtrace -G -s $dpath -o /tmp/XXX} res
+ if {[file exists /tmp/XXX]} then {

rpminspect.yaml

@@ -1,26 +0,0 @@
-
-
-# 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:
-    - *.stp

sources

@@ -1 +1 @@
-SHA512 (systemtap-5.4.tar.gz) = 5869fe3735e44be65ba7895a46b4ea66fcdcc21ed2ab0673c62d822730553837f816d82fd78eeca4bfe6f17fdeaa12eb2f94c0b0b7ebb8c495c961f0b6935785
+SHA512 (systemtap-3.2.tar.gz) = 6036ed1b5189fd3fcfdeeaa526a3539ac632d0b687a063b5e3424e8f613bfc2c8d079742b0262b547128e97e30e4beb61898b23761657aee519e61346ac92e94

systemtap-gcc16.patch

@@ -1,13 +0,0 @@
---- systemtap-5.4/configure~	2025-10-30 14:47:35.000000000 +0000
-+++ systemtap-5.4/configure	2026-01-13 18:53:20.466037572 +0000
-@@ -3121,8 +3121,8 @@
- }
- {
-   // Unicode literals
--  char const *utf8 = u8"UTF-8 string \u2500";
--  char16_t const *utf16 = u"UTF-8 string \u2500";
-+  auto const *utf8 = u8"UTF-8 string \u2500";
-+  char16_t const *utf16 = u"UTF-16 string \u2500";
-   char32_t const *utf32 = U"UTF-32 string \u2500";
- }
- '