From 6b51535d6814c82535124a1db0c9bcb20e0b7f0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:48:23 +0000 Subject: [PATCH 01/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 1e42923..0e22ade 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network transaction audit tool License: GPLv2+ Group: Applications/Internet @@ -139,6 +139,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 3.0.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f99f0cbe154c833b5dacb68ffb755692fcfcba75 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:08 +0100 Subject: [PATCH 02/30] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- argus.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/argus.spec b/argus.spec index 0e22ade..4d236f3 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network transaction audit tool License: GPLv2+ Group: Applications/Internet @@ -139,6 +139,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Fri Feb 09 2018 Igor Gnatenko - 3.0.8.2-6 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 3.0.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -271,7 +274,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d - backed out of __perl_requires redefine for .pm files - trouble w. rpmbuild * Fri Feb 24 2006 Gabriel Somlo 2.0.6.fixes.1-2 -- empty perl_req/prov avoids .pm's in %doc from being dep-checked at all +- empty perl_req/prov avoids .pm's in %%doc from being dep-checked at all - misc spec file fixes * Fri Feb 24 2006 Gabriel Somlo 2.0.6.fixes.1-1 From 532344922530a454bc4b6bd41c79db83e5e5d3f8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 16 Mar 2018 12:00:28 -0500 Subject: [PATCH 03/30] tiprc --- argus-tirpc.patch | 11 +++++++++++ argus.spec | 41 +++++++++++------------------------------ 2 files changed, 22 insertions(+), 30 deletions(-) create mode 100644 argus-tirpc.patch diff --git a/argus-tirpc.patch b/argus-tirpc.patch new file mode 100644 index 0000000..2eec2fb --- /dev/null +++ b/argus-tirpc.patch @@ -0,0 +1,11 @@ +--- common/Makefile.in~ 2015-04-14 09:32:33.000000000 -0500 ++++ common/Makefile.in 2018-03-16 11:32:06.395595496 -0500 +@@ -35,7 +35,7 @@ + + CC = @CC@ + CCOPT = @V_CCOPT@ +-INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus ++INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus -I/usr/include/tirpc + DEFS = @DEFS@ + + # Standard CFLAGS diff --git a/argus.spec b/argus.spec index 4d236f3..75d4d33 100644 --- a/argus.spec +++ b/argus.spec @@ -2,35 +2,26 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Network transaction audit tool License: GPLv2+ -Group: Applications/Internet Url: http://qosient.com/argus Source0: http://qosient.com/argus/src/%{name}-%{version}.tar.gz Source1: http://qosient.com/argus/src/%{name}-clients-%{clientversion}.tar.gz Source2: argus.service Source3: README.fedora Source4: argus.logrotate -#Patch0: argus-2.0.6.fixes.1-makefile.patch -#Patch1: argus-2.0.6.fixes.1-build.patch -# bpf_dump conflicts with a function with slightly different prototype (added -# const) in libpcap 1.0 -#Patch2: argus-2.0.6.fixes.1-libpcap10.patch -#Patch3: argus-clients-2.0.6.fixes.1-makefile.patch -#Patch4: argus-clients-2.0.6.fixes.1-build.patch -#Patch5: argus-clients-2.0.6.fixes.1-print.patch +Patch0: argus-tirpc.patch Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires: logrotate -BuildRequires: cyrus-sasl-devel perl-generators tcp_wrappers flex bison ncurses-devel -BuildRequires: libpcap-devel zlib-devel +BuildRequires: cyrus-sasl-devel perl-generators flex bison ncurses-devel +BuildRequires: libpcap-devel zlib-devel libtirpc-devel readline-devel BuildRequires: systemd-units %package clients Summary: Client tools for argus network audit -Group: Applications/Internet %description Argus (Audit Record Generation and Utilization System) is an IP network @@ -43,7 +34,6 @@ Clients to the argus probe which process and display information. %package devel Summary: Header files for argus network audit -Group: Applications/Internet %description devel Header files for argus. @@ -52,19 +42,12 @@ Header files for argus. %prep %setup -a0 -q %setup -a1 -q -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 -#pushd %{name}-clients-%{version}.1 -#%patch3 -p1 -#%patch4 -p1 -#%patch5 -p1 -#popd +%patch0 -p0 %{__install} -p -m 0644 %{SOURCE3} . %build +export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" %configure --with-sasl=yes --prefix=%{_prefix} -%{__make} %{?_smp_mflags} pushd %{name}-clients-%{clientversion} %configure --with-sasl=yes --prefix=%{_prefix} %{__make} %{?_smp_mflags} @@ -105,7 +88,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %files %doc support bin/argusbug -%doc COPYING CREDITS INSTALL README VERSION +%doc CREDITS INSTALL README VERSION +%license COPYING %config(noreplace) %{_sysconfdir}/argus.conf %config(noreplace) %{_sysconfdir}/logrotate.d/argus %{_unitdir}/argus.service @@ -120,13 +104,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %doc %{name}-clients-%{clientversion}/ChangeLog %{name}-clients-%{clientversion}/COPYING %doc %{name}-clients-%{clientversion}/CREDITS %{name}-clients-%{clientversion}/INSTALL %doc %{name}-clients-%{clientversion}/README %{name}-clients-%{clientversion}/VERSION -#%doc %{name}-clients-%{clientversion}/doc/CHANGES %{name}-clients-%{clientversion}/doc/FAQ -#%doc %{name}-clients-%{clientversion}/doc/HOW-TO %{name}-clients-%{clientversion}/doc/pdf -#%doc %{name}-clients-%{clientversion}/doc/README %doc %{name}-clients-%{clientversion}/support -#%doc %{name}-clients-%{clientversion}/ragraph/ragraph.pl -# .pm checked for dependencies regardless of permissions -#%doc %{name}-clients-%{version}/contrib %doc README.fedora %{_bindir}/ra* %{_sbindir}/ra* @@ -139,6 +117,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Fri Mar 16 2018 Gwyn Ciesla - 3.0.8.2-7 +- Migrate to libtirpc. + * Fri Feb 09 2018 Igor Gnatenko - 3.0.8.2-6 - Escape macros in %%changelog From 83b20ae6c4eead3da50ffecd70c54d40eddaaf7c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 04/30] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- argus.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/argus.spec b/argus.spec index 75d4d33..bd7b255 100644 --- a/argus.spec +++ b/argus.spec @@ -16,6 +16,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires: logrotate +BuildRequires: gcc BuildRequires: cyrus-sasl-devel perl-generators flex bison ncurses-devel BuildRequires: libpcap-devel zlib-devel libtirpc-devel readline-devel BuildRequires: systemd-units From 061e6e50d5bb94884f475daee415c7c7688d193d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:29:46 +0000 Subject: [PATCH 05/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index bd7b255..3a0e475 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -118,6 +118,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.0.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Mar 16 2018 Gwyn Ciesla - 3.0.8.2-7 - Migrate to libtirpc. From afdf83abe46af83daf1d7f114d7f9fb35f21b05f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:43:46 +0000 Subject: [PATCH 06/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 3a0e475..f3fc0cc 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -118,6 +118,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.0.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 3.0.8.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 763a76a9c73305c7b179bae2e57634cc1a123c26 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:49 +0100 Subject: [PATCH 07/30] Rebuild for readline 8.0 --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index f3fc0cc..1558565 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -118,6 +118,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Sun Feb 17 2019 Igor Gnatenko - 3.0.8.2-10 +- Rebuild for readline 8.0 + * Thu Jan 31 2019 Fedora Release Engineering - 3.0.8.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 446f2c8a52baa9c01ef00cdf64a6902ffabd596c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:21:09 +0000 Subject: [PATCH 08/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 1558565..5f4db50 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -118,6 +118,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.0.8.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Igor Gnatenko - 3.0.8.2-10 - Rebuild for readline 8.0 From ae48ed157c7070c4946a588ff8d843419d5dfbbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:59:30 +0000 Subject: [PATCH 09/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 5f4db50..d578468 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -118,6 +118,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.0.8.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 3.0.8.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0d1834513cad5eb7099c23c0ff1856d1fe2b56c7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 31 Jan 2020 11:16:46 -0600 Subject: [PATCH 10/30] Fix FTBFS --- argus.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index d578468..ea614fc 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -49,6 +49,7 @@ Header files for argus. %build export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" %configure --with-sasl=yes --prefix=%{_prefix} +sed -i s/fcf-protection/fcf-protection\ -fcommon/g argus/Makefile pushd %{name}-clients-%{clientversion} %configure --with-sasl=yes --prefix=%{_prefix} %{__make} %{?_smp_mflags} @@ -118,6 +119,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Fri Jan 31 2020 Gwyn Ciesla - 3.0.8.2-13 +- Fix FTBFS + * Tue Jan 28 2020 Fedora Release Engineering - 3.0.8.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 684755ffbf1d9ea1ca8850bb7bbaf6ae6414a4ab Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 19 Feb 2020 11:05:44 -0600 Subject: [PATCH 11/30] Fix FTBFS. --- argus.spec | 10 +++++++--- common.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 common.patch diff --git a/argus.spec b/argus.spec index ea614fc..0a77e11 100644 --- a/argus.spec +++ b/argus.spec @@ -12,11 +12,12 @@ Source2: argus.service Source3: README.fedora Source4: argus.logrotate Patch0: argus-tirpc.patch +Patch1: common.patch Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires: logrotate -BuildRequires: gcc +BuildRequires: gcc autoconf automake BuildRequires: cyrus-sasl-devel perl-generators flex bison ncurses-devel BuildRequires: libpcap-devel zlib-devel libtirpc-devel readline-devel BuildRequires: systemd-units @@ -44,12 +45,15 @@ Header files for argus. %setup -a0 -q %setup -a1 -q %patch0 -p0 +%patch1 -p0 %{__install} -p -m 0644 %{SOURCE3} . %build -export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" +autoreconf -if +export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc -fcommon" +export CXXFLAGS="$CXXFLAGS -fcommon" %configure --with-sasl=yes --prefix=%{_prefix} -sed -i s/fcf-protection/fcf-protection\ -fcommon/g argus/Makefile +find . -type f -name 'Makefile' | xargs sed -i s/fcf-protection/fcf-protection\ -fcommon/g pushd %{name}-clients-%{clientversion} %configure --with-sasl=yes --prefix=%{_prefix} %{__make} %{?_smp_mflags} diff --git a/common.patch b/common.patch new file mode 100644 index 0000000..37ec3b9 --- /dev/null +++ b/common.patch @@ -0,0 +1,11 @@ +--- argus/ArgusUdt.c~ 2015-06-29 15:17:25.000000000 -0500 ++++ argus/ArgusUdt.c 2020-02-19 10:45:00.768211138 -0600 +@@ -41,7 +41,7 @@ + #include + + #include +-struct bootp *bp; ++extern struct bootp *bp; + + struct ArgusSystemFlow * + ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt) From 9c915959024a65e5a1edfda307912eecd3925eb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:22:16 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 0a77e11..8df0181 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -123,6 +123,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.0.8.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Gwyn Ciesla - 3.0.8.2-13 - Fix FTBFS From 7855f3ee2983708569309cc093788456f817040c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:36:13 +0000 Subject: [PATCH 13/30] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- argus.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/argus.spec b/argus.spec index 8df0181..a4fb800 100644 --- a/argus.spec +++ b/argus.spec @@ -21,6 +21,7 @@ BuildRequires: gcc autoconf automake BuildRequires: cyrus-sasl-devel perl-generators flex bison ncurses-devel BuildRequires: libpcap-devel zlib-devel libtirpc-devel readline-devel BuildRequires: systemd-units +BuildRequires: make %package clients Summary: Client tools for argus network audit From cfd6ab1bf981fccf62933c49db1d001235979171 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:24:47 +0000 Subject: [PATCH 14/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index a4fb800..b00fb4c 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -124,6 +124,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.0.8.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.0.8.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dc44340d5297f6048a0854c1a7ce17849042ed08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:10 +0100 Subject: [PATCH 15/30] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- argus.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index b00fb4c..a127b6b 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -124,6 +124,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.0.8.2-16 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 3.0.8.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e6b9c3b342c9aba5f69949f6f4af4c1e33bf887c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:57:00 +0000 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 87766424ca2be5f5fbd319e05e19bb83b377f3c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:53:13 +0000 Subject: [PATCH 17/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index a127b6b..9549de1 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -124,6 +124,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.0.8.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.0.8.2-16 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From bd672224c0d648558f3bbe13e3522919ed677fc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:35:23 +0000 Subject: [PATCH 18/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 9549de1..428b2bc 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -124,6 +124,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 3.0.8.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 3.0.8.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e17c1f7a538ae40c0c27c690c5191e330ad4d591 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:11:09 +0000 Subject: [PATCH 19/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 428b2bc..5bceefc 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -124,6 +124,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.0.8.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 3.0.8.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 7c333261e69c97a95995716f2de5afb518f5617d Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 25 Nov 2022 19:09:47 +0100 Subject: [PATCH 20/30] Port configure scripts to C99 Related to: --- argus-configure-c99.patch | 38 ++++++++++++++++++++++++++++++++++++++ argus.spec | 10 +++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 argus-configure-c99.patch diff --git a/argus-configure-c99.patch b/argus-configure-c99.patch new file mode 100644 index 0000000..cfa740c --- /dev/null +++ b/argus-configure-c99.patch @@ -0,0 +1,38 @@ +Include relevant headers to avoid implicit function declarations. +Declare the return type of main to avoid an implicit int. + +Submitted upstream: + + + + +diff -ur argus-3.0.8.2.orig/acsite.m4 argus-3.0.8.2/acsite.m4 +--- argus-3.0.8.2.orig/acsite.m4 2015-04-14 16:32:33.000000000 +0200 ++++ argus-3.0.8.2/acsite.m4 2022-11-25 18:44:48.934763450 +0100 +@@ -298,8 +298,10 @@ + # include + # include + # include ++# include ++# include + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +diff -ur argus-3.0.8.2.orig/configure argus-3.0.8.2/configure +--- argus-3.0.8.2.orig/configure 2016-06-01 20:29:33.000000000 +0200 ++++ argus-3.0.8.2/configure 2022-11-25 18:44:56.248688727 +0100 +@@ -5789,8 +5789,10 @@ + # include + # include + # include ++# include ++# include + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; diff --git a/argus.spec b/argus.spec index 5bceefc..4022521 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -13,6 +13,7 @@ Source3: README.fedora Source4: argus.logrotate Patch0: argus-tirpc.patch Patch1: common.patch +Patch2: argus-configure-c99.patch Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -47,6 +48,10 @@ Header files for argus. %setup -a1 -q %patch0 -p0 %patch1 -p0 +%patch2 -p1 +pushd %{name}-clients-%{clientversion} +%patch2 -p1 +popd %{__install} -p -m 0644 %{SOURCE3} . %build @@ -124,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Fri Nov 25 2022 Florian Weimer - 3.0.8.2-20 +- Port configure scripts to C99 + * Wed Jul 20 2022 Fedora Release Engineering - 3.0.8.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6d7b54b7643419482eddf8661b9e1685a3b0e892 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:05:55 +0000 Subject: [PATCH 21/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 4022521..7bc5683 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Network transaction audit tool License: GPLv2+ Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 3.0.8.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Nov 25 2022 Florian Weimer - 3.0.8.2-20 - Port configure scripts to C99 From 6f538f3fbf0b72be7cd750367f04b174986c7108 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 7 Mar 2023 15:48:50 -0600 Subject: [PATCH 22/30] migrated to SPDX license --- argus.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/argus.spec b/argus.spec index 7bc5683..c3c2234 100644 --- a/argus.spec +++ b/argus.spec @@ -2,9 +2,9 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Network transaction audit tool -License: GPLv2+ +License: GPL-2.0-or-later Url: http://qosient.com/argus Source0: http://qosient.com/argus/src/%{name}-%{version}.tar.gz Source1: http://qosient.com/argus/src/%{name}-clients-%{clientversion}.tar.gz @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Tue Mar 07 2023 Gwyn Ciesla - 3.0.8.2-22 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 3.0.8.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7d4473e750ad873d3d52ac98d08bdc431e7199ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:43:05 +0000 Subject: [PATCH 23/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index c3c2234..b0cd038 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.0.8.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Mar 07 2023 Gwyn Ciesla - 3.0.8.2-22 - migrated to SPDX license From 3ed670bf46168ab15ce7d6edbdc54b46e96ab237 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:30:57 +0000 Subject: [PATCH 24/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index b0cd038..b95392c 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.0.8.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.0.8.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 04710b5ee6625928374d34be187c709ab114d5b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:25:22 +0000 Subject: [PATCH 25/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index b95392c..f7a9655 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.0.8.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.0.8.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 53380420a8d38104271e4f6137f87eee43dee6a6 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 26/30] Eliminate use of obsolete %patchN syntax (#2283636) --- argus.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/argus.spec b/argus.spec index f7a9655..6b4d1d1 100644 --- a/argus.spec +++ b/argus.spec @@ -46,11 +46,11 @@ Header files for argus. %prep %setup -a0 -q %setup -a1 -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 +%patch -P0 -p0 +%patch -P1 -p0 +%patch -P2 -p1 pushd %{name}-clients-%{clientversion} -%patch2 -p1 +%patch -P2 -p1 popd %{__install} -p -m 0644 %{SOURCE3} . From 6f4bcec0e08fef1ad4229e9c1b66c83a8c1598dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:24:01 +0000 Subject: [PATCH 27/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 6b4d1d1..cb7a586 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.0.8.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 3.0.8.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 11f28b8b9ee6d31c8b70db7c6265b98a19efa4ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:30:32 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index cb7a586..272ce5e 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.0.8.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 3.0.8.2-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7d064735c09080577b5855179f56f2a75b5b4db3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:13:00 +0000 Subject: [PATCH 29/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index 272ce5e..c8b9f16 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.0.8.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 3.0.8.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a296e34b0abaa62a9dbe118cb2e78b0818c621a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:54:02 +0000 Subject: [PATCH 30/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- argus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argus.spec b/argus.spec index c8b9f16..3b01955 100644 --- a/argus.spec +++ b/argus.spec @@ -2,7 +2,7 @@ %global clientversion 3.0.8.2 Name: argus Version: 3.0.8.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Network transaction audit tool License: GPL-2.0-or-later Url: http://qosient.com/argus @@ -129,6 +129,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %{_includedir}/argus/ %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.0.8.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 3.0.8.2-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild