diff --git a/lfs/pmacct b/lfs/pmacct index 0f8834b51..7c8b32772 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -26,7 +26,7 @@ include Config SUMMARY = Accounting and aggregation toolsuite for IPv4 and IPv6 -VER = 1.7.6 +VER = 1.7.8 THISAPP = pmacct-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pmacct -PAK_VER = 4 +PAK_VER = 5 DEPS = libcdada @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = df04822e88f9409d335457031fb26ce4ae8b5da13cf2f55f8d6c78eb50dade62ef763d389ac81a509d9351e12844446ac73171e9966a5aeeecc0e5fb10219c73 +$(DL_FILE)_BLAKE2 = 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f install : $(TARGET) @@ -82,9 +82,6 @@ $(subst %,%_BLAKE2,$(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 \ diff --git a/src/patches/pmacct-1.7.6-Werror.patch b/src/patches/pmacct-1.7.6-Werror.patch deleted file mode 100644 index 57bb7d1ff..000000000 --- a/src/patches/pmacct-1.7.6-Werror.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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