diff --git a/.gitignore b/.gitignore
index 7e2d8f3..5e535be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/systemtap-4.5.tar.gz
+SOURCES/systemtap-4.6.tar.gz
diff --git a/.systemtap.metadata b/.systemtap.metadata
index cd69235..dad6e4d 100644
--- a/.systemtap.metadata
+++ b/.systemtap.metadata
@@ -1 +1 @@
-c549d5fa7aaf6a8cef3371f5757d912d41eae934 SOURCES/systemtap-4.5.tar.gz
+ecc45371b378fc3824a5547b02c030b4123d6769 SOURCES/systemtap-4.6.tar.gz
diff --git a/SOURCES/rhbz1991631.patch b/SOURCES/rhbz1991631.patch
deleted file mode 100644
index 9598ac8..0000000
--- a/SOURCES/rhbz1991631.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 515a6a2d63cdf16c5bc599f0d29283289219d9a4
-Author: Frank Ch. Eigler <fche@redhat.com>
-Date: Thu Jun 24 13:30:38 2021 -0400
-
- rhbz1972828: tapsets: iommu tracepoints
-
- Disable detection of intel-iommu tracepoint family on non-x86
- platforms, because the 5.13ish kernel headers for this tracepoint
- include references to functions like clcache_flush_range which don't
- exist on all non-x86.
-
-diff --git a/tapsets.cxx b/tapsets.cxx
-index a5e41129f..20e0cb68f 100644
---- a/tapsets.cxx
-+++ b/tapsets.cxx
-@@ -11930,6 +11930,13 @@ static vector<string> tracepoint_extra_decls (systemtap_session& s,
- they_live.push_back ("#include <linux/phy.h>");
- }
-
-+ if (header.find("intel_iommu") != string::npos && s.architecture != "x86_64" && s.architecture != "i386")
-+ {
-+ // need asm/cacheflush.h for clflush_cache_range() used in that header,
-+ // but this function does not exist on e.g. ppc
-+ they_live.push_back ("#error nope");
-+ }
-+
- if (header.find("wbt") != string::npos)
- {
- // blk-wbt.h gets included as "../../../block/blk-wbt.h", so we
diff --git a/SPECS/systemtap.spec b/SPECS/systemtap.spec
index 548c5c2..156dbf3 100644
--- a/SPECS/systemtap.spec
+++ b/SPECS/systemtap.spec
@@ -4,14 +4,13 @@
%{!?with_htmldocs: %global with_htmldocs 0}
%{!?with_monitor: %global with_monitor 1}
# crash is not available
-%ifarch ppc ppc64 %{sparc} %{mips}
+%ifarch ppc ppc64 %{sparc} %{mips} %{riscv}
%{!?with_crash: %global with_crash 0}
%else
%{!?with_crash: %global with_crash 1}
%endif
%{!?with_rpm: %global with_rpm 1}
%{!?elfutils_version: %global elfutils_version 0.179}
-%{!?pie_supported: %global pie_supported 1}
%{!?with_boost: %global with_boost 0}
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
%{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
@@ -39,6 +38,7 @@
%{!?with_python3_probes: %global with_python3_probes (0%{?fedora} >= 23 || 0%{?rhel} > 7)}
%{!?with_httpd: %global with_httpd 0}
%{!?with_specific_python: %global with_specific_python 0%{?fedora} >= 31}
+%{!?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
@@ -89,8 +89,8 @@
%define __brp_mangle_shebangs_exclude_from .stp$
Name: systemtap
-Version: 4.5
-Release: 3%{?release_override}%{?dist}
+Version: 4.6
+Release: 1%{?release_override}%{?dist}
# for version, see also configure.ac
@@ -126,8 +126,6 @@ License: GPLv2+
URL: http://sourceware.org/systemtap/
Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
-Patch1: rhbz1991631.patch
-
# Build*
BuildRequires: make
BuildRequires: gcc-c++
@@ -139,7 +137,7 @@ BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(libdebuginfod)
%endif
%if %{with_dyninst}
-BuildRequires: dyninst-devel >= 11.0
+BuildRequires: dyninst-devel >= 10.0
BuildRequires: pkgconfig(libselinux)
%endif
%if %{with_sqlite}
@@ -176,6 +174,7 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
%endif
%endif
%if %{with_emacsvim}
+# for _emacs_sitelispdir macros etc.
BuildRequires: emacs
%endif
%if %{with_java}
@@ -198,6 +197,9 @@ BuildRequires: python2-setuptools
BuildRequires: python-setuptools
%endif
%endif
+%if %{with_python3}
+BuildRequires: python3
+%endif
%if %{with_python3_probes}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@@ -210,6 +212,10 @@ BuildRequires: /usr/bin/pathfix.py
BuildRequires: libmicrohttpd-devel
BuildRequires: libuuid-devel
%endif
+%if %{with_sysusers}
+BuildRequires: systemd-rpm-macros
+%endif
+
# Install requirements
Requires: systemtap-client = %{version}-%{release}
@@ -486,7 +492,7 @@ This package includes support files needed to run systemtap scripts
that probe python 3 processes.
%endif
-%if %{with_python3}
+%if %{with_python3_probes}
%package exporter
Summary: Systemtap-prometheus interoperation mechanism
License: GPLv2+
@@ -504,7 +510,8 @@ to remote requesters on demand.
Summary: Systemtap Cross-VM Instrumentation - host
License: GPLv2+
URL: http://sourceware.org/systemtap/
-Requires: libvirt >= 1.0.2
+# only require libvirt-libs really
+#Requires: libvirt >= 1.0.2
Requires: libxml2
%description runtime-virthost
@@ -538,7 +545,6 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
%prep
%setup -q
-%patch1 -p1
%build
@@ -587,14 +593,6 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
%global docs_config --enable-docs=prebuilt
%endif
-# Enable pie as configure defaults to disabling it
-%if %{pie_supported}
-%global pie_config --enable-pie
-%else
-%global pie_config --disable-pie
-%endif
-
-
%if %{with_java}
%global java_config --with-java=%{_jvmdir}/java
%else
@@ -644,8 +642,8 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
# 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} %{pie_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}
+%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}"
+make %{?_smp_mflags} V=1
%install
@@ -657,6 +655,13 @@ for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
echo "%%lang($lang) $dir/man*/*" >> %{name}.lang
done
+%if %{with_sysusers}
+install -p -D -m 0644 systemtap-runtime.sysusers %{buildroot}%{_sysusersdir}/systemtap-runtime.conf
+install -p -D -m 0644 systemtap-server.sysusers %{buildroot}%{_sysusersdir}/systemtap-server.conf
+install -p -D -m 0644 systemtap-testsuite.sysusers %{buildroot}%{_sysusersdir}/systemtap-testsuite.conf
+%endif
+
+
ln -s %{_datadir}/systemtap/examples
# Fix paths in the example scripts.
@@ -780,24 +785,37 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch
%endif
%pre runtime
+%if %{with_sysusers}
+%sysusers_create_compat $RPM_BUILD_ROOT/systemtap-runtime.sysusers
+%else
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
+%endif
exit 0
%pre server
+%if %{with_sysusers}
+%sysusers_create_compat $RPM_BUILD_ROOT/systemtap-server.sysusers
+%else
getent group stap-server >/dev/null || groupadd -f -g 155 -r stap-server
getent passwd stap-server >/dev/null || \
useradd -c "Systemtap Compile Server" -u 155 -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server 2>/dev/null || \
useradd -c "Systemtap Compile Server" -g stap-server -d %{_localstatedir}/lib/stap-server -r -s /sbin/nologin stap-server
+%endif
+exit 0
%pre testsuite
+%if %{with_sysusers}
+%sysusers_create_compat $RPM_BUILD_ROOT/systemtap-testsuite.sysusers
+%else
getent passwd stapusr >/dev/null || \
useradd -c "Systemtap 'stapusr' User" -g stapusr -r -s /sbin/nologin stapusr
getent passwd stapsys >/dev/null || \
useradd -c "Systemtap 'stapsys' User" -g stapsys -G stapusr -r -s /sbin/nologin stapsys
getent passwd stapdev >/dev/null || \
useradd -c "Systemtap 'stapdev' User" -g stapdev -G stapusr -r -s /sbin/nologin stapdev
+%endif
exit 0
%post server
@@ -954,7 +972,7 @@ if [ "$1" -ge "1" ]; then
fi
exit 0
-%if %{with_python3}
+%if %{with_python3_probes}
%if %{with_systemd}
%preun exporter
if [ $1 = 0 ] ; then
@@ -1019,6 +1037,9 @@ exit 0
%doc README README.unprivileged AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
+%if %{with_sysusers}
+%{_sysusersdir}/systemtap-server.conf
+%endif
%files devel -f systemtap.lang
@@ -1088,6 +1109,9 @@ exit 0
%doc README README.security AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
+%if %{with_sysusers}
+%{_sysusersdir}/systemtap-runtime.conf
+%endif
%files client -f systemtap.lang
@@ -1154,6 +1178,9 @@ exit 0
%files testsuite
%dir %{_datadir}/systemtap
%{_datadir}/systemtap/testsuite
+%if %{with_sysusers}
+%{_sysusersdir}/systemtap-testsuite.conf
+%endif
%if %{with_java}
@@ -1195,7 +1222,7 @@ exit 0
%endif
%endif
-%if %{with_python3}
+%if %{with_python3_probes}
%files exporter
%{_sysconfdir}/stap-exporter
%{_sysconfdir}/sysconfig/stap-exporter
@@ -1213,6 +1240,9 @@ exit 0
# PRERELEASE
%changelog
+* 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