summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-06-21 09:45:19 +0200
committerConrad Kostecki <conikost@gentoo.org>2020-06-25 09:30:41 +0200
commit2e6eafb5f2a41bf7a38dd273398bd9c06a6d31df (patch)
treeb6fd884e30e1983a2555b4b268ceb0ff3fd3b797 /net-analyzer/sarg
parentnet-misc/bird: remove unused patches (diff)
downloadgentoo-2e6eafb5f2a41bf7a38dd273398bd9c06a6d31df.tar.gz
gentoo-2e6eafb5f2a41bf7a38dd273398bd9c06a6d31df.tar.bz2
gentoo-2e6eafb5f2a41bf7a38dd273398bd9c06a6d31df.zip
net-analyzer/sarg: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/16358 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'net-analyzer/sarg')
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.10-config.patch94
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.11-Werror.patch25
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.11-configure.patch31
-rw-r--r--net-analyzer/sarg/files/sarg-2.3.11-format.patch36
4 files changed, 0 insertions, 186 deletions
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 cfbf103d5b2..00000000000
--- 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
- <Limit GET POST>
---- 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 03557879393..00000000000
--- 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 583bfeb0e8e..00000000000
--- 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 f2dc7d39b1e..00000000000
--- 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) {