Merge branch 'master' into next

lfs/pmacct

@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Accounting and aggregation toolsuite for IPv4 and IPv6
 
-VER        = 1.7.8
+VER        = 5a5e272
 
 THISAPP    = pmacct-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,8 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pmacct
-PAK_VER    = 6
-
+PAK_VER    = 7
 
 DEPS       = libcdada
 
@@ -49,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f
+$(DL_FILE)_BLAKE2 = 7b86189cde0bcfd1756a03dbcdccde17a5780b3c3f2616a917609ba617de2ad6e08e16ae00f81c90233944157f19ec995bd43c06030ab70da869bb523f0433a7
 
 install : $(TARGET)
 
@@ -82,11 +81,12 @@ $(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) && ./configure 		    \
-		        --prefix=/usr 			    \
-		        --sysconfdir=/etc/pmacct 	\
-		        --enable-sqlite3 		    \
-		        --enable-l2			        \
+	cd $(DIR_APP) && ./autogen.sh
+	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