Merge branch 'master' into next

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

diff --git a/lfs/pmacct b/lfs/pmacct
index 30c6c47e12abf6caf6abd5083118aa785b86ddd2..7d62a0cda4dcbbafb4c85739819976b17ddbad3a 100644 (file)
--- a/lfs/pmacct
+++ b/lfs/pmacct
@@ -24,6 +24,8 @@
 
 include Config
 
+SUMMARY    = Accounting and aggregation toolsuite for IPv4 and IPv6
+
 VER        = 1.7.6
 
 THISAPP    = pmacct-$(VER)
@@ -32,10 +34,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pmacct
-PAK_VER    = 1
+PAK_VER    = 2
+
 
 DEPS       = libcdada
 
+SERVICES   = pmacct
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -54,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -77,13 +82,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
@@ -92,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        #install initscripts
-       $(call INSTALL_INITSCRIPT,pmacct)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
        # Install backup definition
        install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \
                        /var/ipfire/backup/addons/includes/pmacct