Merge branch 'master' into next

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

diff --git a/lfs/sarg b/lfs/sarg
index ce309a12bb601154542f7a908b188b7cbb801900..b9f0b84747e945cab3c86884ad6253b7f2ead9bb 100644 (file)
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - An Open Source Firewall Solution                               #
-# Copyright (C) 2014 Michael Tremer                                           #
+# Copyright (C) 2007-2018  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        #
@@ -24,7 +24,9 @@
 
 include Config
 
-VER        = 2.3.9
+SUMMARY    = Squid Analysis Report Generator
+
+VER        = 2.4.0
 
 THISAPP    = sarg-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +34,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
-PAK_VER    = 2
+PAK_VER    = 5
+
+DEPS       =
+
+SERVICES   =
 
-DEPS       = ""
+CFLAGS    += -fcommon
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428
+$(DL_FILE)_MD5 = 1b84509c1a0d55d46148bd957744870f
 
 install : $(TARGET)
 
@@ -54,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -77,6 +83,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
+
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.4.0-format.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.4.0-configure.patch
+
+       cd $(DIR_APP) && autoreconf -vfi
+
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/sarg