From 7c333261e69c97a95995716f2de5afb518f5617d Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Nov 25 2022 18:09:47 +0000
Subject: Port configure scripts to C99


Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>

---

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:
+
+  <https://github.com/openargus/argus/pull/5>
+  <https://github.com/openargus/clients/pull/7>
+
+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 <sys/types.h>
+ #      include <sys/wait.h>
+ #      include <stdio.h>
++#      include <stdlib.h>
++#      include <unistd.h>
+       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 <sys/types.h>
+ #      include <sys/wait.h>
+ #      include <stdio.h>
++#      include <stdlib.h>
++#      include <unistd.h>
+       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 <fweimer@redhat.com> - 3.0.8.2-20
+- Port configure scripts to C99
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8.2-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild