# HG changeset patch # User Dirk Olmes # Date 1618214177 -7200 # Node ID 00475271dd1e98912499098336a7d7122adb2ca0 # Parent cbab6d6182f17175bffda93bc50ca664b5198a51 Unbenutzte Pakete entfernen diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/Manifest --- a/net-proxy/squid/Manifest Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -AUX squid-3.1.15-gentoo.patch 10538 RMD160 f4ac679e89bdd8d43a2cd00b1a63d555a25b9528 SHA1 63b2c8a1767019b35b75403dd9a7bf6b33c69edc SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 -AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec -AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f -AUX squid.initd 3331 RMD160 90579b249baaf727fad9f6ceaaf8b2a1e5f1e97f SHA1 0b6f4e10d758619101f0ea56b5146dc268b8b3e0 SHA256 7a81926479941054358bce650c8c9d3f070a7b40c886e5ed3a337668997bc0ab -AUX squid.initd-logrotate 3163 RMD160 b7d58517e4198ceb7416c00004c91ac30a241bfb SHA1 714d51e0c449817c12e7230942f89c1a62012107 SHA256 b403b7ffebc08c2ce76cd2b8b6c53a639f24e3e35933ba9766aa4623a34a1279 -AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 -AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f -DIST squid-3.1.18.tar.gz 3401300 RMD160 27bc3f868aa9d08bad7d44d23bc9c156007bf161 SHA1 6ae3a7d75acea94e8af333a7086d6467416ff5ac SHA256 6a7122514d58c3077f2b43c928864be10753d8e2c8439133dacc9eba6c45e00d -EBUILD squid-3.1.18.ebuild 6629 RMD160 d759605f7c281d2649ee95c16ee38c26e274f7a1 SHA1 e09b67d54d7889b8d72dcaada878054ab79a3514 SHA256 2bc745da81ed998762d82deaae18addd6fb8011b44425860b89e721b1d2e6b21 -MISC metadata.xml 1015 RMD160 03ac3fffc7b01e366b173a4c3bf1dc6be1bb9202 SHA1 3c1681981e2a143ee50d0ee5bc901ac81e7c5cc4 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid-3.1.15-gentoo.patch --- a/net-proxy/squid/files/squid-3.1.15-gentoo.patch Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,289 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 23922c0..f359a00 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,9 +16,9 @@ PRESET_CFLAGS="$CFLAGS" - PRESET_LDFLAGS="$LDFLAGS" - - dnl Set default LDFLAGS --if test -z "$LDFLAGS"; then -- LDFLAGS="-g" --fi -+dnl if test -z "$LDFLAGS"; then -+dnl LDFLAGS="-g" -+dnl fi - - dnl Check for GNU cc - AC_PROG_CC -diff --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c -index e04365e..7241b3f 100644 ---- a/helpers/basic_auth/MSNT/confload.c -+++ b/helpers/basic_auth/MSNT/confload.c -@@ -27,7 +27,7 @@ - - /* Path to configuration file */ - #ifndef SYSCONFDIR --#define SYSCONFDIR "/usr/local/squid/etc" -+#define SYSCONFDIR "/etc/squid" - #endif - #define CONFIGFILE SYSCONFDIR "/msntauth.conf" - -diff --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default -index 323bc1c..c3d7d21 100644 ---- a/helpers/basic_auth/MSNT/msntauth.conf.default -+++ b/helpers/basic_auth/MSNT/msntauth.conf.default -@@ -8,6 +8,6 @@ server my_PDC my_BDC my_NTdomain - server other_PDC other_BDC otherdomain - - # Denied and allowed users. Comment these if not needed. --#denyusers /usr/local/squid/etc/msntauth.denyusers --#allowusers /usr/local/squid/etc/msntauth.allowusers -+#denyusers /etc/squid/msntauth.denyusers -+#allowusers /etc/squid/msntauth.allowusers - -diff --git a/helpers/basic_auth/SMB/smb_auth.sh b/helpers/basic_auth/SMB/smb_auth.sh -index 2a1abb3..b3ebb7a 100755 ---- a/helpers/basic_auth/SMB/smb_auth.sh -+++ b/helpers/basic_auth/SMB/smb_auth.sh -@@ -24,7 +24,7 @@ read NMBCAST - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ else - addropt="" - fi - echo "Query address options: $addropt" --dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff --git a/helpers/external_acl/session/squid_session.8 b/helpers/external_acl/session/squid_session.8 -index 7808f41..d86e320 100644 ---- a/helpers/external_acl/session/squid_session.8 -+++ b/helpers/external_acl/session/squid_session.8 -@@ -35,7 +35,7 @@ the first request. - .P - Configuration example using the default automatic mode - .IP --external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session -+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session - .IP - acl session external session - .IP -diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8 -index 72aa1a3..cde5f20 100644 ---- a/helpers/external_acl/unix_group/squid_unix_group.8 -+++ b/helpers/external_acl/unix_group/squid_unix_group.8 -@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated) - This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 - matches users in group2 or group3 - .IP --external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p -+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p - .IP - acl usergroup1 external unix_group group1 - .IP -diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -index e78f61e..ca6c0c2 100644 ---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac -+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -@@ -17,6 +17,7 @@ dnl Process this file with autoconf to produce a configure script. - - AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com]) - AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) -+AM_MAINTAINER_MODE - AC_CONFIG_SRCDIR([squid_kerb_auth.c]) - - AC_PROG_CC -diff --git a/src/Makefile.am b/src/Makefile.am -index e1c0be4..423553e 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -639,7 +639,6 @@ BUILT_SOURCES = \ - - sysconf_DATA = \ - squid.conf.default \ -- squid.conf.documented \ - mime.conf.default - - data_DATA = \ -@@ -724,9 +724,9 @@ - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log - DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) --DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache --DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db -+DEFAULT_NETDB_FILE = $(localstatedir)/run//netdb.state -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid -+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` -@@ -802,13 +801,11 @@ install-data-local: install-sysconfDATA install-dataDATA - @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ - echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ - else \ -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ -+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ - fi -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ -- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ -- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ -+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ -+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \ - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \ - $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)` -diff --git a/src/cf.data.pre b/src/cf.data.pre -index b504918..56928c4 100644 ---- a/src/cf.data.pre -+++ b/src/cf.data.pre -@@ -768,6 +768,7 @@ acl Safe_ports port 280 # http-mgmt - acl Safe_ports port 488 # gss-http - acl Safe_ports port 591 # filemaker - acl Safe_ports port 777 # multiling http -+acl Safe_ports port 901 # SWAT - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -917,6 +918,9 @@ http_access deny CONNECT !SSL_ports - http_access allow localnet - http_access allow localhost - -+# Allow the localhost to have access by default -+http_access allow localhost -+ - # And finally deny all other access to this proxy - http_access deny all - NOCOMMENT_END -@@ -4138,11 +4142,11 @@ COMMENT_END - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster." -+ mail if the cache dies. The default is "root." - DOC_END - - NAME: mail_from -@@ -6456,7 +6460,7 @@ DOC_END - NAME: forwarded_for - COMMENT: on|off|transparent|truncate|delete - TYPE: string --DEFAULT: on -+DEFAULT: delete - LOC: opt_forwarded_for - DOC_START - If set to "on", Squid will append your client's IP address -diff --git a/src/debug.cc b/src/debug.cc -index 32813bf..6de334a 100644 ---- a/src/debug.cc -+++ b/src/debug.cc -@@ -452,7 +452,7 @@ _db_init(const char *logfile, const char *options) - #if HAVE_SYSLOG && defined(LOG_LOCAL4) - - if (Debug::log_syslog) -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); - - #endif /* HAVE_SYSLOG */ - -diff --git a/src/main.cc b/src/main.cc -index 941126d..71f3c3b 100644 ---- a/src/main.cc -+++ b/src/main.cc -@@ -1555,7 +1555,7 @@ watch_child(char *argv[]) - if (*(argv[0]) == '(') - return; - -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); - - if ((pid = fork()) < 0) - syslog(LOG_ALERT, "fork failed: %s", xstrerror()); -@@ -1599,7 +1599,7 @@ watch_child(char *argv[]) - - if ((pid = fork()) == 0) { - /* child */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); - prog = xstrdup(argv[0]); - argv[0] = xstrdup("(squid)"); - execvp(prog, argv); -@@ -1607,7 +1607,7 @@ watch_child(char *argv[]) - } - - /* parent */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); - - syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); - -commit e3f6cc6438869766751556f2d9747669b4c51fe1 -Author: Eray Aslan -Date: Fri Apr 29 10:55:17 2011 +0000 - - Do not auto detect kerberos. - - No need for automagic dependencies. We already give the necessary flags - to the configure script. - -diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -index e78f61e..dc739b2 100644 ---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac -+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -@@ -279,40 +279,6 @@ AC_ARG_ENABLE(seam-64, - check_seam_64 - fi ]) - --dnl Define system default --if test "$enable_arg" = "no"; then -- dnl Autodetect system -- dnl Check krb5-config first -- AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no) -- case $sys in -- Linux) rpm -q heimdal-lib >/dev/null 2>&1 -- if test $? = 0 ; then -- check_heimdal -- else -- check_mit -- fi -- ;; -- AIX) lslpp -L krb5.client.rte >/dev/null 2>&1 -- if test $? = 0 ; then -- check_nas -- else -- check_mit -- fi -- ;; -- SunOS) pkginfo SUNWgss >/dev/null 2>&1 -- if test $? = 0 ; then -- check_seam -- else -- check_mit -- fi -- ;; -- FreeBSD) check_heimdal -- ;; -- *) check_mit -- ;; -- esac --fi -- - AC_C_BIGENDIAN - - AC_CHECK_HEADERS( \ diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid.confd --- a/net-proxy/squid/files/squid.confd Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.3 2009/10/25 08:35:46 mrness Exp $ - -# Config file for /etc/init.d/squid - -SQUID_OPTS="-YC" - -# Max. number of filedescriptors to use. You can increase this on a busy -# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024. -SQUID_MAXFD=1024 - -# Kerberos keytab file to use. This is required if you enable kerberos authentication. -SQUID_KEYTAB="" diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid.cron --- a/net-proxy/squid/files/squid.cron Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -#!/bin/sh -if test -e /var/run/squid.pid ; then - test -n "$(cat /var/run/squid.pid|xargs ps -p|grep squid)" && \ - /usr/sbin/squid -k rotate -fi diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid.initd --- a/net-proxy/squid/files/squid.initd Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $ - -extra_started_commands="reload rotate" - -depend() { - use dns - need net -} - -upprocval() { - [ -f $1 ] || return 0 - if [ `cat $1` -lt $2 ]; then - echo $2 > $1 - fi -} - -# Try to increase the # of filedescriptors we can open. -maxfds() { - [ -n "$SQUID_MAXFD" ] || return - [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 - local minimal_file_max=$(($SQUID_MAXFD + 4096)) - upprocval /proc/sys/fs/file-max $minimal_file_max - if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then - upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max - fi - ulimit -n $SQUID_MAXFD -} - -checkconfig() { - if [ ! -f /etc/squid/${SVCNAME}.conf ]; then - eerror "You need to create /etc/squid/${SVCNAME}.conf first." - eerror "An example can be found in /etc/squid/squid.conf.default" - return 1 - fi - - local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) - [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid - if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then - eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" - eerror " /var/run/${SVCNAME}.pid" - eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" - eerror " in any other instance of squid." - return 1 - fi - - maxfds - - local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) - [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" - - local x - for x in $CACHE_SWAP ; do - if [ ! -e $x ] ; then - ebegin "Initializing cache directory ${x%/*}" - local ORIG_UMASK=$(umask) - umask 027 - - if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then - eend 1 - return 1 - fi - - local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" - if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then - umask $ORIG_UMASK - eend 1 - echo "$INIT_CACHE_RESPONSE" - return 1 - fi - - umask $ORIG_UMASK - eend 0 - break - fi - done - - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf - eend $? && sleep 1 -} - -stop() { - ebegin "Stopping ${SVCNAME}" - if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then - # Now we have to wait until squid has _really_ stopped. - sleep 1 - if [ -f /var/run/${SVCNAME}.pid ] ; then - einfon "Waiting for squid to shutdown ." - cnt=0 - while [ -f /var/run/${SVCNAME}.pid ] ; do - cnt=$(expr $cnt + 1) - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - break - fi - sleep 2 - echo -n "." - done - echo - fi - else - eerror "Squid shutdown failed, probably service is already down." - fi - eend 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf - eend $? -} - -rotate() { - service_started ${SVCNAME} || return 1 - ebegin "Rotating ${SVCNAME} logs" - /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf - eend $? -} diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid.initd-logrotate --- a/net-proxy/squid/files/squid.initd-logrotate Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.11 2009/11/28 12:32:58 mrness Exp $ - -opts="${opts} reload" - -depend() { - use dns - need net -} - -upprocval() { - [ -f $1 ] || return 0 - if [ `cat $1` -lt $2 ]; then - echo $2 > $1 - fi -} - -# Try to increase the # of filedescriptors we can open. -maxfds() { - [ -n "$SQUID_MAXFD" ] || return - [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 - local minimal_file_max=$(($SQUID_MAXFD + 4096)) - upprocval /proc/sys/fs/file-max $minimal_file_max - if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then - upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max - fi - ulimit -n $SQUID_MAXFD -} - -checkconfig() { - if [ ! -f /etc/squid/${SVCNAME}.conf ]; then - eerror "You need to create /etc/squid/${SVCNAME}.conf first." - eerror "An example can be found in /etc/squid/squid.conf.default" - return 1 - fi - - local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) - [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid - if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then - eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" - eerror " /var/run/${SVCNAME}.pid" - eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" - eerror " in any other instance of squid." - return 1 - fi - - maxfds - - local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) - [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" - - local x - for x in $CACHE_SWAP ; do - if [ ! -e $x ] ; then - ebegin "Initializing cache directory ${x%/*}" - local ORIG_UMASK=$(umask) - umask 027 - - if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then - eend 1 - return 1 - fi - - local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" - if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then - umask $ORIG_UMASK - eend 1 - echo "$INIT_CACHE_RESPONSE" - return 1 - fi - - umask $ORIG_UMASK - eend 0 - break - fi - done - - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf - eend $? && sleep 1 -} - -stop() { - ebegin "Stopping ${SVCNAME}" - if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then - # Now we have to wait until squid has _really_ stopped. - sleep 1 - if [ -f /var/run/${SVCNAME}.pid ] ; then - einfon "Waiting for squid to shutdown ." - cnt=0 - while [ -f /var/run/${SVCNAME}.pid ] ; do - cnt=$(expr $cnt + 1) - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - break - fi - sleep 2 - echo -n "." - done - echo - fi - else - eerror "Squid shutdown failed, probably service is already down." - fi - eend 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf - eend $? -} diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid.logrotate --- a/net-proxy/squid/files/squid.logrotate Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -/var/log/squid/*.log { - copytruncate - compress - notifempty - missingok - sharedscripts -} - diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/files/squid.pam --- a/net-proxy/squid/files/squid.pam Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#%PAM-1.0 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.3 2007/09/23 09:23:41 mrness Exp $ -auth required pam_nologin.so -auth include system-auth -account include system-auth -password include system-auth -session optional pam_limits.so -session include system-auth diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/metadata.xml --- a/net-proxy/squid/metadata.xml Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -net-proxy -A full-featured web proxy cache - - Enables Linux epoll() support - Adds support for loadable content adaptation modules - (http://www.e-cap.org) - Adds ICAP client support - Adds transparent proxy support for systems - using IP-Filter (only for *bsd) - Use app-admin/logrotate for rotating - logs - Enables *BSD kqueue() support - Adds transparent proxy support for systems using - PF (only for *bsd) - Enables real Transparent Proxy support for Linux Netfilter - TPROXY - Add Zero Penalty Hit patch - (http://zph.bratcheda.org) - - diff -r cbab6d6182f1 -r 00475271dd1e net-proxy/squid/squid-3.1.18.ebuild --- a/net-proxy/squid/squid-3.1.18.ebuild Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,209 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.16.ebuild,v 1.7 2011/12/18 20:54:49 halcy0n Exp $ - -EAPI=4 - -inherit eutils pam toolchain-funcs autotools linux-info - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap icap-client \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll tproxy" - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - sys-apps/ed - test? ( dev-util/cppunit )" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -REQUIRED_USE="tproxy? ( caps )" - -pkg_pretend() { - if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then - eerror "coss store IO has been disabled by upstream due to stability issues!" - eerror "If you want to install this version, switch the store type to something else" - eerror "before attempting to install this version again." - - die "/etc/squid/squid.conf: cache_dir uses a disabled store type" - fi - - if use tproxy; then - echo - elog "Checking kernel configuration for full Tproxy4 support" - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" - linux-info_pkg_setup - echo - fi -} - -pkg_setup() { - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.15-gentoo.patch - eautoreconf -} - -src_configure() { - local myconf="" - - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - use radius && basic_modules="squid_radius_auth,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local digest_modules="password" - use ldap && digest_modules="ldap,${digest_modules}" - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" - - local negotiate_helpers= - if use kerberos; then - negotiate_helpers="squid_kerb_auth" - if has_version app-crypt/mit-krb5; then - myconf="--enable-mit --disable-heimdal" - elif has_version app-crypt/heimdal; then - myconf="--disable-mit --enable-heimdal" - fi - else - myconf="--disable-mit --disable-heimdal" - fi - - # coss support has been disabled - # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) - myconf="${myconf} --enable-storeio=ufs,diskd,aufs" - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter \ - $(use_enable tproxy linux-tproxy) \ - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --with-pidfile=/var/run/squid.pid \ - --datadir=/usr/share/squid \ - --with-logdir=/var/log/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="${digest_modules}" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - --disable-strict-error-checking \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(use_enable ecap) \ - $(use_enable zero-penalty-hit zph-qos) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - if use pam; then - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/pam_auth - fi - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - elog "Squid authentication helpers have been installed suid root." - elog "This allows shadow based authentication (see bug #52977 for more)." - echo - elog "Be careful what type of cache_dir you select!" - elog " 'diskd' is optimized for high levels of traffic, but it might seem slow" - elog "when there isn't sufficient traffic to keep squid reasonably busy." - elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'." -} diff -r cbab6d6182f1 -r 00475271dd1e sys-auth/otpw/Manifest --- a/sys-auth/otpw/Manifest Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -DIST otpw-1.5.tar.gz 45725 BLAKE2B 9066c80909134d92ed6a067c8eb99897c63b288aaf50f6db0a86a6c59fd31c3cd13c78643ebfca724ac1a07a3b22caa43d84c057872d76df61502b59a68bd886 SHA512 bf547359ef28acac8e41eb4a83f1a4e28d6855bfb62cff75ff90169df71144e41f7ac3846bdfae8db6eec2ab1bf51c0c4e9b8016cbc3f99fc76697c59119c504 -EBUILD otpw-1.5.ebuild 1270 BLAKE2B 8949a31ecf45c2a93b491d15dea878f4b56fca4e89e0d57adf3c9959b5de1db84a0f9ce16b66ff8e6c054a66a91e917bba731420a3b649e174bb0238f37181b2 SHA512 406e87f84c1b677d2e13143da0a0a004505443c4f69f2904591c2b8819b9f744efc00cd63dbbde2c744e2a92de2494ca3858ff3f0943a85f2461f37f14bf77c7 diff -r cbab6d6182f1 -r 00475271dd1e sys-auth/otpw/otpw-1.5.ebuild --- a/sys-auth/otpw/otpw-1.5.ebuild Mon Feb 01 07:37:59 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils pam - -DESCRIPTION="Generator and PAM module for one-time password lists with a user-defined static password prefix." -HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/otpw.html" -SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="pam" - -RDEPEND="pam? ( sys-libs/pam )" - -DEPEND="${RDEPEND}" - -pkg_setup() { - if [ ! -c /dev/urandom ]; then - die "/dev/urandom is missing or faulty, fix this and try again!" - fi -} - -src_compile() { - sed -i "s/CC\s*=.*/CC = $(tc-getCC)/" "${S}"/Makefile - #sed -i "s/CFLAGS\s*=.*/CFLAGS = -fPIC ${CFLAGS} \$(DFLAGS)/" "${S}"/Makefile # TODO: -fPIC should become obsolete in the next version - emake otpw-gen || die "emake otpw-gen failed" - emake demologin || die "emake demologin failed" - if use pam; then - emake pam_otpw.so || die "emake pam_otpw.so failed" - fi -} - -src_install() { - mv "${S}"/demologin "${S}"/otpw-demologin - dobin otpw-gen || "installing otpw-gen failed" - dobin otpw-demologin || "installing otpw-demologin failed" - if use pam; then - dopammod pam_otpw.so || "installing pam_otpw.so failed" - fi - doman otpw-gen.1 - doman pam_otpw.8 -}