Hello,

> On 25 Apr 2021, at 13:28, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - Update from 2.3.11 to 2.4.0
> - Update of rootfile not required
> - Thanks to Marcel Lorenz for advice on changes to lfs needed to enable
>   successful build of sarg-2.4.0
> - Removal of old patches that are no longer needed
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> lfs/sarg                                     | 32 ++++++--------
> src/patches/sarg/sarg-2.3.11-configure.patch | 38 -----------------
> src/patches/sarg/sarg-2.3.11-format.patch    | 45 --------------------
> 3 files changed, 13 insertions(+), 102 deletions(-)
> delete mode 100644 src/patches/sarg/sarg-2.3.11-configure.patch
> delete mode 100644 src/patches/sarg/sarg-2.3.11-format.patch
> 
> diff --git a/lfs/sarg b/lfs/sarg
> index 697ce7513..9b8a2b763 100644
> --- a/lfs/sarg
> +++ b/lfs/sarg
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 2.3.11
> +VER        = 2.4.0
> 
> THISAPP    = sarg-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -32,11 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = sarg
> -PAK_VER    = 4
> +PAK_VER    = 5
> 
> DEPS       =
> 
> -CFLAGS    += -fcommon
> +CFLAGS    += -Wno-format-truncation -Wformat-overflow=1 -fcommon

There are quite severe problems and I do not think that just silencing the warnings is a good solution.

Is there no updated version of the patch available? Or: why has upstream not fixed those issues?

> ###############################################################################
> # Top-level Rules
> @@ -46,7 +46,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 8e30d86b16597aec89ad401c72c761bc
> +$(DL_FILE)_MD5 = 1b84509c1a0d55d46148bd957744870f
> 
> install : $(TARGET)
> 
> @@ -79,23 +79,17 @@ $(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
> -	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> -	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
> +	cd $(DIR_APP) && autoreconf -vi 
> +	cd $(DIR_APP) &&  ./configure 				\
> +			--prefix=/usr				\
> +			--sysconfdir=/etc/sarg			\
> +			--enable-sargphp=/var/www/html/sarg-php	\

We don’t have PHP.

> +			--bindir=/usr/bin

This should be the default.

> +	cd $(DIR_APP) && make $(MAKETUNING)
> +	cd $(DIR_APP) && make install
> 
> 	# Install configuration file.
> +	mkdir -p /etc/sarg
> 	cp -v $(DIR_SRC)/config/sarg/sarg.conf /etc/sarg/sarg.conf
> 
> 	# Install helper script.
> diff --git a/src/patches/sarg/sarg-2.3.11-configure.patch b/src/patches/sarg/sarg-2.3.11-configure.patch
> deleted file mode 100644
> index ca9695595..000000000
> --- a/src/patches/sarg/sarg-2.3.11-configure.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> ---- sarg-2.3.11/configure.ac~	2019-04-26 22:34:33.499022406 +0000
> -+++ sarg-2.3.11/configure.ac	2019-04-26 22:35:11.886556020 +0000
> -@@ -29,35 +29,6 @@
> - # Report more warnings to improve code quality.
> - CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
> - 
> --dnl Check for supported compiler options
> --
> --AC_MSG_CHECKING([for extra warnings flag in $CC])
> --saved_CFLAGS="${CFLAGS}"
> --CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter"
> --AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"])
> --AC_MSG_RESULT($have_extra_warnings)
> --if test "$have_extra_warnings" = "no" ; then
> --    CFLAGS="${saved_CFLAGS}"
> --fi
> --
> --AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
> --saved_CFLAGS="${CFLAGS}"
> --CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
> --AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
> --AC_MSG_RESULT($have_implicit_function_declaration)
> --if test "$have_implicit_function_declaration" = "no" ; then
> --    CFLAGS="${saved_CFLAGS}"
> --fi
> --
> --AC_MSG_CHECKING([for format error flag in $CC])
> --saved_CFLAGS="${CFLAGS}"
> --CFLAGS="${CFLAGS} -Werror=format"
> --AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
> --AC_MSG_RESULT($have_error_format)
> --if test "$have_error_format" = "no" ; then
> --    CFLAGS="${saved_CFLAGS}"
> --fi
> --
> - case "$host" in
> -    *-solaris*)
> -    LDFLAGS="${LDFLAGS} -lsocket -lnsl"
> diff --git a/src/patches/sarg/sarg-2.3.11-format.patch b/src/patches/sarg/sarg-2.3.11-format.patch
> deleted file mode 100644
> index d8ed22028..000000000
> --- a/src/patches/sarg/sarg-2.3.11-format.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -diff -wbBur sarg-2.3.11/index.c sarg-2.3.11.my/index.c
> ---- sarg-2.3.11/index.c	2018-01-14 21:00:22.000000000 +0300
> -+++ sarg-2.3.11.my/index.c	2018-02-19 12:20:15.896203347 +0300
> -@@ -208,7 +208,7 @@
> - 			m1=month / 16;
> - 			if(month % 16 != 0) {
> - 				m2=month % 16;
> --				sprintf(monthnum,"%02d-%02d",m1,m2);
> -+				sprintf(monthnum,"%02u-%02u",(unsigned int)m1,(unsigned int)m2);
> - 				sprintf(monthname1,"%02d",m1);
> - 				sprintf(monthname2,"%02d",m2);
> - 				name_month(monthname1,sizeof(monthname1));
> -@@ -269,7 +269,7 @@
> - 				d1=day / 32;
> - 				if(day % 32 != 0) {
> - 					d2=day % 32;
> --					sprintf(daynum,"%02d-%02d",d1,d2);
> -+					sprintf(daynum,"%02u-%02u",(unsigned int)d1,(unsigned int)d2);
> - 				} else {
> - 					sprintf(daynum,"%02d",d1);
> - 				}
> -diff -wbBur sarg-2.3.11/report.c sarg-2.3.11.my/report.c
> ---- sarg-2.3.11/report.c	2018-01-14 21:00:23.000000000 +0300
> -+++ sarg-2.3.11.my/report.c	2018-02-19 12:18:45.151207192 +0300
> -@@ -54,7 +54,7 @@
> - 	char accsmart[MAXLEN];
> - 	char crc2[MAXLEN/2 -1];
> - 	char siteind[MAX_TRUNCATED_URL];
> --	char arqtt[256];
> -+	char arqtt[267];
> - 	char *oldurltt=NULL;
> - 	char oldaccdiatt[11],oldacchoratt[9];
> - 	char tmp3[MAXLEN];
> -diff -wbBur sarg-2.3.11/userinfo.c sarg-2.3.11.my/userinfo.c
> ---- sarg-2.3.11/userinfo.c	2013-06-01 22:02:04.000000000 +0400
> -+++ sarg-2.3.11.my/userinfo.c	2018-02-19 12:21:16.103200796 +0300
> -@@ -67,7 +67,7 @@
> - 	int skip;
> - 	int flen;
> - 	int count, clen;
> --	char cstr[9];
> -+	char cstr[11];
> - 
> - 	last=NULL;
> - 	for (group=first_user_group ; group ; group=group->next) {
> -- 
> 2.31.1
>