suricata: Change midstream policy to "pass-flow"

[people/pmueller/ipfire-2.x.git] / lfs / pmacct

diff --git a/lfs/pmacct b/lfs/pmacct
index 9fef56729f9d7bd04f18d7a3becbb232a62a353e..03877764698ec7ee27a4e3d311fc9356c8909f85 100644 (file)
--- a/lfs/pmacct
+++ b/lfs/pmacct
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2019  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2019-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Accounting and aggregation toolsuite for IPv4 and IPv6
 
-VER        = 1.7.6
+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    = 2
-
+PAK_VER    = 7
 
 DEPS       = libcdada
 
@@ -49,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b
+$(DL_FILE)_BLAKE2 = 7b86189cde0bcfd1756a03dbcdccde17a5780b3c3f2616a917609ba617de2ad6e08e16ae00f81c90233944157f19ec995bd43c06030ab70da869bb523f0433a7
 
 install : $(TARGET)
 
@@ -57,13 +56,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -72,8 +71,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -82,14 +81,12 @@ $(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                             \
+       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