diff --git a/.gitignore b/.gitignore index fd712f5..177bc8d 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /systemtap-4.6~pre16262012gc7f1c12e.tar.gz /systemtap-4.6~pre16262021g84ef6bd9.tar.gz /systemtap-4.6~pre16291338gf2c14776.tar.gz +/systemtap-4.6.tar.gz diff --git a/sources b/sources index bf1bb66..b4b4a67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.6~pre16291338gf2c14776.tar.gz) = 43740cf53b5ae57d7fa517c615359870178d4fde74f3e59a93d90ba16b5ba21d116bfb3764823e72bdda486468641f4f1d7726995e6b72510c8a2a14dabf0910 +SHA512 (systemtap-4.6.tar.gz) = 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402 diff --git a/systemtap.spec b/systemtap.spec index c2299d1..281a594 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -4,7 +4,7 @@ %{!?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} @@ -38,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 @@ -88,7 +89,7 @@ %define __brp_mangle_shebangs_exclude_from .stp$ Name: systemtap -Version: 4.6~pre16291338gf2c14776 +Version: 4.6 Release: 1%{?release_override}%{?dist} # for version, see also configure.ac @@ -211,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} @@ -650,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. @@ -773,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 @@ -1012,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 @@ -1081,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 @@ -1147,6 +1178,9 @@ exit 0 %files testsuite %dir %{_datadir}/systemtap %{_datadir}/systemtap/testsuite +%if %{with_sysusers} +%{_sysusersdir}/systemtap-testsuite.conf +%endif %if %{with_java} @@ -1206,37 +1240,9 @@ exit 0 # PRERELEASE %changelog -* Mon Aug 16 2021 Frank Ch. Eigler - 4.6-16291338gf2c14776 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Sat Aug 07 2021 Jonathan Wakely - 4.6~pre16262021g84ef6bd9-3 -- Rebuilt for Boost 1.76 - -* Fri Jul 23 2021 Fedora Release Engineering - 4.6~pre16262021g84ef6bd9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 13 2021 Frank Ch. Eigler - 4.6-16262021g84ef6bd9 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Tue Jul 13 2021 Frank Ch. Eigler - 4.6-16262012gc7f1c12e -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Tue Jul 13 2021 Frank Ch. Eigler - 4.6-16262008gbff2b2ff -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Tue Jul 13 2021 Frank Ch. Eigler - 4.6-16261989g7c2751e3 -- Automated weekly rawhide release -- Applied spec changes from upstream git - -* Sat Jul 10 2021 Björn Esser - 4.5-3 -- Rebuild for versioned symbols in json-c - -* Fri Jun 04 2021 Python Maint - 4.5-2 -- Rebuilt for Python 3.10 +* Mon Nov 15 2021 Serhei Makarov - 4.6-1 +- Upstream release, see wiki page below for detailed notes. + https://sourceware.org/systemtap/wiki/SystemTapReleases * Fri May 07 2021 Serhei Makarov - 4.5-1 - Upstream release.