From 951c031e7a7f61d1f1c00fff64caab42241338f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:40:03 +0000 Subject: [PATCH 01/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 87d87b1..df96b6a 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -2,7 +2,7 @@ Name: snoopy Version: 2.2.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A preload library to send shell commands to syslog License: GPLv2+ URL: https://github.com/a2o/snoopy @@ -60,6 +60,9 @@ install -c -m 644 src/*.h %{buildroot}%{_includedir}/%{name} %{_includedir}/* %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.2.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d12778b3fa92459f91baa38887eeee079361fded Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 16:36:46 +0000 Subject: [PATCH 02/17] snoopy fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676012 --- .gitignore | 9 --- dead.package | 1 + snoopy.spec | 163 --------------------------------------------------- sources | 2 - 4 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 snoopy.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8e91ffc..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -snoopy-1.6.1.tar.gz -snoopy-1.7.1.tar.gz -/snoopy-1.7.6.tar.gz -/snoopy-1.7.9.tar.gz -/snoopy-1.7.10.tar.gz -/snoopy-1.8.0.tar.gz -/snoopy-1.9.0.tar.gz -/snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz -/fix-build-for-new-automake.patch diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5bbd9b3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +snoopy fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676012 diff --git a/snoopy.spec b/snoopy.spec deleted file mode 100644 index df96b6a..0000000 --- a/snoopy.spec +++ /dev/null @@ -1,163 +0,0 @@ -%global commit 3aa5c7124a3861427f7d17cbccbb1deb37329e08 - -Name: snoopy -Version: 2.2.6 -Release: 10%{?dist} -Summary: A preload library to send shell commands to syslog -License: GPLv2+ -URL: https://github.com/a2o/snoopy -Source0: https://github.com/a2o/snoopy/archive/%{commit}/snoopy-%{commit}.tar.gz -Patch0: fix-build-for-new-automake.patch -BuildRequires: automake -BuildRequires: libtool - -%description -Snoopy is designed to aid a sysadmin by providing a log of commands executed. Snoopy is completely transparent to the user and applications. It is linked into programs to provide a wrapper around calls to execve(). Logging is done via syslog. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -Development files for %{name}. - -%prep -%setup -q -n %{name}-%{commit} -%patch0 -p1 - -%build -sh autogen.sh -%configure --libdir=%{_libdir} -make %{?_smp_mflags} - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%install -%make_install - -mkdir -p %{buildroot}%{_sysconfdir} -install -m 0644 etc/snoopy.ini %{buildroot}%{_sysconfdir}/snoopy.ini - -rm %{buildroot}%{_libdir}/libsnoopy.la - -mkdir -p %{buildroot}%{_includedir}/%{name} -install -c -m 644 src/*.h %{buildroot}%{_includedir}/%{name} - -%files -%doc COPYING README.md ChangeLog -%license COPYING -%{_libdir}/libsnoopy* -%{_bindir}/snoopy-test-output -%{_sbindir}/snoopy-enable -%{_sbindir}/snoopy-disable -%{_sysconfdir}/snoopy.ini - -%files devel -%{_includedir}/* - -%changelog -* Fri Jul 26 2019 Fedora Release Engineering - 2.2.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.2.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.2.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Mar 22 2015 Mosaab Alzoubi - 2.2.6-1 -- Update to 2.2.6 -- Clean spec up -- Add -devel package -- Use Github source guidline -- Remove old guideline tags -- Remove la lib -- Remove old %%clean way -- Remove README.Fedora due to its included in tools -- Add %%license macro -- Fix BRs -- Support new automake building -- Use %%make_install -- Right way for ldconfig -- Right way for lib macro -- Fix lines length of %%descriotion -- Use snoopy.ini - -* Mon Aug 18 2014 Fedora Release Engineering - 1.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Sep 19 2013 Steve Traylen 1.9.0-1A -- New upstream version, also upstream moved to github. - -* Sun Aug 04 2013 Fedora Release Engineering - 1.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.8.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 1.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Apr 26 2012 Steve Traylen - 1.8.0-3 -- Correct previous wrong date in changelog. - -* Sat Jan 14 2012 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon May 2 2011 Steve Traylen - 1.8.0-1 -- New upstream 1.8.0 -- Use make install -- Clarify README.Fedora to use $LIB for configuration. rhbz#701241. - -* Wed Feb 09 2011 Fedora Release Engineering - 1.7.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jan 14 2011 Steve Traylen - 1.7.10-1 -- New upstream 1.7.10 - -* Mon Jan 10 2011 Steve Traylen - 1.7.9-1 -- New upstream 1.7.9 - -* Mon Nov 1 2010 Steve Traylen - 1.7.6-1 -- New upstream 1.7.6 - -* Fri Aug 6 2010 Steve Traylen - 1.7.1-2 -- Move lib from /usr/lib64 to /lib64 since a preload over glibc. - -* Fri Aug 6 2010 Steve Traylen - 1.7.1-1 -- New upstream 1.7.1-1 - -* Wed Aug 4 2010 Steve Traylen - 1.6.1-3 -- Don't edit /etc/ld.so.preload, instead provide README.Fedora - -* Tue Aug 3 2010 Steve Traylen - 1.6.1-2 -- Call ldconfig in post and preun - -* Tue Aug 3 2010 Steve Traylen - 1.6.1-1 -- Initial packaging. - diff --git a/sources b/sources deleted file mode 100644 index ce8cd09..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -3564577da7df8bb326c903b90373b8ea snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz -9090446631d87c378965ea28d3a15d87 fix-build-for-new-automake.patch From e5a1807e8d207c2e1694d78a8e709cb723fad967 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 28 Jul 2021 18:04:02 -0400 Subject: [PATCH 03/17] Revert "snoopy fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676012" Unretirement for https://pagure.io/releng/issue/10236 This reverts commit d12778b3fa92459f91baa38887eeee079361fded. --- .gitignore | 9 +++ dead.package | 1 - snoopy.spec | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 snoopy.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8e91ffc --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +snoopy-1.6.1.tar.gz +snoopy-1.7.1.tar.gz +/snoopy-1.7.6.tar.gz +/snoopy-1.7.9.tar.gz +/snoopy-1.7.10.tar.gz +/snoopy-1.8.0.tar.gz +/snoopy-1.9.0.tar.gz +/snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz +/fix-build-for-new-automake.patch diff --git a/dead.package b/dead.package deleted file mode 100644 index 5bbd9b3..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -snoopy fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676012 diff --git a/snoopy.spec b/snoopy.spec new file mode 100644 index 0000000..df96b6a --- /dev/null +++ b/snoopy.spec @@ -0,0 +1,163 @@ +%global commit 3aa5c7124a3861427f7d17cbccbb1deb37329e08 + +Name: snoopy +Version: 2.2.6 +Release: 10%{?dist} +Summary: A preload library to send shell commands to syslog +License: GPLv2+ +URL: https://github.com/a2o/snoopy +Source0: https://github.com/a2o/snoopy/archive/%{commit}/snoopy-%{commit}.tar.gz +Patch0: fix-build-for-new-automake.patch +BuildRequires: automake +BuildRequires: libtool + +%description +Snoopy is designed to aid a sysadmin by providing a log of commands executed. Snoopy is completely transparent to the user and applications. It is linked into programs to provide a wrapper around calls to execve(). Logging is done via syslog. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for %{name}. + +%prep +%setup -q -n %{name}-%{commit} +%patch0 -p1 + +%build +sh autogen.sh +%configure --libdir=%{_libdir} +make %{?_smp_mflags} + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%install +%make_install + +mkdir -p %{buildroot}%{_sysconfdir} +install -m 0644 etc/snoopy.ini %{buildroot}%{_sysconfdir}/snoopy.ini + +rm %{buildroot}%{_libdir}/libsnoopy.la + +mkdir -p %{buildroot}%{_includedir}/%{name} +install -c -m 644 src/*.h %{buildroot}%{_includedir}/%{name} + +%files +%doc COPYING README.md ChangeLog +%license COPYING +%{_libdir}/libsnoopy* +%{_bindir}/snoopy-test-output +%{_sbindir}/snoopy-enable +%{_sbindir}/snoopy-disable +%{_sysconfdir}/snoopy.ini + +%files devel +%{_includedir}/* + +%changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.2.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 2.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Mar 22 2015 Mosaab Alzoubi - 2.2.6-1 +- Update to 2.2.6 +- Clean spec up +- Add -devel package +- Use Github source guidline +- Remove old guideline tags +- Remove la lib +- Remove old %%clean way +- Remove README.Fedora due to its included in tools +- Add %%license macro +- Fix BRs +- Support new automake building +- Use %%make_install +- Right way for ldconfig +- Right way for lib macro +- Fix lines length of %%descriotion +- Use snoopy.ini + +* Mon Aug 18 2014 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Sep 19 2013 Steve Traylen 1.9.0-1A +- New upstream version, also upstream moved to github. + +* Sun Aug 04 2013 Fedora Release Engineering - 1.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Apr 26 2012 Steve Traylen - 1.8.0-3 +- Correct previous wrong date in changelog. + +* Sat Jan 14 2012 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon May 2 2011 Steve Traylen - 1.8.0-1 +- New upstream 1.8.0 +- Use make install +- Clarify README.Fedora to use $LIB for configuration. rhbz#701241. + +* Wed Feb 09 2011 Fedora Release Engineering - 1.7.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 14 2011 Steve Traylen - 1.7.10-1 +- New upstream 1.7.10 + +* Mon Jan 10 2011 Steve Traylen - 1.7.9-1 +- New upstream 1.7.9 + +* Mon Nov 1 2010 Steve Traylen - 1.7.6-1 +- New upstream 1.7.6 + +* Fri Aug 6 2010 Steve Traylen - 1.7.1-2 +- Move lib from /usr/lib64 to /lib64 since a preload over glibc. + +* Fri Aug 6 2010 Steve Traylen - 1.7.1-1 +- New upstream 1.7.1-1 + +* Wed Aug 4 2010 Steve Traylen - 1.6.1-3 +- Don't edit /etc/ld.so.preload, instead provide README.Fedora + +* Tue Aug 3 2010 Steve Traylen - 1.6.1-2 +- Call ldconfig in post and preun + +* Tue Aug 3 2010 Steve Traylen - 1.6.1-1 +- Initial packaging. + diff --git a/sources b/sources new file mode 100644 index 0000000..ce8cd09 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +3564577da7df8bb326c903b90373b8ea snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz +9090446631d87c378965ea28d3a15d87 fix-build-for-new-automake.patch From 396d88c58b274e272f413debf158999775ae6953 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 28 Jul 2021 23:22:48 -0400 Subject: [PATCH 04/17] Rebase to 2.4.14 - Modernize packaging to current packaging guidelines - Drop unsupported devel content - Run test suite --- .gitignore | 1 + ...-Fedora-and-RHEL-to-fix-filter-tests.patch | 70 ++++++++++++++++++ snoopy.spec | 72 ++++++++++--------- sources | 3 +- 4 files changed, 111 insertions(+), 35 deletions(-) create mode 100644 1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch diff --git a/.gitignore b/.gitignore index 8e91ffc..af30aec 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ snoopy-1.7.1.tar.gz /snoopy-1.9.0.tar.gz /snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz /fix-build-for-new-automake.patch +/snoopy-2.4.14.tar.gz diff --git a/1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch b/1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch new file mode 100644 index 0000000..68d3ec0 --- /dev/null +++ b/1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch @@ -0,0 +1,70 @@ +From 65519eff0a0d5e0c544eb8657d63778e7db7cf4c Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Wed, 28 Jul 2021 11:02:29 -0400 +Subject: [PATCH] tests: Add exceptions for Fedora and RHEL to fix filter tests + +Fedora and RHEL are affected by the same issue that affects CentOS +where "bash" is launched as "sh", particularly in package build +environments (e.g. rpmbuild and Mock). +--- + .../filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh | 2 +- + tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh | 2 +- + tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh | 2 +- + tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh +index 190b69b..3aabed8 100755 +--- a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh ++++ b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh +@@ -17,7 +17,7 @@ set -u + # + PARENT_PROC_NAME="bash" + . /etc/os-release +-if [[ $ID =~ ^(arch|centos|opensuse) ]]; then ++if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then + PARENT_PROC_NAME="sh" + fi + +diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh +index 8c219ce..ae6a8d7 100755 +--- a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh ++++ b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh +@@ -17,7 +17,7 @@ set -u + # + PARENT_PROC_NAME="bash" + . /etc/os-release +-if [[ $ID =~ ^(arch|centos|opensuse) ]]; then ++if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then + PARENT_PROC_NAME="sh" + fi + +diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh +index df8b9fb..ba4205d 100755 +--- a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh ++++ b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh +@@ -17,7 +17,7 @@ set -u + # + PARENT_PROC_NAME="bash" + . /etc/os-release +-if [[ $ID =~ ^(arch|centos|opensuse) ]]; then ++if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then + PARENT_PROC_NAME="sh" + fi + +diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh +index bdc2086..4dfda10 100755 +--- a/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh ++++ b/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh +@@ -17,7 +17,7 @@ set -u + # + PARENT_PROC_NAME="bash" + . /etc/os-release +-if [[ $ID =~ ^(arch|centos|opensuse) ]]; then ++if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then + PARENT_PROC_NAME="sh" + fi + +-- +2.31.1 + diff --git a/snoopy.spec b/snoopy.spec index df96b6a..945d703 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,65 +1,71 @@ -%global commit 3aa5c7124a3861427f7d17cbccbb1deb37329e08 - Name: snoopy -Version: 2.2.6 -Release: 10%{?dist} +Version: 2.4.14 +Release: 1%{?dist} Summary: A preload library to send shell commands to syslog License: GPLv2+ URL: https://github.com/a2o/snoopy -Source0: https://github.com/a2o/snoopy/archive/%{commit}/snoopy-%{commit}.tar.gz -Patch0: fix-build-for-new-automake.patch +Source0: %{url}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz + +# Upstream patches (0001~0500) + +# Proposed upstream patches (0501~1000) + +# Fedora-only patches (1001+) +Patch1001: 1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch + BuildRequires: automake BuildRequires: libtool +BuildRequires: gcc +BuildRequires: make +# For tests +BuildRequires: %{_bindir}/hostname +BuildRequires: %{_bindir}/socat +BuildRequires: %{_bindir}/ps %description -Snoopy is designed to aid a sysadmin by providing a log of commands executed. Snoopy is completely transparent to the user and applications. It is linked into programs to provide a wrapper around calls to execve(). Logging is done via syslog. +Snoopy is designed to aid a sysadmin by providing a log of commands executed. +Snoopy is completely transparent to the user and applications. +It is linked into programs to provide a wrapper around calls to execve(). +Logging is done via syslog. -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -Development files for %{name}. %prep -%setup -q -n %{name}-%{commit} -%patch0 -p1 +%autosetup -p1 + %build -sh autogen.sh -%configure --libdir=%{_libdir} -make %{?_smp_mflags} +%configure +%make_build -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig %install %make_install -mkdir -p %{buildroot}%{_sysconfdir} -install -m 0644 etc/snoopy.ini %{buildroot}%{_sysconfdir}/snoopy.ini - +# Get rid of libtool archive file rm %{buildroot}%{_libdir}/libsnoopy.la -mkdir -p %{buildroot}%{_includedir}/%{name} -install -c -m 644 src/*.h %{buildroot}%{_includedir}/%{name} + +%check +%make_build check + %files %doc COPYING README.md ChangeLog %license COPYING -%{_libdir}/libsnoopy* -%{_bindir}/snoopy-test-output +# Note, the plain .so file needs to be here since it's a preload library +%{_libdir}/libsnoopy.so* %{_sbindir}/snoopy-enable %{_sbindir}/snoopy-disable -%{_sysconfdir}/snoopy.ini +%config(noreplace) %{_sysconfdir}/snoopy.ini -%files devel -%{_includedir}/* %changelog +* Wed Jul 28 2021 Neal Gompa - 2.4.14-1 +- Rebase to 2.4.14 +- Modernize packaging to current packaging guidelines +- Drop unsupported devel content +- Run test suite + * Fri Jul 26 2019 Fedora Release Engineering - 2.2.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ce8cd09..34a9b72 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -3564577da7df8bb326c903b90373b8ea snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz -9090446631d87c378965ea28d3a15d87 fix-build-for-new-automake.patch +SHA512 (snoopy-2.4.14.tar.gz) = 1bb230a6923a0c840d51f3072112ed7f3c74e33208b210ea9cd24181fb047fe6166c61a4bffe70732e8f9d34c3ce2d446c31874811483d9b719ebb40382ea2e0 From 0c23cadebec572b7547d01917ef830bbe0eb1f1c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 29 Jul 2021 08:24:52 -0400 Subject: [PATCH 05/17] Disable -Werror on s390x on Fedora 33 only There's a puzzling failure that only occurs there: /bin/sh ../../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../.. -Wall -Werror -Wextra -Wno-unused-parameter -std=c99 -Wpedantic -I../../../src -I../../.. -DINI_MAX_LINE=1024 -DINI_INITIAL_ALLOC=1024 -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=zEC12 -mtune=z13 -fasynchronous-unwind-tables -fstack-clash-protection -c -o ini.lo ini.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../../.. -Wall -Werror -Wextra -Wno-unused-parameter -std=c99 -Wpedantic -I../../../src -I../../.. -DINI_MAX_LINE=1024 -DINI_INITIAL_ALLOC=1024 -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=zEC12 -mtune=z13 -fasynchronous-unwind-tables -fstack-clash-protection -c ini.c -fPIC -DPIC -o .libs/ini.o make[4]: Leaving directory '/builddir/build/BUILD/snoopy-2.4.14/lib/inih/src' In file included from /usr/include/string.h:519, from ini.c:16: In function 'strncpy', inlined from 'strncpy0' at ini.c:73:5, inlined from 'snoopy_ini_parse_stream' at ini.c:202:17: /usr/include/bits/string_fortified.h:91:10: error: 'strncpy' output may be truncated copying 49 bytes from a string of length 1023 [-Werror=stringop-truncation] 91 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors It looks like it's something goofy from the standard library, and doesn't show up in Fedora 34+, so just ignore it there for now. --- snoopy.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/snoopy.spec b/snoopy.spec index 945d703..193d83a 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -34,6 +34,14 @@ Logging is done via syslog. %build +%if 0%{?fc33} +# Only for Fedora 33 +%ifarch s390x +# Disable -Werror to prevent weirdness from the standard library on s390x +export CFLAGS="%{build_cflags} -Wno-error" +%endif +%endif + %configure %make_build From f8a0e9d288f434458cc21ed7e45069ae09e7b614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:14:55 +0000 Subject: [PATCH 06/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 193d83a..13bf84b 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.4.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A preload library to send shell commands to syslog License: GPLv2+ URL: https://github.com/a2o/snoopy @@ -68,6 +68,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.4.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 28 2021 Neal Gompa - 2.4.14-1 - Rebase to 2.4.14 - Modernize packaging to current packaging guidelines From 2fae2695c3b3310ad8f23d7a2f8f3a8dff4a8313 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:58:36 +0000 Subject: [PATCH 07/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 13bf84b..b4b7cab 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.4.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A preload library to send shell commands to syslog License: GPLv2+ URL: https://github.com/a2o/snoopy @@ -68,6 +68,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.4.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.4.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1722d2b3f27b47068c538d3e44d6e1f50f0e8c16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:37:05 +0000 Subject: [PATCH 08/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index b4b7cab..c241033 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.4.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A preload library to send shell commands to syslog License: GPLv2+ URL: https://github.com/a2o/snoopy @@ -68,6 +68,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.4.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.4.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2e8632c55769ac08b824dc9a599061291648bb07 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 3 Jun 2023 21:39:49 -0500 Subject: [PATCH 09/17] Update to 2.5.1 Convert to SPDX license identifier Add compat subpackage for snoopy-disable and snoopy-enable Signed-off-by: Michel Alexandre Salim --- .gitignore | 1 + snoopy-disable | 2 ++ snoopy-enable | 2 ++ snoopy.spec | 67 +++++++++++++++++++++++++++++++++++++------------- sources | 2 +- 5 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 snoopy-disable create mode 100644 snoopy-enable diff --git a/.gitignore b/.gitignore index af30aec..0c1e044 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ snoopy-1.7.1.tar.gz /snoopy-3aa5c7124a3861427f7d17cbccbb1deb37329e08.tar.gz /fix-build-for-new-automake.patch /snoopy-2.4.14.tar.gz +/snoopy-2.5.1.tar.gz diff --git a/snoopy-disable b/snoopy-disable new file mode 100644 index 0000000..1b9f6f5 --- /dev/null +++ b/snoopy-disable @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/sbin/snoopyctl disable diff --git a/snoopy-enable b/snoopy-enable new file mode 100644 index 0000000..47e0d12 --- /dev/null +++ b/snoopy-enable @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/sbin/snoopyctl enable diff --git a/snoopy.spec b/snoopy.spec index c241033..93c7b8e 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,17 +1,18 @@ Name: snoopy -Version: 2.4.14 -Release: 4%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: A preload library to send shell commands to syslog -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy Source0: %{url}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: snoopy-disable +Source2: snoopy-enable # Upstream patches (0001~0500) # Proposed upstream patches (0501~1000) # Fedora-only patches (1001+) -Patch1001: 1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch BuildRequires: automake BuildRequires: libtool @@ -22,32 +23,56 @@ BuildRequires: %{_bindir}/hostname BuildRequires: %{_bindir}/socat BuildRequires: %{_bindir}/ps -%description +%if 0%{?fedora} <= 38 || 0%{?el8} +Recommends: %{name}-compat = %{version}-%{release} +%endif + +%global _description %{expand: Snoopy is designed to aid a sysadmin by providing a log of commands executed. Snoopy is completely transparent to the user and applications. It is linked into programs to provide a wrapper around calls to execve(). -Logging is done via syslog. +Logging is done via syslog.} + +%description %{_description} + +%package compat +Summary: Compatibility scripts for %{name} + +BuildArch: noarch + +# this is only needed for the lifetime of Fedora and EPEL releases that +# originally shipped snoopy <= 2.4.x (which has snoopy-disable and +# snoopy-enable instead of snoopyctl) +# +# per policy we can't mark a package as deprecated on a released +# Fedora branch +%if 0%{?fedora} > 38 || 0%{?rhel} +Provides: deprecated() +%endif +Requires: %{name} = %{version}-%{release} + +%description compat %{_description} + +This package contains compatibility scripts for Snoopy. %prep %autosetup -p1 +# compat scripts +cp -p %{SOURCE1} . +cp -p %{SOURCE2} . %build -%if 0%{?fc33} -# Only for Fedora 33 -%ifarch s390x -# Disable -Werror to prevent weirdness from the standard library on s390x -export CFLAGS="%{build_cflags} -Wno-error" -%endif -%endif - %configure %make_build %install %make_install +for cmd in disable enable; do + install -p snoopy-${cmd} %{buildroot}%{_sbindir}/ +done # Get rid of libtool archive file rm %{buildroot}%{_libdir}/libsnoopy.la @@ -58,16 +83,24 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %files -%doc COPYING README.md ChangeLog %license COPYING +%doc README.md ChangeLog doc/FAQ.md doc/FILTER_exclude_spawns_of.md # Note, the plain .so file needs to be here since it's a preload library %{_libdir}/libsnoopy.so* -%{_sbindir}/snoopy-enable -%{_sbindir}/snoopy-disable +%{_sbindir}/snoopyctl %config(noreplace) %{_sysconfdir}/snoopy.ini +%files compat +%{_sbindir}/snoopy-disable +%{_sbindir}/snoopy-enable + %changelog +* Sat Jun 02 2023 Michel Alexandre Salim - 2.5.1-1 +- Update to 2.5.1 +- Convert to SPDX license identifier +- Add compat subpackage for snoopy-disable and snoopy-enable + * Sat Jan 21 2023 Fedora Release Engineering - 2.4.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 34a9b72..73dcebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snoopy-2.4.14.tar.gz) = 1bb230a6923a0c840d51f3072112ed7f3c74e33208b210ea9cd24181fb047fe6166c61a4bffe70732e8f9d34c3ce2d446c31874811483d9b719ebb40382ea2e0 +SHA512 (snoopy-2.5.1.tar.gz) = 8a09f4603f8ed23ebfd5e79a1e140faff91fdbea32f1698c2945c95d98b19c7503e337963f943b2ed43f33d65a6a107646e3e0f309b32676c5233f32c6289951 From c29d6b6aaacb872239b3d0d60c5619ed811a89be Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 3 Jun 2023 22:22:32 -0500 Subject: [PATCH 10/17] Disable failed tests on aarch64/s390x Remove old patch Signed-off-by: Michel Alexandre Salim --- ...-Fedora-and-RHEL-to-fix-filter-tests.patch | 70 ------------------- snoopy-disable-utmp-tests.diff | 14 ++++ snoopy.spec | 11 ++- 3 files changed, 23 insertions(+), 72 deletions(-) delete mode 100644 1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch create mode 100644 snoopy-disable-utmp-tests.diff diff --git a/1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch b/1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch deleted file mode 100644 index 68d3ec0..0000000 --- a/1001-Add-exceptions-for-Fedora-and-RHEL-to-fix-filter-tests.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 65519eff0a0d5e0c544eb8657d63778e7db7cf4c Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Wed, 28 Jul 2021 11:02:29 -0400 -Subject: [PATCH] tests: Add exceptions for Fedora and RHEL to fix filter tests - -Fedora and RHEL are affected by the same issue that affects CentOS -where "bash" is launched as "sh", particularly in package build -environments (e.g. rpmbuild and Mock). ---- - .../filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh | 2 +- - tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh | 2 +- - tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh | 2 +- - tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh -index 190b69b..3aabed8 100755 ---- a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh -+++ b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-first.sh -@@ -17,7 +17,7 @@ set -u - # - PARENT_PROC_NAME="bash" - . /etc/os-release --if [[ $ID =~ ^(arch|centos|opensuse) ]]; then -+if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then - PARENT_PROC_NAME="sh" - fi - -diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh -index 8c219ce..ae6a8d7 100755 ---- a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh -+++ b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-last.sh -@@ -17,7 +17,7 @@ set -u - # - PARENT_PROC_NAME="bash" - . /etc/os-release --if [[ $ID =~ ^(arch|centos|opensuse) ]]; then -+if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then - PARENT_PROC_NAME="sh" - fi - -diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh -index df8b9fb..ba4205d 100755 ---- a/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh -+++ b/tests/filter/filter_exclude_spawns_of-mustdrop-multiarg-mid.sh -@@ -17,7 +17,7 @@ set -u - # - PARENT_PROC_NAME="bash" - . /etc/os-release --if [[ $ID =~ ^(arch|centos|opensuse) ]]; then -+if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then - PARENT_PROC_NAME="sh" - fi - -diff --git a/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh b/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh -index bdc2086..4dfda10 100755 ---- a/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh -+++ b/tests/filter/filter_exclude_spawns_of-mustdrop-singlearg.sh -@@ -17,7 +17,7 @@ set -u - # - PARENT_PROC_NAME="bash" - . /etc/os-release --if [[ $ID =~ ^(arch|centos|opensuse) ]]; then -+if [[ $ID =~ ^(arch|centos|fedora|rhel|opensuse) ]]; then - PARENT_PROC_NAME="sh" - fi - --- -2.31.1 - diff --git a/snoopy-disable-utmp-tests.diff b/snoopy-disable-utmp-tests.diff new file mode 100644 index 0000000..72c96a7 --- /dev/null +++ b/snoopy-disable-utmp-tests.diff @@ -0,0 +1,14 @@ +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -94,10 +94,7 @@ XFAIL_TESTS = + @CONFIGFILE_ENABLED_TRUE@am__append_3 = unit-ext-ini.sh + @FILTERING_ENABLED_TRUE@am__append_4 = unit-filterregistry.sh + @DATASOURCE_ENABLED_systemd_unit_name_TRUE@am__append_5 = unit-util-systemd.sh +-@DATASOURCE_ENABLED_ipaddr_TRUE@am__append_6 = unit-util-utmp-entry-missing.sh \ +-@DATASOURCE_ENABLED_ipaddr_TRUE@ unit-util-utmp-entry-without-ip-address.sh \ +-@DATASOURCE_ENABLED_ipaddr_TRUE@ unit-util-utmp-ipv4.sh \ +-@DATASOURCE_ENABLED_ipaddr_TRUE@ unit-util-utmp-ipv6.sh ++@DATASOURCE_ENABLED_ipaddr_TRUE@am__append_6 = unit-util-utmp-entry-missing.sh + @DATASOURCE_ENABLED_ipaddr_TRUE@am__append_7 = unit-util-utmp-testUtmpFile + subdir = tests/unit + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/snoopy.spec b/snoopy.spec index 93c7b8e..5858916 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -13,6 +13,8 @@ Source2: snoopy-enable # Proposed upstream patches (0501~1000) # Fedora-only patches (1001+) +# arch-specific (1101+) +Patch1101: %{name}-disable-utmp-tests.diff BuildRequires: automake BuildRequires: libtool @@ -57,7 +59,12 @@ This package contains compatibility scripts for Snoopy. %prep -%autosetup -p1 +%autosetup -N +%ifarch aarch64 s390x +%autopatch -p1 +%else +%autopatch -p1 -M 1100 +%endif # compat scripts cp -p %{SOURCE1} . cp -p %{SOURCE2} . @@ -96,7 +103,7 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog -* Sat Jun 02 2023 Michel Alexandre Salim - 2.5.1-1 +* Sat Jun 03 2023 Michel Alexandre Salim - 2.5.1-1 - Update to 2.5.1 - Convert to SPDX license identifier - Add compat subpackage for snoopy-disable and snoopy-enable From 436b5f7085285cff5ac0c68060bbc16697ea2203 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:03:10 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 5858916..76d9366 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jun 03 2023 Michel Alexandre Salim - 2.5.1-1 - Update to 2.5.1 - Convert to SPDX license identifier From 28f6289d317363fb577ad685e02e149dd6ab27ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:48:14 +0000 Subject: [PATCH 12/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 76d9366..666b549 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6b68ae982eb57f7d853e676d4d782afc61b042a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:58:54 +0000 Subject: [PATCH 13/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 666b549..3cd5fe1 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3338cccd85b35a4ea71925c39ab7ee9fc6cd8948 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:07:48 +0000 Subject: [PATCH 14/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 3cd5fe1..2995dac 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5ec5b8bb57e8844abd67adac919f35cafad0187a Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 13 Feb 2025 15:16:17 -0600 Subject: [PATCH 15/17] Remove compat subpackage on Fedora >= 42 and EPEL >= 10 Create Packit configuration to automate future updates Signed-off-by: Michel Lind --- packit.yaml | 16 ++++++++++++++++ snoopy.spec | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..fdf84eb --- /dev/null +++ b/packit.yaml @@ -0,0 +1,16 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-rawhide diff --git a/snoopy.spec b/snoopy.spec index 2995dac..40d0fc8 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,16 @@ +# compat was already shipped on Fedora < 42 and EL9, even though +# they never had snoopy <= 2.4.x, +# so we need to keep it for the duration of the lifecycle, but we can drop this +# in Fedora >= 42 and RHEL >= 10 +%if (0%{?fedora} && 0%{?fedora} < 42) || (0%{?rhel} && 0%{?rhel} < 10) +%bcond_without compat +%else +%bcond_with compat +%endif + Name: snoopy Version: 2.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -25,9 +35,17 @@ BuildRequires: %{_bindir}/hostname BuildRequires: %{_bindir}/socat BuildRequires: %{_bindir}/ps -%if 0%{?fedora} <= 38 || 0%{?el8} +%if %{with compat} +%if 0%{?el8} Recommends: %{name}-compat = %{version}-%{release} %endif +%else +# drop in Fedora 44 (upgrading from 41 no longer supported) +# and EPEL 11 +%if (0%{?fedora} && 0%{?fedora} < 44) || (0%{?rhel} && 0%{?rhel} < 11) +Obsoletes: %{name}-compat < 2.5.1-6%{?dist} +%endif +%endif %global _description %{expand: Snoopy is designed to aid a sysadmin by providing a log of commands executed. @@ -37,6 +55,7 @@ Logging is done via syslog.} %description %{_description} +%if %{with compat} %package compat Summary: Compatibility scripts for %{name} @@ -48,14 +67,13 @@ BuildArch: noarch # # per policy we can't mark a package as deprecated on a released # Fedora branch -%if 0%{?fedora} > 38 || 0%{?rhel} Provides: deprecated() -%endif Requires: %{name} = %{version}-%{release} %description compat %{_description} This package contains compatibility scripts for Snoopy. +%endif %prep @@ -65,9 +83,11 @@ This package contains compatibility scripts for Snoopy. %else %autopatch -p1 -M 1100 %endif +%if %{with compat} # compat scripts cp -p %{SOURCE1} . cp -p %{SOURCE2} . +%endif %build @@ -77,9 +97,11 @@ cp -p %{SOURCE2} . %install %make_install +%if %{with compat} for cmd in disable enable; do install -p snoopy-${cmd} %{buildroot}%{_sbindir}/ done +%endif # Get rid of libtool archive file rm %{buildroot}%{_libdir}/libsnoopy.la @@ -97,12 +119,18 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %{_sbindir}/snoopyctl %config(noreplace) %{_sysconfdir}/snoopy.ini +%if %{with compat} %files compat %{_sbindir}/snoopy-disable %{_sbindir}/snoopy-enable +%endif %changelog +* Thu Feb 13 2025 Michel Lind - 2.5.1-6 +- Remove compat subpackage on Fedora >= 42 and EPEL >= 10 +- Create Packit configuration to automate future updates + * Sun Jan 19 2025 Fedora Release Engineering - 2.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9051e8f47aba0173b8f69497d9e20afe46179907 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 13 Feb 2025 22:43:34 +0000 Subject: [PATCH 16/17] Update to 2.5.2 upstream release - Resolves: rhbz#2321673 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ snoopy.spec | 8 ++++++-- sources | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 0c1e044..328b48c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ snoopy-1.7.1.tar.gz /fix-build-for-new-automake.patch /snoopy-2.4.14.tar.gz /snoopy-2.5.1.tar.gz +/snoopy-2.5.2.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..7017e6c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/snoopy.spec b/snoopy.spec index 40d0fc8..c727f2d 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -9,8 +9,8 @@ %endif Name: snoopy -Version: 2.5.1 -Release: 6%{?dist} +Version: 2.5.2 +Release: 1%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -127,6 +127,10 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Thu Feb 13 2025 Packit - 2.5.2-1 +- Update to version 2.5.2 +- Resolves: rhbz#2321673 + * Thu Feb 13 2025 Michel Lind - 2.5.1-6 - Remove compat subpackage on Fedora >= 42 and EPEL >= 10 - Create Packit configuration to automate future updates diff --git a/sources b/sources index 73dcebb..9f22710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snoopy-2.5.1.tar.gz) = 8a09f4603f8ed23ebfd5e79a1e140faff91fdbea32f1698c2945c95d98b19c7503e337963f943b2ed43f33d65a6a107646e3e0f309b32676c5233f32c6289951 +SHA512 (snoopy-2.5.2.tar.gz) = bb16affc545bf02207b6674aebe0821cbe5d70d4b91f873a4a751ef4f7e9a92f4a8d7910020e3c00800754bc5d8d05e9240717d17b7df3004f8a60b988ad4a3a From db47d84b6b61c636ee5074342c4b8ae32559839f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:29:37 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index c727f2d..9e743b8 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -10,7 +10,7 @@ Name: snoopy Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -127,6 +127,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 13 2025 Packit - 2.5.2-1 - Update to version 2.5.2 - Resolves: rhbz#2321673