From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- net-analyzer/sarg/Manifest | 4 - net-analyzer/sarg/files/sarg-2.3.10-config.patch | 94 ---------------------- net-analyzer/sarg/files/sarg-2.3.11-Werror.patch | 25 ------ .../sarg/files/sarg-2.3.11-configure.patch | 31 ------- net-analyzer/sarg/files/sarg-2.3.11-format.patch | 36 --------- 5 files changed, 190 deletions(-) delete mode 100644 net-analyzer/sarg/files/sarg-2.3.10-config.patch delete mode 100644 net-analyzer/sarg/files/sarg-2.3.11-Werror.patch delete mode 100644 net-analyzer/sarg/files/sarg-2.3.11-configure.patch delete mode 100644 net-analyzer/sarg/files/sarg-2.3.11-format.patch (limited to 'net-analyzer/sarg') diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index c876c47db808..d91d424067ab 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,7 +1,3 @@ -AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda -AUX sarg-2.3.11-Werror.patch 1012 BLAKE2B f3e9b66c95fe905817c2ceecc52e863c4c0eb9c09d96a525c7876a5f807160421f694b95a02f8f1d62e1292102218c6a1fecf3ed1dedd8f0c7b6b9293322c034 SHA512 e74013c3bc22248ba08656b8751ca6177aeb070ce06661279ee3208ffa62dac8014fed0d6e35b65627ce6f02e70ed662b41dccf21dae8ff2b4e5902cc141e358 -AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4 -AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7 AUX sarg-2.4.0-config.patch 2417 BLAKE2B 7c5f0ddea35dd77acf38431f17427c5be7d4880bcaa230c3570a5d39f8910943f94df9f6f257ba4185add2cad8795ed481371ebaa259de5b60937a569fc732d5 SHA512 8b3ee4d986a200a9ba47435bb21b08c860a7af3543f7ba88064e63b89b0dde7da40d397c57789e411c1a2be55082e8832882236ba45ecc71821df0ea8618e623 AUX sarg-2.4.0-configure.patch 1497 BLAKE2B 2cd26287e2a5b3cbd641ead5953fb499c542ac3d1c149149261bafbc51c8bbed454dbdecfe2009d54e3ed9c7532de136396e71b8353e55cf9c98638f1157438e SHA512 c6031d8c0034dea88fc83b3171cd0d221e6a421c7806b0af3cb3a80e2c73dc92e273793f7420e4f30490911bbcc13368c0fa1cd328b972ff3eb63ae7b652cf0c AUX sarg-2.4.0-fabs.patch 245 BLAKE2B be45ebf17fe6d7588fa7bd8d94da305347f7f017b61875ffc3249ac1a2788ddbee7e09fc855328e0da961866375b43f5a25c2421462b95fcb8265653c3fd2803 SHA512 9fd403ea0ddc411b99645f27e4b0209d9609355735601aa225621fce74270ebaae0e5569ae111bfba88fbd97cb41099f6eaf14047d09f2ceaac25dd85b6b134b diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch deleted file mode 100644 index cfbf103d5b2a..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.10-config.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/log.c -+++ b/log.c -@@ -241,7 +241,7 @@ - strcpy(LogoTextColor,"#006699"); - strcpy(FontSize,"9px"); - strcpy(TempDir,"/tmp"); -- strcpy(OutputDir,"/var/www/html/squid-reports"); -+ strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports"); - AnonymousOutputFiles=false; - Ip2Name=false; - strcpy(DateFormat,"u"); ---- a/sarg-php/sarg-squidguard-block.php -+++ b/sarg-php/sarg-squidguard-block.php -@@ -26,8 +26,8 @@ - */ - - // Change to squidGuard and sarg config file paths --$SargConf = "/usr/local/sarg/sarg.conf"; --$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf"; -+$SargConf = "/etc/sarg/sarg.conf"; -+$squidGuardConf = "/etc/squidGuard/squidGuard.conf"; - - global $SargConf; - global $dbhome; -@@ -37,7 +37,7 @@ - include_once("style.php"); - - $url = $_GET['url']; --$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf'; -+$squidGuard_conf = '/etc/squidGuard/squidGuard.conf'; - - function parse_config($line,$clave) { - if (preg_match("/dbhome/i", $line)) { ---- a/sarg-php/sarg-block-it.php -+++ b/sarg-php/sarg-block-it.php -@@ -25,7 +25,7 @@ - * - */ - --$filename = "/usr/local/squid/etc/block.txt"; -+$filename = "/etc/squid/etc/block.txt"; - - $url = $_GET['url']; - $url = $url."\n"; ---- a/htaccess -+++ b/htaccess -@@ -1,4 +1,4 @@ --AuthUserFile /usr/local/sarg/passwd -+AuthUserFile /etc/sarg/passwd - AuthName "SARG, Squid Analysis Report Generator" - AuthType Basic - ---- a/sarg.conf -+++ b/sarg.conf -@@ -4,7 +4,7 @@ - # Where is the access.log file - # sarg -l file - # --#access_log /usr/local/squid/var/logs/access.log -+#access_log /var/log/squid/access.log - - # TAG: graphs yes|no - # Use graphics where is possible. -@@ -117,7 +117,7 @@ - # The reports will be saved in that directory - # sarg -o dir - # --#output_dir /var/www/html/squid-reports -+#output_dir /var/www/localhost/htdocs/squid-reports - - # TAG: anonymous_output_files yes/no - # Use anonymous file and directory names in the report. If it is set to -@@ -545,7 +545,7 @@ - # Generate reports from SquidGuard logs. - # Use 'none' to disable. - # You can use sarg -L filename to use an alternate squidGuard log. --# squidguard_conf /usr/local/squidGuard/squidGuard.conf -+# squidguard_conf /etc/squidGuard/squidGuard.conf - # - #squidguard_conf none - ---- a/user_limit_block -+++ b/user_limit_block -@@ -24,8 +24,8 @@ - # - # - --conf="/usr/local/sarg/sarg.conf" --squid_password_file="/usr/local/squid/etc/passwd" -+conf="/etc/sarg/sarg.conf" -+squid_password_file="/etc/squid/passwd" - tmp="/tmp/sarg_limit.$$" - - limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'` diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch deleted file mode 100644 index 035578793934..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -46,18 +46,18 @@ - CFLAGS="${saved_CFLAGS}" - fi - --AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC]) -+AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC]) - saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Werror=implicit-function-declaration" -+CFLAGS="${CFLAGS} -Wimplicit-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]) -+AC_MSG_CHECKING([for format warning flag in $CC]) - saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Werror=format" -+CFLAGS="${CFLAGS} -Wformat" - 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 diff --git a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch deleted file mode 100644 index 583bfeb0e8e1..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2,6 +2,7 @@ - AC_INIT([sarg],[2.3.9]) - AC_CONFIG_SRCDIR([log.c]) - AC_CONFIG_AUX_DIR(cfgaux) -+AC_CONFIG_MACRO_DIR(m4) - - AC_CANONICAL_HOST - -@@ -26,6 +27,11 @@ - dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7) - AC_PROG_CC_C99 - -+dnl mkdir_p / MKDIR_P -+AC_PROG_MKDIR_P -+mkdir_p="$MKDIR_P" -+AC_SUBST(mkdir_p) -+ - # Report more warnings to improve code quality. - CFLAGS="${CFLAGS} -Wall -Wno-sign-compare" - -@@ -60,7 +66,7 @@ - - case "$host" in - *-solaris*) -- LDFLAGS="${LDFLAGS} -lsocket -lnsl" -+ LIBS="${LIBS} -lsocket -lnsl" - CFLAGS="-DSOLARIS ${CFLAGS}" - ;; - esac diff --git a/net-analyzer/sarg/files/sarg-2.3.11-format.patch b/net-analyzer/sarg/files/sarg-2.3.11-format.patch deleted file mode 100644 index f2dc7d39b1e8..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.11-format.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/report.c -+++ b/report.c -@@ -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]; ---- a/index.c -+++ b/index.c -@@ -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; ---- a/userinfo.c -+++ b/userinfo.c -@@ -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) { -- cgit v1.2.3