sarg: update to 2.3.11 (needed for gcc-7)

diff --git a/lfs/sarg b/lfs/sarg
index 0d9e821c7f9a3b3a56a07e5d6bcf73b68515f515..51e8d6585a51fa256682ab7d910f1d68b631c33e 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,7 @@
 
 include Config
 
-VER        = 2.3.10
+VER        = 2.3.11
 
 THISAPP    = sarg-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f3c5f9a55ffea1662f6ec88daa0c49c3
+$(DL_FILE)_MD5 = 8e30d86b16597aec89ad401c72c761bc
 
 install : $(TARGET)
 
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.3.11-format.patch
+
        # Update gettext Makefile
        cd $(DIR_APP) && cp -vf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in
 

diff --git a/src/patches/sarg/sarg-2.3.11-format.patch b/src/patches/sarg/sarg-2.3.11-format.patch
new file mode 100644 (file)
index 0000000..b03636d
--- /dev/null
+++ b/src/patches/sarg/sarg-2.3.11-format.patch
@@ -0,0 +1,39 @@
+diff -Naur sarg-2.3.11.org/index.c sarg-2.3.11/index.c
+--- sarg-2.3.11.org/index.c    2018-01-14 19:00:22.000000000 +0100
++++ sarg-2.3.11/index.c        2018-01-24 14:38:19.746338020 +0100
+@@ -89,9 +89,9 @@
+       char monthdir[MAXLEN];
+       char monthname1[9], monthname2[9];
+       char nmonth[30];
+-      char monthnum[10];
++      char monthnum[15];
+       char dayindex[MAXLEN];
+-      char daynum[10];
++      char daynum[15];
+       char title[80];
+       int yearsort[150];
+       int nyears;
+diff -Naur sarg-2.3.11.org/report.c sarg-2.3.11/report.c
+--- sarg-2.3.11.org/report.c   2018-01-14 19:00:23.000000000 +0100
++++ sarg-2.3.11/report.c       2018-01-24 14:38:19.742337939 +0100
+@@ -54,7 +54,7 @@
+       char accsmart[MAXLEN];
+       char crc2[MAXLEN/2 -1];
+       char siteind[MAX_TRUNCATED_URL];
+-      char arqtt[256];
++      char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
+       char *oldurltt=NULL;
+       char oldaccdiatt[11],oldacchoratt[9];
+       char tmp3[MAXLEN];
+diff -Naur sarg-2.3.11.org/userinfo.c sarg-2.3.11/userinfo.c
+--- sarg-2.3.11.org/userinfo.c 2013-06-01 20:02:04.000000000 +0200
++++ sarg-2.3.11/userinfo.c     2018-01-24 14:38:19.746338020 +0100
+@@ -67,7 +67,7 @@
+       int skip;
+       int flen;
+       int count, clen;
+-      char cstr[9];
++      char cstr[10];
+ 
+       last=NULL;
+       for (group=first_user_group ; group ; group=group->next) {