From 7f156022b50ef8add8d55bb2983cbf105e6ba976 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 27 Apr 2019 00:21:39 +0100 Subject: [PATCH] sarg: Fix build with newer GCCs Signed-off-by: Michael Tremer --- lfs/sarg | 3 ++ src/patches/sarg/sarg-2.3.11-configure.patch | 38 ++++++++++++++ src/patches/sarg/sarg-2.3.11-format.patch | 52 +++++++++++--------- 3 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 src/patches/sarg/sarg-2.3.11-configure.patch diff --git a/lfs/sarg b/lfs/sarg index c35ca8df0f..622f719fd8 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -80,6 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(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 diff --git a/src/patches/sarg/sarg-2.3.11-configure.patch b/src/patches/sarg/sarg-2.3.11-configure.patch new file mode 100644 index 0000000000..ca96955954 --- /dev/null +++ b/src/patches/sarg/sarg-2.3.11-configure.patch @@ -0,0 +1,38 @@ +--- 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 index b03636d0c3..d8ed22028c 100644 --- a/src/patches/sarg/sarg-2.3.11-format.patch +++ b/src/patches/sarg/sarg-2.3.11-format.patch @@ -1,39 +1,45 @@ -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 +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[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10]; ++ char arqtt[267]; 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 +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[10]; ++ char cstr[11]; last=NULL; for (group=first_user_group ; group ; group=group->next) { -- 2.39.5