diff --git a/systemtap-5.0.tar.gz b/systemtap-5.1.tar.gz similarity index 46% rename from systemtap-5.0.tar.gz rename to systemtap-5.1.tar.gz index 5566045d87becb78da20fa3c1c9a6dfce5d5deef..d460491b7c9578edb7c10d9f144c5abc7ac39779 100644 Binary files a/systemtap-5.0.tar.gz and b/systemtap-5.1.tar.gz differ diff --git a/systemtap.spec b/systemtap.spec index 570fee4059e5febcd373ab192d7adcb8724247c3..52997a2f700ede815ecfce0681cb98a0abc25abe 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -21,11 +21,11 @@ %undefine __brp_mangle_shebangs Name: systemtap -Version: 5.0 -Release: 3 +Version: 5.1 +Release: 1 Summary: Linux trace and probe tool -License: GPLv2+ and Public Domain -URL: http://sourceware.org/systemtap +License: GPL-2.0-or-later and Public Domain +URL: https://sourceware.org/systemtap Source: https://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz Patch9000: huawei-fix-network-tcp-test-error.patch @@ -58,8 +58,9 @@ the components needed to locally develop and execute systemtap scripts. %package devel Summary: Programmable system-wide instrumentation system - development headers, tools -License: GPLv2+ +License: GPL-2.0-or-later Requires: make kernel-devel systemd +Requires: systemtap-translations = %{version}-%{release} %description devel This package contains the components needed to compile a systemtap @@ -69,10 +70,22 @@ systemtap-client and systemtap-runtime packages), or on a dedicated remote server (alongside the systemtap-server package). It includes a copy of the standard tapset library and the runtime library C files. +%package translations +Summary: Translation files for %{name} +Buildarch: noarch +Conflicts: systemtap-server < 5.1 +Conflicts: systemtap-devel < 5.1 +Conflicts: systemtap-runtime < 5.1 +Conflicts: systemtap-client < 5.1 + +%description translations +This package contains tranlation files for %{name} + %package server Summary: Instrumentation System Server -License: GPLv2+ +License: GPL-2.0-or-later Requires: systemtap-devel = %{version}-%{release} +Requires: systemtap-translations = %{version}-%{release} Requires: coreutils nss zip unzip Requires(pre): shadow-utils BuildRequires: nss-devel avahi-devel @@ -87,8 +100,9 @@ compiles systemtap scripts to kernel objects on their demand. %package runtime Summary: Programmable system-wide instrumentation system - runtime -License: GPLv2+ +License: GPL-2.0-or-later Requires(pre): shadow-utils +Requires: systemtap-translations = %{version}-%{release} %description runtime SystemTap runtime contains the components needed to execute @@ -97,9 +111,10 @@ using a local or remote systemtap-devel installation. %package client Summary: Programmable system-wide instrumentation system - client -License: GPLv2+ +License: GPL-2.0-or-later Requires: zip unzip Requires: systemtap-runtime = %{version}-%{release} +Requires: systemtap-translations = %{version}-%{release} Requires: coreutils grep sed unzip zip Requires: openssh-clients %if %{with_mokutil} @@ -115,7 +130,7 @@ documentation, and a copy of the tapset library for reference. %package sdt-devel Summary: Static probe support tools -License: GPLv2+ and Public Domain +License: GPL-2.0-or-later and Public Domain Requires: python3-pyparsing %description sdt-devel @@ -126,7 +141,7 @@ with the optional dtrace-compatibility preprocessor to process related %package testsuite Summary: Instrumentation System Testsuite -License: GPLv2+ +License: GPL-2.0-or-later Requires: systemtap = %{version}-%{release} Requires: systemtap-sdt-devel = %{version}-%{release} Requires: systemtap-server = %{version}-%{release} @@ -146,8 +161,7 @@ systemtap on the current system. %package runtime-python3 Summary: Systemtap Python 3 Runtime Support -License: GPLv2+ -URL: http://sourceware.org/systemtap +License: GPL-2.0-or-later Requires: systemtap-runtime = %{version}-%{release} %description runtime-python3 @@ -156,9 +170,9 @@ that probe python3 processes. %package stap-exporter Summary: Systemtap-prometheus interoperation mechanism -License: GPLv2+ -URL: http://sourceware.org/systemtap +License: GPL-2.0-or-later Requires: systemtap-runtime = %{version}-%{release} +Provides: %{name}-exporter = %{version}-%{release} %description stap-exporter This package includes files for a systemd service that manages @@ -167,8 +181,7 @@ to remote requesters on demand. %package jupyter Summary: ISystemtap jupyter kernel and examples -License: GPLv2+ -URL: http://sourceware.org/systemtap/ +License: GPL-2.0-or-later Requires: systemtap = %{version}-%{release} %description jupyter @@ -176,13 +189,7 @@ This package includes files needed to build and run the interactive systemtap Jupyter kernel, either locally or within a container. -%package help -Summary: systemtap manual -License: GPLv2+ -URL: http://sourceware.org/systemtap - -%description help -This package include systemtap manual +%package_help %prep %autosetup -p1 @@ -207,14 +214,8 @@ This package include systemtap manual %{_emacs_bytecompile} emacs/systemtap-mode.el %install -rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=$RPM_BUILD_ROOT install +%make_install %find_lang %{name} -for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do - dir=$(echo $dir | sed -e "s|^$RPM_BUILD_ROOT||") - lang=$(basename $dir) - echo "%%lang($lang) $dir/man*/*" >> %{name}.lang -done ln -s %{_datadir}/systemtap/examples find $RPM_BUILD_ROOT%{_datadir}/systemtap/examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@' @@ -364,7 +365,6 @@ exit 0 %files %license COPYING %doc README README.unprivileged AUTHORS NEWS -%defattr(-,root,root) %{_unitdir}/systemtap.service %{_sbindir}/systemtap-service %dir %{_sysconfdir}/systemtap @@ -376,8 +376,9 @@ exit 0 %dir %{dracutstap} %{dracutstap}/* -%files server -f systemtap.lang -%defattr(-,root,root) +%files translations -f systemtap.lang + +%files server %{_bindir}/stap-server %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/stap-serverd @@ -396,9 +397,8 @@ exit 0 %dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server %ghost %config(noreplace) %attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log %ghost %attr(0755,stap-server,stap-server) %{_localstatedir}/run/stap-server -%{!?_licensedir:%global license %%doc} -%files devel -f systemtap.lang +%files devel %{_bindir}/stap %{_bindir}/stap-prep %{_bindir}/stap-profile-annotate @@ -406,15 +406,13 @@ exit 0 %dir %{_datadir}/systemtap %{_datadir}/systemtap/runtime %{_datadir}/systemtap/tapset -%{!?_licensedir:%global license %%doc} %dir %{_libexecdir}/systemtap %{_emacs_sitelispdir}/*.el* %{_emacs_sitestartdir}/systemtap-init.el %{_datadir}/vim/vimfiles/*/*.vim %{_libexecdir}/systemtap/python/stap-resolve-module-function.py -%files runtime -f systemtap.lang -%defattr(-,root,root) +%files runtime %attr(4110,root,stapusr) %{_bindir}/staprun %{_bindir}/stapsh %{_bindir}/stap-merge @@ -423,7 +421,6 @@ exit 0 %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/stapio %{_libexecdir}/systemtap/stap-authorize-cert -%{!?_licensedir:%global license %%doc} %if %{with_dyninst} %{_bindir}/stapdyn %endif @@ -432,10 +429,8 @@ exit 0 %{_libdir}/systemtap/staplog.so* %endif -%files client -f systemtap.lang -%defattr(-,root,root) +%files client %{_datadir}/systemtap/examples -%{!?_licensedir:%global license %%doc} %license COPYING %doc docs.installed/*.pdf %{_bindir}/stap @@ -445,15 +440,12 @@ exit 0 %{_datadir}/systemtap/tapset %files sdt-devel -%defattr(-,root,root) %{_bindir}/dtrace %{_includedir}/sys/sdt.h %{_includedir}/sys/sdt-config.h %{_rpmmacrodir}/macros.systemtap -%{!?_licensedir:%global license %%doc} %files testsuite -%defattr(-,root,root) %dir %{_datadir}/systemtap %{_datadir}/systemtap/testsuite @@ -464,9 +456,9 @@ exit 0 %files stap-exporter %{_unitdir}/stap-exporter.service %{_bindir}/stap-exporter -/etc/stap-exporter/* -/usr/sbin/stap-exporter -/etc/sysconfig/stap-exporter +%{_sysconfdir}/stap-exporter +%{_sbindir}/stap-exporter +%{_sysconfdir}/sysconfig/stap-exporter %files jupyter %{_bindir}/stap-jupyter-container @@ -476,9 +468,13 @@ exit 0 %{_datadir}/systemtap/interactive-notebook %files help -%{_mandir}/man[1378]/* +%{_mandir}/man?/* +%lang(cs) %{_mandir}/cs/man?/* %changelog +* Wed Nov 06 2024 Funda Wang - 5.1-1 +- update to 5.1 + * Wed Sep 04 2024 wangxiao - 5.0-3 - Type:bugfix - CVE:NA diff --git a/systemtap.yaml b/systemtap.yaml index 3e06431d5d30041ae1773526f10e5e8f006bcefd..685deff3713c1482cae6826393afc1282d00b982 100644 --- a/systemtap.yaml +++ b/systemtap.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://sourceware.org/git/systemtap.git tag_prefix: ^release- -seperator: . +separator: .