Hello community, here is the log from the commit of package sarg for openSUSE:Factory checked in at 2020-01-31 23:57:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sarg (Old) and /work/SRC/openSUSE:Factory/.sarg.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sarg" Fri Jan 31 23:57:09 2020 rev:35 rq:768930 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sarg/sarg.changes 2019-08-22 10:52:04.737702249 +0200 +++ /work/SRC/openSUSE:Factory/.sarg.new.26092/sarg.changes 2020-01-31 23:58:31.127689777 +0100 @@ -1,0 +2,17 @@ +Thu Jan 30 19:45:38 UTC 2020 - Thomas Abraham <[email protected]> + +- Update to sarg-2.4.0 + - Update translation + - Useragent report is produced if information is available. + - Don't abort if DNS resolution is failing to resolve a host IP address. + - xz compressed log files are supported. + - Compressed redirector logs are now supported. + - Filter converted and split logs using -t command line option. + - Add many new buffer overflow checks. + - Use random temporary directory name by default. + +- removed sarg-2.3.2-limits_h.diff (deprecated) +- sarg-no-werror.patch migrated and renamed to sarg-2.4.0-no-werror.patch +- sarg-2.3.1-config.patch migrated and renamed to sarg-2.4.0-config.patch + +------------------------------------------------------------------- Old: ---- sarg-2.3.1-config.patch sarg-2.3.10.tar.gz sarg-2.3.2-limits_h.diff sarg-no-werror.patch New: ---- sarg-2.4.0-config.patch sarg-2.4.0-no-werror.patch sarg-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sarg.spec ++++++ --- /var/tmp/diff_new_pack.a5tMCY/_old 2020-01-31 23:58:33.219690862 +0100 +++ /var/tmp/diff_new_pack.a5tMCY/_new 2020-01-31 23:58:33.223690864 +0100 @@ -1,7 +1,7 @@ # # spec file for package sarg # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: sarg -Version: 2.3.10 +Version: 2.4.0 Release: 0 Summary: Squid Analysis Report Generator License: GPL-2.0-or-later @@ -39,11 +39,10 @@ Source8: sarg-reports.1.gz Source9: sarg-apache.conf Source10: platform_suse.gif -# PATCH-FIX-UPSTREAM sarg-2.3.1-config.patch -Patch0: sarg-2.3.1-config.patch -Patch1: sarg-2.3.2-limits_h.diff +# PATCH-FIX-UPSTREAM sarg-2.4.0-config.patch +Patch0: sarg-2.4.0-config.patch # PATCH-FIX-OPENSUSE do not build with werror -Patch2: sarg-no-werror.patch +Patch1: sarg-2.4.0-no-werror.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gd-devel @@ -62,15 +61,12 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 -p1 +%patch0 -p1 +%patch1 -p1 cp %{SOURCE2} . %build chmod a+x user_limit_block -# gettext in soruce < gettext in distro -sed -i -e 's|AM_GNU_GETTEXT_VERSION(\[0.18\])|AM_GNU_GETTEXT_VERSION(\[0.19\])|g' configure.in cp %{_datadir}/gettext/po/Makefile.in.in po autoreconf -fvi %configure \ ++++++ sarg-2.3.1-config.patch -> sarg-2.4.0-config.patch ++++++ --- /work/SRC/openSUSE:Factory/sarg/sarg-2.3.1-config.patch 2012-03-12 20:17:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sarg.new.26092/sarg-2.4.0-config.patch 2020-01-31 23:58:29.811689095 +0100 @@ -1,32 +1,17 @@ -Index: htaccess -=================================================================== ---- htaccess.orig -+++ htaccess +diff -pur sarg-2.4.0.orig/htaccess sarg-2.4.0/htaccess +--- sarg-2.4.0.orig/htaccess 2013-02-09 09:16:18.000000000 -0500 ++++ sarg-2.4.0/htaccess 2020-01-30 09:47:37.645468640 -0500 @@ -1,4 +1,4 @@ -AuthUserFile /usr/local/sarg/passwd +AuthUserFile /usr/share/sarg/passwd AuthName "SARG, Squid Analysis Report Generator" AuthType Basic <Limit GET POST> -Index: sarg-php/sarg-block-it.php -=================================================================== ---- sarg-php/sarg-block-it.php.orig -+++ sarg-php/sarg-block-it.php -@@ -25,7 +25,7 @@ - * - */ - --$filename = "/usr/local/squid/etc/block.txt"; -+$filename = "/etc/squid/block.txt"; - - $url = $_GET['url']; - $url = $url."\n"; -Index: sarg-php/sarg-squidguard-block.php -=================================================================== ---- sarg-php/sarg-squidguard-block.php.orig -+++ sarg-php/sarg-squidguard-block.php -@@ -26,8 +26,8 @@ - */ +diff -pur sarg-2.4.0.orig/sarg-php/config.php.inc sarg-2.4.0/sarg-php/config.php.inc +--- sarg-2.4.0.orig/sarg-php/config.php.inc 2017-01-30 07:56:22.000000000 -0500 ++++ sarg-2.4.0/sarg-php/config.php.inc 2020-01-30 09:49:06.036813496 -0500 +@@ -1,11 +1,11 @@ + <?php // Change to squidGuard and sarg config file paths -$SargConf = "/usr/local/sarg/sarg.conf"; @@ -34,21 +19,15 @@ +$SargConf = "/etc/sarg.conf"; +$squidGuardConf = "/etc/squidGuard.conf"; - global $SargConf; - global $dbhome; -@@ -37,7 +37,7 @@ include_once("language.php"); - include_once("style.php"); - - $url = $_GET['url']; --$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf'; -+$squidGuard_conf = '/etc/squidGuard.conf'; - - function parse_config($line,$clave) { - if (preg_match("/dbhome/i", $line)) { -Index: user_limit_block -=================================================================== ---- user_limit_block.orig -+++ user_limit_block + // File where URL to block will be appended +-$DefaultSquidBlock = "/usr/local/squid/etc/block.txt"; ++$DefaultSquidBlock = "/etc/squid/block.txt"; + + // Choose the locale you want to use to display messages (it must exist on your system) + $language = "fr_BE.utf-8"; +diff -pur sarg-2.4.0.orig/user_limit_block sarg-2.4.0/user_limit_block +--- sarg-2.4.0.orig/user_limit_block 2013-02-09 09:16:18.000000000 -0500 ++++ sarg-2.4.0/user_limit_block 2020-01-30 09:49:43.584534910 -0500 @@ -24,8 +24,8 @@ # # ++++++ sarg-2.4.0-no-werror.patch ++++++ --- a/configure.ac 2020-01-30 12:57:19.792005766 -0500 +++ b/configure.ac 2020-01-30 12:57:37.639866180 -0500 @@ -50,20 +50,6 @@ AS_IF([test "$have_extra_warnings" = "no # Don't compare signs as it is a mess CFLAGS="${CFLAGS} -Wno-sign-compare" -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) -AS_IF([test "$have_implicit_function_declaration" = "no"],[CFLAGS="${saved_CFLAGS}"]) - -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) -AS_IF([test "$have_error_format" = "no"],[CFLAGS="${saved_CFLAGS}"]) - case "$host" in *-solaris*) LDFLAGS="${LDFLAGS} -lsocket -lnsl" ++++++ sarg-2.3.10.tar.gz -> sarg-2.4.0.tar.gz ++++++ ++++ 151569 lines of diff (skipped)
