From 301d2e0e3f40551f17c8a002a5ec5fed85376ca2 Mon Sep 17 00:00:00 2001 From: sgrubb Date: Thu, 21 Sep 2017 18:15:34 -0400 Subject: [PATCH 01/32] Add systemd macros. (#850262) --- pads.spec | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/pads.spec b/pads.spec index ffb8d69..37c94d5 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Passive Asset Detection System Group: Applications/System License: GPLv2+ @@ -83,37 +83,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ rm -rf %{buildroot} %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - +%systemd_post auditd.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload pads.service > /dev/null 2>&1 || : - /bin/systemctl stop pads.service > /dev/null 2>&1 || : -fi - +%systemd_preun auditd.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart pads.service >/dev/null 2>&1 || : -fi - -%triggerun -- pads < 1.2-8 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply pads -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save pads >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del pads >/dev/null 2>&1 || : -/bin/systemctl try-restart pads.service >/dev/null 2>&1 || : - +%systemd_postun_with_restart pads.service %files %defattr(-,root,root,-) @@ -128,6 +104,9 @@ fi %{_mandir}/*/* %changelog +* Thu Sep 21 2017 Steve Grubb 1.2-23 +- Add systemd macros. (#850262) + * Thu Aug 03 2017 Fedora Release Engineering - 1.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4d4ea6e621c5518fa45f3e712043fe9c6d9dd168 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 18:08:29 +0000 Subject: [PATCH 02/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 37c94d5..bc3a641 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Passive Asset Detection System Group: Applications/System License: GPLv2+ @@ -104,6 +104,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Sep 21 2017 Steve Grubb 1.2-23 - Add systemd macros. (#850262) From 2691a0d8faf1e2c033295efe8ab0e1f8667af39c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:59:05 +0100 Subject: [PATCH 03/32] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- pads.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pads.spec b/pads.spec index bc3a641..12edc70 100644 --- a/pads.spec +++ b/pads.spec @@ -28,7 +28,6 @@ Patch16: pads-1.2-daemon.patch Patch17: pads-1.2-pthreads.patch Patch18: pads-aarch64.patch Patch19: pads-1.2-inline-cleanup.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf BuildRequires: pcre-devel libpcap-devel BuildRequires: perl-generators From 1b5d8db46b33f7fc00f79fa3c5ff3687965c8616 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:24:18 +0100 Subject: [PATCH 04/32] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- pads.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/pads.spec b/pads.spec index 12edc70..3ccf698 100644 --- a/pads.spec +++ b/pads.spec @@ -78,9 +78,6 @@ install -m 640 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/%{name} # Remove installed docs since we pick this up another way rm -rf $RPM_BUILD_ROOT/usr/share/pads/ -%clean -rm -rf %{buildroot} - %post %systemd_post auditd.service From bc58c61121e764e674b0b805053442974faefc2b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:50 +0200 Subject: [PATCH 05/32] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- pads.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pads.spec b/pads.spec index 3ccf698..66f25c9 100644 --- a/pads.spec +++ b/pads.spec @@ -28,6 +28,7 @@ Patch16: pads-1.2-daemon.patch Patch17: pads-1.2-pthreads.patch Patch18: pads-aarch64.patch Patch19: pads-1.2-inline-cleanup.patch +BuildRequires: gcc BuildRequires: automake autoconf BuildRequires: pcre-devel libpcap-devel BuildRequires: perl-generators From 718aa9bd74f4dbc583c037a0d34461b5a89e1854 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 02:14:49 -0500 Subject: [PATCH 06/32] Remove needless use of %defattr --- pads.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pads.spec b/pads.spec index 66f25c9..a29b42e 100644 --- a/pads.spec +++ b/pads.spec @@ -89,7 +89,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %systemd_postun_with_restart pads.service %files -%defattr(-,root,root,-) %doc doc/AUTHORS doc/COPYING doc/README doc/ChangeLog %{_sysconfdir}/pads-ether-codes %{_sysconfdir}/pads-signature-list From 7904b57be3b67ae187c1266866b727b8b345b65f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 15:23:48 +0000 Subject: [PATCH 07/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index a29b42e..bde12b6 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Passive Asset Detection System Group: Applications/System License: GPLv2+ @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d6e6ac61e840457e8761056ff7a4e4a30a5cbee7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:00 +0100 Subject: [PATCH 08/32] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- pads.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pads.spec b/pads.spec index bde12b6..f69bda7 100644 --- a/pads.spec +++ b/pads.spec @@ -3,7 +3,6 @@ Name: pads Version: 1.2 Release: 25%{?dist} Summary: Passive Asset Detection System -Group: Applications/System License: GPLv2+ URL: http://passive.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/passive/%{name}-%{version}.tar.gz From 26c1a4ccd4e46cc8258e16ba76c59d914ace42fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 17:48:44 +0000 Subject: [PATCH 09/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index f69bda7..1e38956 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4ac7ad3ddd8f0cf32a14e3c5dc113e07463599c6 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Mon, 11 Feb 2019 17:15:55 -0500 Subject: [PATCH 10/32] add debug commands --- pads.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pads.spec b/pads.spec index 1e38956..c72f28b 100644 --- a/pads.spec +++ b/pads.spec @@ -66,6 +66,8 @@ detect network assets. %build autoreconf -fv --install %configure +cat config.log +grep -r EXTRA_LIBS * make %{?_smp_mflags} %install From aa41d4ac69f6a97d194b2d87c3504972b4fcf65c Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Mon, 11 Feb 2019 17:51:49 -0500 Subject: [PATCH 11/32] Add pads-1.2-extra-libs.patch to fix missing EXTRA_LIBS --- pads-1.2-extra-libs.patch | 12 ++++++++++++ pads.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pads-1.2-extra-libs.patch diff --git a/pads-1.2-extra-libs.patch b/pads-1.2-extra-libs.patch new file mode 100644 index 0000000..85c8da0 --- /dev/null +++ b/pads-1.2-extra-libs.patch @@ -0,0 +1,12 @@ +diff -ur pads-1.2.orig/src/Makefile.am pads-1.2/src/Makefile.am +--- pads-1.2.orig/src/Makefile.am 2019-02-11 16:48:47.516302720 -0500 ++++ pads-1.2/src/Makefile.am 2019-02-11 17:49:51.772909507 -0500 +@@ -12,7 +12,7 @@ + util.c util.h \ + global.h + pads_LDFLAGS = -pthread +-pads_LDADD = $(top_srcdir)/lib/bstring/libbstring.a output/liboutput.a ++pads_LDADD = $(top_srcdir)/lib/bstring/libbstring.a output/liboutput.a $(EXTRA_LIBS) + bin_SCRIPTS = pads-report + + EXTRA_DIST = pads-report.pl diff --git a/pads.spec b/pads.spec index c72f28b..aa7aa6c 100644 --- a/pads.spec +++ b/pads.spec @@ -27,6 +27,7 @@ Patch16: pads-1.2-daemon.patch Patch17: pads-1.2-pthreads.patch Patch18: pads-aarch64.patch Patch19: pads-1.2-inline-cleanup.patch +Patch20: pads-1.2-extra-libs.patch BuildRequires: gcc BuildRequires: automake autoconf BuildRequires: pcre-devel libpcap-devel @@ -62,12 +63,11 @@ detect network assets. %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build autoreconf -fv --install %configure -cat config.log -grep -r EXTRA_LIBS * make %{?_smp_mflags} %install From 6ee706ada09e757f595bc74ea6bac763bba707cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 23:53:14 +0000 Subject: [PATCH 12/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index aa7aa6c..7ec8115 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.2-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0bbfdd6b6db4b6c7ea14816ac7495738b2e895e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 20:43:27 +0000 Subject: [PATCH 13/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 7ec8115..47e0eec 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 489e8b927a45cb763d05c9d6fe3288a88abbc542 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 13:02:32 +0000 Subject: [PATCH 14/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 47e0eec..0959e56 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.2-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c1150678db9016fc405443b3f97f8ed6861b3983 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:51:41 +0000 Subject: [PATCH 15/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- pads.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pads.spec b/pads.spec index 0959e56..13717af 100644 --- a/pads.spec +++ b/pads.spec @@ -28,6 +28,7 @@ Patch17: pads-1.2-pthreads.patch Patch18: pads-aarch64.patch Patch19: pads-1.2-inline-cleanup.patch Patch20: pads-1.2-extra-libs.patch +BuildRequires: make BuildRequires: gcc BuildRequires: automake autoconf BuildRequires: pcre-devel libpcap-devel From 29393ab3f74ec25ef8ca761fa6a0929f161b3161 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:49:46 +0000 Subject: [PATCH 16/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 13717af..6f53375 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.2-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 47c99b175baba38974ce7566e3864c6b9b815e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:06 +0100 Subject: [PATCH 17/32] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- pads.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 6f53375..dc37876 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -102,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2-31 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 1.2-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 61a9764dda3ee5cc34822bda6bfdb244e154873e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:35:06 +0000 Subject: [PATCH 18/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index dc37876..5edf3fa 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2-31 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 9f7e9615ed02416732821db4234e8368f04ad5fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:44:46 +0000 Subject: [PATCH 19/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 5edf3fa..0c4e4f5 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.2-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1af60d26ae778f8d39944df718aa93912b72e6a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 02:31:51 +0000 Subject: [PATCH 20/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 0c4e4f5..943b32a 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Passive Asset Detection System License: GPLv2+ URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3e34b32631b7b6128e5fe4e925d7517e99019997 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Thu, 22 Dec 2022 12:28:31 -0500 Subject: [PATCH 21/32] SPDX Migration --- pads.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pads.spec b/pads.spec index 943b32a..b9dcad3 100644 --- a/pads.spec +++ b/pads.spec @@ -1,9 +1,9 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Passive Asset Detection System -License: GPLv2+ +License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/passive/%{name}-%{version}.tar.gz Source1: pads.service @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Dec 22 2022 Steve Grubb - 1.2-35 +- SPDX Migration + * Fri Jul 22 2022 Fedora Release Engineering - 1.2-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From da71523d43210d8b7d13f78829b979fde0bf046a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 23:14:03 +0000 Subject: [PATCH 22/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index b9dcad3..42ce6b3 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 22 2022 Steve Grubb - 1.2-35 - SPDX Migration From 1cfcda870df5941eeb482210f95ab32512f3b0df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 18:29:20 +0000 Subject: [PATCH 23/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 42ce6b3..d4f927b 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.2-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.2-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4f0ccc36c33c89b1cea596c0c60391aaa4c9d950 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Tue, 14 Nov 2023 13:19:19 -0500 Subject: [PATCH 24/32] update patch directives in spec file --- pads.spec | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pads.spec b/pads.spec index d4f927b..01fe668 100644 --- a/pads.spec +++ b/pads.spec @@ -45,26 +45,26 @@ detect network assets. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 +%patch 5 -p1 +%patch 6 -p1 +%patch 7 -p1 +%patch 8 -p1 +%patch 9 -p1 +%patch 10 -p1 +%patch 11 -p1 +%patch 12 -p1 +%patch 13 -p1 +%patch 14 -p1 +%patch 15 -p1 +%patch 16 -p1 +%patch 17 -p1 +%patch 18 -p1 +%patch 19 -p1 +%patch 20 -p1 %build autoreconf -fv --install From 310f4bc004654d86bd9f0745717d70617dd03075 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Tue, 14 Nov 2023 13:24:49 -0500 Subject: [PATCH 25/32] Update service security settings --- pads.service | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pads.service b/pads.service index e32d1e7..f4e5340 100644 --- a/pads.service +++ b/pads.service @@ -1,11 +1,20 @@ [Unit] Description=Passive Asset Detection System After=network.target +Documentation=man:pads(8) [Service] Type=forking PIDFile=/run/pads.pid ExecStart=/usr/bin/pads -D -c /etc/pads.conf +### Security Settings ### +MemoryDenyWriteExecute=true +LockPersonality=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +RestrictRealtime=true + [Install] WantedBy=multi-user.target From 5d145534b596f55c772041fabd09547546a7c3d5 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Tue, 14 Nov 2023 13:27:37 -0500 Subject: [PATCH 26/32] Fix patching and improve security settings in service file --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 01fe668..1324410 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Tue Nov 14 2023 Steve Grubb - 1.2-38 +- Fix patching and improve security settings in service file + * Thu Jul 20 2023 Fedora Release Engineering - 1.2-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c3050717fe9c0681caab3334337ed65bf046e2f9 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Tue, 14 Nov 2023 14:46:13 -0500 Subject: [PATCH 27/32] correct service restarts --- pads.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pads.spec b/pads.spec index 1324410..eab426c 100644 --- a/pads.spec +++ b/pads.spec @@ -82,10 +82,10 @@ install -m 640 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/%{name} rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %post -%systemd_post auditd.service +%systemd_post pads.service %preun -%systemd_preun auditd.service +%systemd_preun pads.service %postun %systemd_postun_with_restart pads.service From 0eb683f55561438692e9e9823271ea8b2240b4c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 11:41:07 +0000 Subject: [PATCH 28/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index eab426c..e4fc47f 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 14 2023 Steve Grubb - 1.2-38 - Fix patching and improve security settings in service file From 2a82b655e185d455ebeca5a2bb3e44e3654084b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 11:46:56 +0000 Subject: [PATCH 29/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index e4fc47f..b470b63 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.2-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a81639dc4e7ffbbdfe89006740851960b93a05ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 21:18:18 +0000 Subject: [PATCH 30/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index b470b63..0b5c38c 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.2-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.2-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f5bd6a873d4f1cf65ec41ea214eb6df9151c9a43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 22:10:57 +0000 Subject: [PATCH 31/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 0b5c38c..60d00d5 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.2-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a476e8990d5514cc647ddfa2c148523752dd912b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:51:44 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- pads.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pads.spec b/pads.spec index 60d00d5..fb18f27 100644 --- a/pads.spec +++ b/pads.spec @@ -1,7 +1,7 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Passive Asset Detection System License: GPL-2.0-or-later URL: http://passive.sourceforge.net/ @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/pads/ %{_mandir}/*/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.2-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.2-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild