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.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 diff --git a/pads.spec b/pads.spec index ffb8d69..fb18f27 100644 --- a/pads.spec +++ b/pads.spec @@ -1,10 +1,9 @@ %define _default_patch_fuzz 2 Name: pads Version: 1.2 -Release: 22%{?dist} +Release: 43%{?dist} Summary: Passive Asset Detection System -Group: Applications/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 @@ -28,7 +27,9 @@ 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) +Patch20: pads-1.2-extra-libs.patch +BuildRequires: make +BuildRequires: gcc BuildRequires: automake autoconf BuildRequires: pcre-devel libpcap-devel BuildRequires: perl-generators @@ -44,25 +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 +%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 @@ -79,44 +81,16 @@ 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 -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - +%systemd_post pads.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 pads.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,-) %doc doc/AUTHORS doc/COPYING doc/README doc/ChangeLog %{_sysconfdir}/pads-ether-codes %{_sysconfdir}/pads-signature-list @@ -128,6 +102,70 @@ fi %{_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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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