X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsarg;h=697ce75130dcddf906e95a019fc7af51deea68c6;hb=aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06;hp=ce309a12bb601154542f7a908b188b7cbb801900;hpb=6709c69368acc8a240ef5bbc0f7cbf62fc321422;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/sarg b/lfs/sarg
index ce309a12bb..697ce75130 100644
--- 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,7 @@
 
 include Config
 
-VER        = 2.3.9
+VER        = 2.3.11
 
 THISAPP    = sarg-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
-PAK_VER    = 2
+PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
+
+CFLAGS    += -fcommon
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428
+$(DL_FILE)_MD5 = 8e30d86b16597aec89ad401c72c761bc
 
 install : $(TARGET)
 
@@ -77,6 +79,16 @@ $(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.3.11-format.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.3.11-configure.patch
+
+	cd $(DIR_APP) && autoreconf -vfi
+
+	# Update gettext Makefile
+	cd $(DIR_APP) && cp -vf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in
+
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/sarg