diff --git a/argus-configure-c99.patch b/argus-configure-c99.patch deleted file mode 100644 index cfa740c..0000000 --- a/argus-configure-c99.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 3b01955..75d4d33 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: 29%{?dist} +Release: 7%{?dist} Summary: Network transaction audit tool -License: GPL-2.0-or-later +License: GPLv2+ 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 @@ -12,17 +12,13 @@ Source2: argus.service 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 Requires: logrotate -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 @@ -46,20 +42,12 @@ Header files for argus. %prep %setup -a0 -q %setup -a1 -q -%patch -P0 -p0 -%patch -P1 -p0 -%patch -P2 -p1 -pushd %{name}-clients-%{clientversion} -%patch -P2 -p1 -popd +%patch0 -p0 %{__install} -p -m 0644 %{SOURCE3} . %build -autoreconf -if -export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc -fcommon" -export CXXFLAGS="$CXXFLAGS -fcommon" +export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" %configure --with-sasl=yes --prefix=%{_prefix} -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} @@ -129,73 +117,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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. - -* 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 - -* 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 - -* 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 - -* 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 - * Fri Mar 16 2018 Gwyn Ciesla - 3.0.8.2-7 - Migrate to libtirpc. diff --git a/common.patch b/common.patch deleted file mode 100644 index 37ec3b9..0000000 --- a/common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)