From 684755ffbf1d9ea1ca8850bb7bbaf6ae6414a4ab Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Feb 19 2020 17:05:44 +0000
Subject: Fix FTBFS.


---

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 <ArgusModeler.h>
+ 
+ #include <argus/bootp.h>
+-struct bootp *bp;
++extern struct bootp *bp;
+ 
+ struct ArgusSystemFlow *
+ ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt)