From 6042ae2f65b1cc17222a5e6c30baf66c62a3d749 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Sat, 1 Nov 2025 18:11:15 -0400
Subject: [PATCH] upstream rebase

Related: RHEL-121662
---
 .gitignore     |  1 +
 sources        |  2 +-
 systemtap.spec | 26 ++++++++++++++++++++------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6dbbff..3e804b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@
 /systemtap-5.1.tar.gz
 /systemtap-5.2.tar.gz
 /systemtap-5.3.tar.gz
+/systemtap-5.4.tar.gz
diff --git a/sources b/sources
index 65d0436..a210820 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-5.3.tar.gz) = b252cd00a7ddab53f19d30129834b205ce8e90ccc5422444c1d188b765c122da712f5ca73092c425aef7430888c75ebfebbe3bfd87d6df8761338a1135abda89
+SHA512 (systemtap-5.4.tar.gz) = 5869fe3735e44be65ba7895a46b4ea66fcdcc21ed2ab0673c62d822730553837f816d82fd78eeca4bfe6f17fdeaa12eb2f94c0b0b7ebb8c495c961f0b6935785
diff --git a/systemtap.spec b/systemtap.spec
index 1d586df..5a284be 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -121,11 +121,17 @@ m     stapsys  stapsys\
 m     stapdev  stapusr\
 m     stapdev  stapdev
 
+%define _systemtap_server_preinstall_tmpfiles \
+# See systemd-tmpfiles(8) tmpfiles.d(5)\
+d /var/lib/stap-server 0750 stap-server stap-server -\
+d /var/lib/stap-server/.systemtap 0700 stap-server stap-server -\
+d /var/log/stap-server 0755 stap-server stap-server -\
+f /var/log/stap-server/log 0644 stap-server stap-server -
 
 Name: systemtap
 # PRERELEASE
-Version: 5.3
-Release: 3%{?release_override}%{?dist}
+Version: 5.4
+Release: 1%{?release_override}%{?dist}
 # for version, see also configure.ac
 
 
@@ -163,9 +169,6 @@ License: GPL-2.0-or-later
 URL: https://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
-Patch1: systemtap-defined.patch
-Patch2: systemtap-dev_tapset.patch
-
 # Build*
 BuildRequires: make
 BuildRequires: gcc-c++
@@ -392,13 +395,16 @@ boot-time probing if supported.
 Summary: Static probe support header files
 License: GPL-2.0-or-later AND CC0-1.0
 URL: https://sourceware.org/systemtap/
+%if 0%{?rhel} && 0%{?rhel} <= 10
 # for RHEL buildability compatibility, pull in sdt-dtrace at all times
 Requires: systemtap-sdt-dtrace = %{version}-%{release}
+%endif
 
 %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
@@ -606,7 +612,7 @@ or within a container.
 # ------------------------------------------------------------------------
 
 %prep
-%autosetup -p1
+%setup -q
 
 %build
 
@@ -734,6 +740,8 @@ mkdir -p %{buildroot}%{_sysusersdir}
 echo '%_systemtap_runtime_preinstall' > %{buildroot}%{_sysusersdir}/systemtap-runtime.conf
 echo '%_systemtap_server_preinstall' > %{buildroot}%{_sysusersdir}/systemtap-server.conf
 echo '%_systemtap_testsuite_preinstall' > %{buildroot}%{_sysusersdir}/systemtap-testsuite.conf
+mkdir -p %{buildroot}%{_tmpfilesdir}
+echo '%_systemtap_server_preinstall_tmpfiles' > %{buildroot}%{_tmpfilesdir}/systemtap-server.conf
 %endif
 
 
@@ -885,6 +893,7 @@ exit 0
 %if %{with_sysusers}
 %if (0%{?fedora} && 0%{?fedora} < 42) || (0%{?rhel} && 0%{?rhel} < 11)
 echo '%_systemtap_server_preinstall' | systemd-sysusers --replace=%{_sysusersdir}/systemtap-server.conf -
+echo '%_systemtap_server_preinstall_tmpfiles' | systemd-tmpfiles --replace=%{_tmpfilesdir}/systemtap-server.conf -
 exit 0
 %endif
 %else
@@ -1117,6 +1126,7 @@ exit 0
 %if %{with_systemd}
 %{_unitdir}/stap-server.service
 %{_tmpfilesdir}/stap-server.conf
+%{_tmpfilesdir}/systemtap-server.conf
 %else
 %{initdir}/stap-server
 %dir %{_sysconfdir}/stap-server/conf.d
@@ -1353,6 +1363,10 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Fri Oct 31 2025 Frank Ch. Eigler <fche@redhat.com> - 5.4-1
+- Upstream release, see wiki page below for detailed notes.
+  https://sourceware.org/systemtap/wiki/SystemTapReleases
+
 * Thu Jun 5 2025 William Cohen <wcohen@redhat.com> - 5.3-3
 - RHEL-90805: Update dev.stp tapset to handle RHEL-9.7 kernels.