[PATCH 1/2] pmacct: Patch file to allow build to work with GCC 11

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3220 bytes --]

- Created pmacct-1.7.6-Werror.patch to remove -Werror flags from the configure
   This was flagging up warnings as errors and stopping the build
- Removed the SUP_ARCH line to allow it to build again
- No update required to the rootfile

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/pmacct                            | 17 ++++++------
 src/patches/pmacct-1.7.6-Werror.patch | 38 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 src/patches/pmacct-1.7.6-Werror.patch

diff --git a/lfs/pmacct b/lfs/pmacct
index 5674ecc1b..2307f8c87 100644
--- a/lfs/pmacct
+++ b/lfs/pmacct
@@ -32,9 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pmacct
-PAK_VER    = 1
+PAK_VER    = 2
 
-SUP_ARCH   = none
 
 DEPS       = libcdada
 
@@ -79,13 +78,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && rm configure
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/pmacct-1.7.6-Werror.patch
 	cd $(DIR_APP) && ./autogen.sh
-	cd $(DIR_APP) && ./configure 			\
-		--prefix=/usr 				\
-		--sysconfdir=/etc/pmacct 		\
-		--enable-sqlite3 			\
-		--enable-l2				\
-		--enable-jansson
+	cd $(DIR_APP) && ./configure 		    \
+		        --prefix=/usr 			    \
+		        --sysconfdir=/etc/pmacct 	\
+		        --enable-sqlite3 		    \
+		        --enable-l2			        \
+		        --enable-jansson
 	# Add directory for plugins and pipes
 	-mkdir -v /var/spool/pmacct
 	# Add configuration folder and copy conf file to it
diff --git a/src/patches/pmacct-1.7.6-Werror.patch b/src/patches/pmacct-1.7.6-Werror.patch
new file mode 100644
index 000000000..57bb7d1ff
--- /dev/null
+++ b/src/patches/pmacct-1.7.6-Werror.patch
@@ -0,0 +1,38 @@
+--- pmacct-1.7.6/configure.ac.orig	2021-02-05 02:07:36.000000000 +0100
++++ pmacct-1.7.6/configure.ac	2021-07-15 19:58:37.247916727 +0200
+@@ -1153,9 +1153,9 @@ AC_ARG_ENABLE(debug,
+ 			AC_MSG_RESULT(yes)
+ 			tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'`
+ 			CFLAGS="$tmp_CFLAGS"
+-			CFLAGS="$CFLAGS -g -Wall -Werror"
++			CFLAGS="$CFLAGS -g -Wall"
+ 		else
+-			CFLAGS="$CFLAGS -Wall -Werror"
++			CFLAGS="$CFLAGS -Wall"
+ 			AC_MSG_RESULT(no)
+ 		fi
+ 	],
+
+
+--- pmacct-1.7.6/src/external_libs/libcdada/configure.ac.orig	2021-02-07 16:29:15.000000000 +0100
++++ pmacct-1.7.6/src/external_libs/libcdada/configure.ac	2021-07-16 09:04:30.858749121 +0200
+@@ -4,7 +4,7 @@ AC_INIT(LIBCDADA, m4_esyscmd_s(cat VERSI
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ 
+ AC_GNU_SOURCE
+ 
+@@ -24,8 +24,8 @@ LT_INIT
+ AC_ENABLE_STATIC
+ 
+ # Some useful default flags
+-CFLAGS="-std=gnu89 -Werror -Wall $CFLAGS"
+-CXXFLAGS="-Werror -Wall $CXXFLAGS"
++CFLAGS="-std=gnu89 -Wall $CFLAGS"
++CXXFLAGS="-Wall $CXXFLAGS"
+ AC_DEFINE([__STDC_FORMAT_MACROS], [], [Description])
+ 
+ # Check for Python3
-- 
2.32.0