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..9549de1 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: 17%{?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 @@ -13,7 +13,6 @@ 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 @@ -46,12 +45,8 @@ 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 +%patch1 -p0 %{__install} -p -m 0644 %{SOURCE3} . %build @@ -129,42 +124,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