diff options
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/ChangeLog | 12 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-2.7.2-gentoo.patch | 307 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.5-gentoo.patch | 210 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.6-lincapver.patch | 21 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.8-adapted-zph.patch (renamed from net-proxy/squid/files/squid-3.0.6-adapted-zph.patch) | 36 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.8-gentoo.patch (renamed from net-proxy/squid/files/squid-3.0.6-gentoo.patch) | 92 | ||||
| -rw-r--r-- | net-proxy/squid/squid-2.7.2.ebuild | 186 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.0.5.ebuild | 177 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.0.6-r1.ebuild | 178 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.0.8.ebuild (renamed from net-proxy/squid/squid-3.0.6-r2.ebuild) | 3 |
10 files changed, 76 insertions, 1146 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 70c6bc1b36f9..2239a05121c6 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-proxy/squid # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.192 2008/06/26 19:32:15 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.193 2008/08/01 22:13:41 mrness Exp $ + +*squid-3.0.8 (01 Aug 2008) + + 01 Aug 2008; Alin Năstac <mrness@gentoo.org> + -files/squid-2.7.2-gentoo.patch, -files/squid-3.0.5-gentoo.patch, + -files/squid-3.0.6-adapted-zph.patch, -files/squid-3.0.6-gentoo.patch, + -files/squid-3.0.6-lincapver.patch, +files/squid-3.0.8-adapted-zph.patch, + +files/squid-3.0.8-gentoo.patch, -squid-2.7.2.ebuild, -squid-3.0.5.ebuild, + -squid-3.0.6-r1.ebuild, -squid-3.0.6-r2.ebuild, +squid-3.0.8.ebuild: + Remove obsolete test versions. Version bump (#233001). *squid-3.0.7 (26 Jun 2008) *squid-2.7.3 (26 Jun 2008) diff --git a/net-proxy/squid/files/squid-2.7.2-gentoo.patch b/net-proxy/squid/files/squid-2.7.2-gentoo.patch deleted file mode 100644 index c65cd3390128..000000000000 --- a/net-proxy/squid/files/squid-2.7.2-gentoo.patch +++ /dev/null @@ -1,307 +0,0 @@ -diff -Nru squid-2.7.STABLE2.orig/configure.in squid-2.7.STABLE2/configure.in ---- squid-2.7.STABLE2.orig/configure.in 2008-05-31 23:25:30.000000000 +0200 -+++ squid-2.7.STABLE2/configure.in 2008-06-22 13:12:38.000000000 +0200 -@@ -18,9 +18,9 @@ - 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 -Nru squid-2.7.STABLE2.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE2/helpers/basic_auth/MSNT/confload.c ---- squid-2.7.STABLE2.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 21:09:48.000000000 +0200 -+++ squid-2.7.STABLE2/helpers/basic_auth/MSNT/confload.c 2008-06-22 13:13:09.000000000 +0200 -@@ -24,7 +24,7 @@ - - /* Path to configuration file */ - #ifndef SYSCONFDIR --#define SYSCONFDIR "/usr/local/squid/etc" -+#define SYSCONFDIR "/etc/squid" - #endif - #define CONFIGFILE SYSCONFDIR "/msntauth.conf" - -diff -Nru squid-2.7.STABLE2.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE2/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-2.7.STABLE2.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 20:44:28.000000000 +0200 -+++ squid-2.7.STABLE2/helpers/basic_auth/MSNT/msntauth.conf.default 2008-06-22 13:13:09.000000000 +0200 -@@ -8,6 +8,6 @@ - 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 -Nru squid-2.7.STABLE2.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.am ---- squid-2.7.STABLE2.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 18:56:26.000000000 +0200 -+++ squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.am 2008-06-22 13:13:09.000000000 +0200 -@@ -14,7 +14,7 @@ - ## FIXME: autoconf should test for the samba path. - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX=/usr/local/samba -+SAMBAPREFIX=/usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -Nru squid-2.7.STABLE2.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE2/helpers/basic_auth/SMB/smb_auth.sh ---- squid-2.7.STABLE2.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 00:36:46.000000000 +0100 -+++ squid-2.7.STABLE2/helpers/basic_auth/SMB/smb_auth.sh 2008-06-22 13:13:09.000000000 +0200 -@@ -24,7 +24,7 @@ - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ - addropt="" - fi - echo "Query address options: $addropt" --dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff -Nru squid-2.7.STABLE2.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE2/helpers/external_acl/session/squid_session.8 ---- squid-2.7.STABLE2.orig/helpers/external_acl/session/squid_session.8 2007-01-06 18:28:35.000000000 +0100 -+++ squid-2.7.STABLE2/helpers/external_acl/session/squid_session.8 2008-06-22 13:13:09.000000000 +0200 -@@ -35,7 +35,7 @@ - .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 -Nru squid-2.7.STABLE2.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE2/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-2.7.STABLE2.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 17:07:24.000000000 +0200 -+++ squid-2.7.STABLE2/helpers/external_acl/unix_group/squid_unix_group.8 2008-06-22 13:13:09.000000000 +0200 -@@ -27,7 +27,7 @@ - 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 -Nru squid-2.7.STABLE2.orig/src/access_log.c squid-2.7.STABLE2/src/access_log.c ---- squid-2.7.STABLE2.orig/src/access_log.c 2008-03-18 03:48:43.000000000 +0100 -+++ squid-2.7.STABLE2/src/access_log.c 2008-06-22 13:13:09.000000000 +0200 -@@ -1261,7 +1261,7 @@ - LogfileStatus = LOG_ENABLE; - } - #if HEADERS_LOG -- headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0); -+ headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0); - assert(NULL != headerslog); - #endif - #if FORW_VIA_DB -diff -Nru squid-2.7.STABLE2.orig/src/cf.data.pre squid-2.7.STABLE2/src/cf.data.pre ---- squid-2.7.STABLE2.orig/src/cf.data.pre 2008-05-31 22:49:45.000000000 +0200 -+++ squid-2.7.STABLE2/src/cf.data.pre 2008-06-22 13:13:09.000000000 +0200 -@@ -674,6 +674,8 @@ - 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 purge method PURGE - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -707,6 +709,9 @@ - # Only allow cachemgr access from localhost - http_access allow manager localhost - http_access deny manager -+# Only allow purge requests from localhost -+http_access allow purge localhost -+http_access deny purge - # Deny requests to unknown ports - http_access deny !Safe_ports - # Deny CONNECT to other than SSL ports -@@ -724,6 +729,9 @@ - # from where browsing should be allowed - http_access allow localnet - -+# 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 -@@ -3716,11 +3724,11 @@ - - 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 -@@ -3749,12 +3757,12 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: squid - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real - UID/GID to the user specified below. The default is to change -- to UID to nobody. If you define cache_effective_user, but not -+ to UID to squid. If you define cache_effective_user, but not - cache_effective_group, Squid sets the GID to the effective - user's default group ID (taken from the password file) and - supplementary group list from the from groups membership of -@@ -4391,12 +4399,12 @@ - NAME: snmp_port - TYPE: ushort - LOC: Config.Port.snmp --DEFAULT: 3401 -+DEFAULT: 0 - IFDEF: SQUID_SNMP - DOC_START - Squid can now serve statistics and status information via SNMP. -- By default it listens to port 3401 on the machine. If you don't -- wish to use SNMP, set this to "0". -+ By default snmp_port is disabled. If you wish to use SNMP, -+ set this to "3401" (or any other number you like). - DOC_END - - NAME: snmp_access -@@ -4467,12 +4475,12 @@ - NAME: htcp_port - IFDEF: USE_HTCP - TYPE: ushort --DEFAULT: 4827 -+DEFAULT: 0 - LOC: Config.Port.htcp - DOC_START - The port number where Squid sends and receives HTCP queries to -- and from neighbor caches. Default is 4827. To disable use -- "0". -+ and from neighbor caches. To turn it on you want to set it to -+ 4827. By default it is set to "0" (disabled). - DOC_END - - NAME: log_icp_queries -@@ -5369,6 +5377,9 @@ - If you disable this, it will appear as - - X-Forwarded-For: unknown -+NOCOMMENT_START -+forwarded_for off -+NOCOMMENT_END - DOC_END - - NAME: cachemgr_passwd -diff -Nru squid-2.7.STABLE2.orig/src/client_side.c squid-2.7.STABLE2/src/client_side.c ---- squid-2.7.STABLE2.orig/src/client_side.c 2008-05-27 14:49:39.000000000 +0200 -+++ squid-2.7.STABLE2/src/client_side.c 2008-06-22 13:13:09.000000000 +0200 -@@ -4661,14 +4661,7 @@ - debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port); - } else { - if (do_debug(83, 4)) { -- /* Write out the SSL session details.. actually the call below, but -- * OpenSSL headers do strange typecasts confusing GCC.. */ -- /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */ --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L -- PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); --#else - PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); --#endif - /* Note: This does not automatically fflush the log file.. */ - } - debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port); -diff -Nru squid-2.7.STABLE2.orig/src/defines.h squid-2.7.STABLE2/src/defines.h ---- squid-2.7.STABLE2.orig/src/defines.h 2007-09-24 15:31:19.000000000 +0200 -+++ squid-2.7.STABLE2/src/defines.h 2008-06-22 13:13:09.000000000 +0200 -@@ -259,7 +259,7 @@ - - /* were to look for errors if config path fails */ - #ifndef DEFAULT_SQUID_ERROR_DIR --#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" -+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English" - #endif - - /* gb_type operations */ -diff -Nru squid-2.7.STABLE2.orig/src/main.c squid-2.7.STABLE2/src/main.c ---- squid-2.7.STABLE2.orig/src/main.c 2008-05-27 01:14:30.000000000 +0200 -+++ squid-2.7.STABLE2/src/main.c 2008-06-22 13:13:09.000000000 +0200 -@@ -376,6 +376,22 @@ - asnFreeMemory(); - } - -+#if USE_UNLINKD -+static int -+needUnlinkd(void) -+{ -+ int i; -+ int r = 0; -+ for (i = 0; i < Config.cacheSwap.n_configured; i++) { -+ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) -+ r++; -+ } -+ return r; -+} -+#endif -+ - static void - mainReconfigure(void) - { -@@ -613,7 +629,7 @@ - - if (!configured_once) { - #if USE_UNLINKD -- unlinkdInit(); -+ if (needUnlinkd()) unlinkdInit(); - #endif - urlInitialize(); - cachemgrInit(); -@@ -636,6 +652,9 @@ - #if USE_WCCPv2 - wccp2Init(); - #endif -+#if USE_UNLINKD -+ if (needUnlinkd()) unlinkdInit(); -+#endif - serverConnectionsOpen(); - neighbors_init(); - if (Config.chroot_dir) -diff -Nru squid-2.7.STABLE2.orig/src/Makefile.am squid-2.7.STABLE2/src/Makefile.am ---- squid-2.7.STABLE2.orig/src/Makefile.am 2008-01-02 16:50:39.000000000 +0100 -+++ squid-2.7.STABLE2/src/Makefile.am 2008-06-22 13:13:51.000000000 +0200 -@@ -340,13 +340,13 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid - DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/net-proxy/squid/files/squid-3.0.5-gentoo.patch b/net-proxy/squid/files/squid-3.0.5-gentoo.patch deleted file mode 100644 index e13422042960..000000000000 --- a/net-proxy/squid/files/squid-3.0.5-gentoo.patch +++ /dev/null @@ -1,210 +0,0 @@ -diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE5/helpers/basic_auth/MSNT/confload.c ---- squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/confload.c 2008-04-29 06:43:27.000000000 +0300 -+++ squid-3.0.STABLE5/helpers/basic_auth/MSNT/confload.c 2008-05-15 00:29:57.000000000 +0300 -@@ -24,7 +24,7 @@ - - /* Path to configuration file */ - #ifndef SYSCONFDIR --#define SYSCONFDIR "/usr/local/squid/etc" -+#define SYSCONFDIR "/etc/squid" - #endif - #define CONFIGFILE SYSCONFDIR "/msntauth.conf" - -diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-04-29 06:43:27.000000000 +0300 -+++ squid-3.0.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-15 00:29:57.000000000 +0300 -@@ -8,6 +8,6 @@ - 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 -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE5/helpers/basic_auth/SMB/Makefile.am ---- squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am 2008-04-29 06:43:27.000000000 +0300 -+++ squid-3.0.STABLE5/helpers/basic_auth/SMB/Makefile.am 2008-05-15 00:29:57.000000000 +0300 -@@ -14,7 +14,7 @@ - ## FIXME: autoconf should test for the samba path. - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX=/usr/local/samba -+SAMBAPREFIX=/usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE5/helpers/basic_auth/SMB/smb_auth.sh ---- squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-04-29 06:43:27.000000000 +0300 -+++ squid-3.0.STABLE5/helpers/basic_auth/SMB/smb_auth.sh 2008-05-15 00:29:57.000000000 +0300 -@@ -24,7 +24,7 @@ - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ - addropt="" - fi - echo "Query address options: $addropt" --dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff -Nru squid-3.0.STABLE5.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE5/helpers/external_acl/session/squid_session.8 ---- squid-3.0.STABLE5.orig/helpers/external_acl/session/squid_session.8 2008-04-29 06:43:28.000000000 +0300 -+++ squid-3.0.STABLE5/helpers/external_acl/session/squid_session.8 2008-05-15 00:29:57.000000000 +0300 -@@ -35,7 +35,7 @@ - .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 -Nru squid-3.0.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-3.0.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-04-29 06:43:28.000000000 +0300 -+++ squid-3.0.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-15 00:29:57.000000000 +0300 -@@ -27,7 +27,7 @@ - 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 -Nru squid-3.0.STABLE5.orig/src/cf.data.pre squid-3.0.STABLE5/src/cf.data.pre ---- squid-3.0.STABLE5.orig/src/cf.data.pre 2008-04-29 06:43:31.000000000 +0300 -+++ squid-3.0.STABLE5/src/cf.data.pre 2008-05-15 00:29:57.000000000 +0300 -@@ -638,6 +638,8 @@ - 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 purge method PURGE - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -671,6 +673,9 @@ - # Only allow cachemgr access from localhost - http_access allow manager localhost - http_access deny manager -+# Only allow purge requests from localhost -+http_access allow purge localhost -+http_access deny purge - # Deny requests to unknown ports - http_access deny !Safe_ports - # Deny CONNECT to other than SSL ports -@@ -688,6 +693,9 @@ - # from where browsing should be allowed - http_access allow localnet - -+# 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 -@@ -3216,11 +3224,11 @@ - - 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 -@@ -5156,6 +5164,9 @@ - If you disable this, it will appear as - - X-Forwarded-For: unknown -+NOCOMMENT_START -+forwarded_for off -+NOCOMMENT_END - DOC_END - - NAME: cachemgr_passwd -diff -Nru squid-3.0.STABLE5.orig/src/debug.cc squid-3.0.STABLE5/src/debug.cc ---- squid-3.0.STABLE5.orig/src/debug.cc 2008-04-29 06:43:31.000000000 +0300 -+++ squid-3.0.STABLE5/src/debug.cc 2008-05-15 00:29:57.000000000 +0300 -@@ -465,7 +465,7 @@ - #if HAVE_SYSLOG && defined(LOG_LOCAL4) - - if (opt_syslog_enable) -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); -+ openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility); - - #endif /* HAVE_SYSLOG */ - -diff -Nru squid-3.0.STABLE5.orig/src/defines.h squid-3.0.STABLE5/src/defines.h ---- squid-3.0.STABLE5.orig/src/defines.h 2008-04-29 06:43:31.000000000 +0300 -+++ squid-3.0.STABLE5/src/defines.h 2008-05-15 00:29:57.000000000 +0300 -@@ -219,7 +219,7 @@ - - /* were to look for errors if config path fails */ - #ifndef DEFAULT_SQUID_ERROR_DIR --#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" -+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English" - #endif - - /* handy to determine the #elements in a static array */ -diff -Nru squid-3.0.STABLE5.orig/src/main.cc squid-3.0.STABLE5/src/main.cc ---- squid-3.0.STABLE5.orig/src/main.cc 2008-04-29 06:43:32.000000000 +0300 -+++ squid-3.0.STABLE5/src/main.cc 2008-05-15 00:29:57.000000000 +0300 -@@ -1480,7 +1480,7 @@ - if (*(argv[0]) == '(') - return; - -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - - if ((pid = fork()) < 0) - syslog(LOG_ALERT, "fork failed: %s", xstrerror()); -@@ -1524,7 +1524,7 @@ - - if ((pid = fork()) == 0) { - /* child */ -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - prog = xstrdup(argv[0]); - argv[0] = xstrdup("(squid)"); - execvp(prog, argv); -@@ -1532,7 +1532,7 @@ - } - - /* parent */ -- openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON); - - syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); - -diff -Nru squid-3.0.STABLE5.orig/src/Makefile.am squid-3.0.STABLE5/src/Makefile.am ---- squid-3.0.STABLE5.orig/src/Makefile.am 2008-04-29 06:43:30.000000000 +0300 -+++ squid-3.0.STABLE5/src/Makefile.am 2008-05-15 00:29:57.000000000 +0300 -@@ -988,12 +988,12 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - 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)/'` diff --git a/net-proxy/squid/files/squid-3.0.6-lincapver.patch b/net-proxy/squid/files/squid-3.0.6-lincapver.patch deleted file mode 100644 index 9bc43f9fe4ca..000000000000 --- a/net-proxy/squid/files/squid-3.0.6-lincapver.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru squid-3.0.STABLE6.orig/src/tools.cc squid-3.0.STABLE6/src/tools.cc ---- squid-3.0.STABLE6.orig/src/tools.cc 2008-05-20 18:01:16.000000000 +0300 -+++ squid-3.0.STABLE6/src/tools.cc 2008-05-28 22:41:54.000000000 +0300 -@@ -1354,10 +1354,14 @@ - restoreCapabilities(int keep) - { - #if defined(_SQUID_LINUX_) && HAVE_SYS_CAPABILITY_H -- cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(cap_user_header_t)); -- cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(cap_user_data_t)); -- -+ cap_user_header_t head = (cap_user_header_t) xcalloc(1, sizeof(*head)); -+ cap_user_data_t cap = (cap_user_data_t) xcalloc(1, sizeof(*cap)); -+ -+#ifdef _LINUX_CAPABILITY_VERSION_1 -+ head->version = _LINUX_CAPABILITY_VERSION_1; -+#else - head->version = _LINUX_CAPABILITY_VERSION; -+#endif - - if (capget(head, cap) != 0) { - debugs(50, 1, "Can't get current capabilities"); diff --git a/net-proxy/squid/files/squid-3.0.6-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch index 1c502af19d5e..955b9189ae93 100644 --- a/net-proxy/squid/files/squid-3.0.6-adapted-zph.patch +++ b/net-proxy/squid/files/squid-3.0.8-adapted-zph.patch @@ -1,7 +1,7 @@ -diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.pre ---- squid-3.0.STABLE6.orig/src/cf.data.pre 2008-06-21 12:26:11.000000000 +0200 -+++ squid-3.0.STABLE6/src/cf.data.pre 2008-06-21 12:33:04.000000000 +0200 -@@ -1111,6 +1111,60 @@ +diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre +--- squid-3.0.STABLE8.orig/src/cf.data.pre 2008-08-01 21:59:10.000000000 +0000 ++++ squid-3.0.STABLE8/src/cf.data.pre 2008-08-01 22:00:44.000000000 +0000 +@@ -1127,6 +1127,60 @@ making the request. DOC_END @@ -62,9 +62,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.p NAME: tcp_outgoing_address TYPE: acl_address DEFAULT: none -diff -Nru squid-3.0.STABLE6.orig/src/client_side_reply.cc squid-3.0.STABLE6/src/client_side_reply.cc ---- squid-3.0.STABLE6.orig/src/client_side_reply.cc 2008-05-20 17:01:14.000000000 +0200 -+++ squid-3.0.STABLE6/src/client_side_reply.cc 2008-06-22 11:57:14.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/src/client_side_reply.cc squid-3.0.STABLE8/src/client_side_reply.cc +--- squid-3.0.STABLE8.orig/src/client_side_reply.cc 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/client_side_reply.cc 2008-08-01 22:00:44.000000000 +0000 @@ -48,6 +48,7 @@ #include "ESI.h" #endif @@ -147,9 +147,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/client_side_reply.cc squid-3.0.STABLE6/src/ if (buf != result.data) { /* we've got to copy some data */ assert(result.length <= next()->readBuffer.length); -diff -Nru squid-3.0.STABLE6.orig/src/fde.h squid-3.0.STABLE6/src/fde.h ---- squid-3.0.STABLE6.orig/src/fde.h 2008-05-20 17:01:15.000000000 +0200 -+++ squid-3.0.STABLE6/src/fde.h 2008-06-21 12:33:04.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/src/fde.h squid-3.0.STABLE8/src/fde.h +--- squid-3.0.STABLE8.orig/src/fde.h 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/fde.h 2008-08-01 22:00:44.000000000 +0000 @@ -106,7 +106,7 @@ long handle; } win32; @@ -159,9 +159,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/fde.h squid-3.0.STABLE6/src/fde.h }; #endif /* SQUID_FDE_H */ -diff -Nru squid-3.0.STABLE6.orig/src/forward.cc squid-3.0.STABLE6/src/forward.cc ---- squid-3.0.STABLE6.orig/src/forward.cc 2008-05-20 17:01:15.000000000 +0200 -+++ squid-3.0.STABLE6/src/forward.cc 2008-06-21 12:33:04.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/src/forward.cc squid-3.0.STABLE8/src/forward.cc +--- squid-3.0.STABLE8.orig/src/forward.cc 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/forward.cc 2008-08-01 22:00:44.000000000 +0000 @@ -964,6 +964,52 @@ netdbPingSite(request->host); @@ -215,9 +215,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/forward.cc squid-3.0.STABLE6/src/forward.cc if (servers && (p = servers->_peer)) { p->stats.fetches++; request->peer_login = p->login; -diff -Nru squid-3.0.STABLE6.orig/src/structs.h squid-3.0.STABLE6/src/structs.h ---- squid-3.0.STABLE6.orig/src/structs.h 2008-05-20 17:01:16.000000000 +0200 -+++ squid-3.0.STABLE6/src/structs.h 2008-06-21 12:33:04.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/src/structs.h squid-3.0.STABLE8/src/structs.h +--- squid-3.0.STABLE8.orig/src/structs.h 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/structs.h 2008-08-01 22:00:44.000000000 +0000 @@ -553,6 +553,8 @@ int emailErrData; int httpd_suppress_version_string; @@ -225,9 +225,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/structs.h squid-3.0.STABLE6/src/structs.h + int zph_tos_parent; + int zph_preserve_miss_tos; int debug_override_X; + int WIN32_IpAddrChangeMonitor; } - -@@ -720,6 +722,9 @@ +@@ -721,6 +723,9 @@ int sleep_after_fork; /* microseconds */ time_t minimum_expiry_time; /* seconds */ external_acl *externalAclHelperList; diff --git a/net-proxy/squid/files/squid-3.0.6-gentoo.patch b/net-proxy/squid/files/squid-3.0.8-gentoo.patch index 5c369620939b..950ced858709 100644 --- a/net-proxy/squid/files/squid-3.0.6-gentoo.patch +++ b/net-proxy/squid/files/squid-3.0.8-gentoo.patch @@ -1,6 +1,6 @@ -diff -Nru squid-3.0.STABLE6.orig/configure.in squid-3.0.STABLE6/configure.in ---- squid-3.0.STABLE6.orig/configure.in 2008-05-20 17:01:16.000000000 +0200 -+++ squid-3.0.STABLE6/configure.in 2008-06-22 13:20:41.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/configure.in squid-3.0.STABLE8/configure.in +--- squid-3.0.STABLE8.orig/configure.in 2008-07-18 10:02:55.000000000 +0000 ++++ squid-3.0.STABLE8/configure.in 2008-08-01 21:56:22.000000000 +0000 @@ -19,9 +19,9 @@ PRESET_LDFLAGS="$LDFLAGS" @@ -14,10 +14,10 @@ diff -Nru squid-3.0.STABLE6.orig/configure.in squid-3.0.STABLE6/configure.in dnl Check for GNU cc AC_PROG_CC -diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c ---- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c 2008-05-20 17:01:10.000000000 +0200 -+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/confload.c 2008-06-22 13:20:06.000000000 +0200 -@@ -24,7 +24,7 @@ +diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c +--- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/confload.c 2008-07-18 10:02:50.000000000 +0000 ++++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/confload.c 2008-08-01 21:56:22.000000000 +0000 +@@ -27,7 +27,7 @@ /* Path to configuration file */ #ifndef SYSCONFDIR @@ -26,9 +26,9 @@ diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.ST #endif #define CONFIGFILE SYSCONFDIR "/msntauth.conf" -diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-05-20 17:01:10.000000000 +0200 -+++ squid-3.0.STABLE6/helpers/basic_auth/MSNT/msntauth.conf.default 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default +--- squid-3.0.STABLE8.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-07-18 10:02:50.000000000 +0000 ++++ squid-3.0.STABLE8/helpers/basic_auth/MSNT/msntauth.conf.default 2008-08-01 21:56:22.000000000 +0000 @@ -8,6 +8,6 @@ server other_PDC other_BDC otherdomain @@ -38,9 +38,9 @@ diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/MSNT/msntauth.conf.default s +#denyusers /etc/squid/msntauth.denyusers +#allowusers /etc/squid/msntauth.allowusers -diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am ---- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am 2008-05-20 17:01:11.000000000 +0200 -+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/Makefile.am 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am +--- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/Makefile.am 2008-07-18 10:02:50.000000000 +0000 ++++ squid-3.0.STABLE8/helpers/basic_auth/SMB/Makefile.am 2008-08-01 21:56:22.000000000 +0000 @@ -14,7 +14,7 @@ ## FIXME: autoconf should test for the samba path. @@ -50,9 +50,9 @@ diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.ST SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh ---- squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-05-20 17:01:11.000000000 +0200 -+++ squid-3.0.STABLE6/helpers/basic_auth/SMB/smb_auth.sh 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh +--- squid-3.0.STABLE8.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-07-18 10:02:50.000000000 +0000 ++++ squid-3.0.STABLE8/helpers/basic_auth/SMB/smb_auth.sh 2008-08-01 21:56:22.000000000 +0000 @@ -24,7 +24,7 @@ read AUTHSHARE read AUTHFILE @@ -71,9 +71,9 @@ diff -Nru squid-3.0.STABLE6.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.ST echo "Domain controller IP address: $dcip" [ -n "$dcip" ] || exit 1 -diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8 ---- squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 2008-05-20 17:01:11.000000000 +0200 -+++ squid-3.0.STABLE6/helpers/external_acl/session/squid_session.8 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8 +--- squid-3.0.STABLE8.orig/helpers/external_acl/session/squid_session.8 2008-07-18 10:02:50.000000000 +0000 ++++ squid-3.0.STABLE8/helpers/external_acl/session/squid_session.8 2008-08-01 21:56:22.000000000 +0000 @@ -35,7 +35,7 @@ .P Configuration example using the default automatic mode @@ -83,9 +83,9 @@ diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/session/squid_session.8 sq .IP acl session external session .IP -diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-05-20 17:01:11.000000000 +0200 -+++ squid-3.0.STABLE6/helpers/external_acl/unix_group/squid_unix_group.8 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8 +--- squid-3.0.STABLE8.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-07-18 10:02:50.000000000 +0000 ++++ squid-3.0.STABLE8/helpers/external_acl/unix_group/squid_unix_group.8 2008-08-01 21:56:22.000000000 +0000 @@ -27,7 +27,7 @@ This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 matches users in group2 or group3 @@ -95,10 +95,10 @@ diff -Nru squid-3.0.STABLE6.orig/helpers/external_acl/unix_group/squid_unix_grou .IP acl usergroup1 external unix_group group1 .IP -diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.pre ---- squid-3.0.STABLE6.orig/src/cf.data.pre 2008-05-20 17:01:14.000000000 +0200 -+++ squid-3.0.STABLE6/src/cf.data.pre 2008-06-22 13:20:06.000000000 +0200 -@@ -638,6 +638,8 @@ +diff -ur squid-3.0.STABLE8.orig/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre +--- squid-3.0.STABLE8.orig/src/cf.data.pre 2008-07-18 10:02:53.000000000 +0000 ++++ squid-3.0.STABLE8/src/cf.data.pre 2008-08-01 21:56:22.000000000 +0000 +@@ -652,6 +652,8 @@ acl Safe_ports port 488 # gss-http acl Safe_ports port 591 # filemaker acl Safe_ports port 777 # multiling http @@ -107,7 +107,7 @@ diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.p acl CONNECT method CONNECT NOCOMMENT_END DOC_END -@@ -671,6 +673,9 @@ +@@ -685,6 +687,9 @@ # Only allow cachemgr access from localhost http_access allow manager localhost http_access deny manager @@ -117,7 +117,7 @@ diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.p # Deny requests to unknown ports http_access deny !Safe_ports # Deny CONNECT to other than SSL ports -@@ -688,6 +693,9 @@ +@@ -702,6 +707,9 @@ # from where browsing should be allowed http_access allow localnet @@ -127,7 +127,7 @@ diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.p # And finally deny all other access to this proxy http_access deny all NOCOMMENT_END -@@ -3216,11 +3224,11 @@ +@@ -3249,11 +3257,11 @@ NAME: cache_mgr TYPE: string @@ -141,7 +141,7 @@ diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.p DOC_END NAME: mail_from -@@ -5168,6 +5176,9 @@ +@@ -5200,6 +5208,9 @@ If you disable this, it will appear as X-Forwarded-For: unknown @@ -151,9 +151,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/cf.data.pre squid-3.0.STABLE6/src/cf.data.p DOC_END NAME: cachemgr_passwd -diff -Nru squid-3.0.STABLE6.orig/src/debug.cc squid-3.0.STABLE6/src/debug.cc ---- squid-3.0.STABLE6.orig/src/debug.cc 2008-05-20 17:01:15.000000000 +0200 -+++ squid-3.0.STABLE6/src/debug.cc 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/src/debug.cc squid-3.0.STABLE8/src/debug.cc +--- squid-3.0.STABLE8.orig/src/debug.cc 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/debug.cc 2008-08-01 21:56:22.000000000 +0000 @@ -465,7 +465,7 @@ #if HAVE_SYSLOG && defined(LOG_LOCAL4) @@ -163,9 +163,9 @@ diff -Nru squid-3.0.STABLE6.orig/src/debug.cc squid-3.0.STABLE6/src/debug.cc #endif /* HAVE_SYSLOG */ -diff -Nru squid-3.0.STABLE6.orig/src/defines.h squid-3.0.STABLE6/src/defines.h ---- squid-3.0.STABLE6.orig/src/defines.h 2008-05-20 17:01:15.000000000 +0200 -+++ squid-3.0.STABLE6/src/defines.h 2008-06-22 13:20:06.000000000 +0200 +diff -ur squid-3.0.STABLE8.orig/src/defines.h squid-3.0.STABLE8/src/defines.h +--- squid-3.0.STABLE8.orig/src/defines.h 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/defines.h 2008-08-01 21:56:22.000000000 +0000 @@ -219,7 +219,7 @@ /* were to look for errors if config path fails */ @@ -175,10 +175,10 @@ diff -Nru squid-3.0.STABLE6.orig/src/defines.h squid-3.0.STABLE6/src/defines.h #endif /* handy to determine the #elements in a static array */ -diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc ---- squid-3.0.STABLE6.orig/src/main.cc 2008-05-20 17:01:15.000000000 +0200 -+++ squid-3.0.STABLE6/src/main.cc 2008-06-22 13:20:06.000000000 +0200 -@@ -1482,7 +1482,7 @@ +diff -ur squid-3.0.STABLE8.orig/src/main.cc squid-3.0.STABLE8/src/main.cc +--- squid-3.0.STABLE8.orig/src/main.cc 2008-07-18 10:02:54.000000000 +0000 ++++ squid-3.0.STABLE8/src/main.cc 2008-08-01 21:56:22.000000000 +0000 +@@ -1486,7 +1486,7 @@ if (*(argv[0]) == '(') return; @@ -187,7 +187,7 @@ diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc if ((pid = fork()) < 0) syslog(LOG_ALERT, "fork failed: %s", xstrerror()); -@@ -1526,7 +1526,7 @@ +@@ -1530,7 +1530,7 @@ if ((pid = fork()) == 0) { /* child */ @@ -196,7 +196,7 @@ diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc prog = xstrdup(argv[0]); argv[0] = xstrdup("(squid)"); execvp(prog, argv); -@@ -1534,7 +1534,7 @@ +@@ -1538,7 +1538,7 @@ } /* parent */ @@ -205,10 +205,10 @@ diff -Nru squid-3.0.STABLE6.orig/src/main.cc squid-3.0.STABLE6/src/main.cc syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); -diff -Nru squid-3.0.STABLE6.orig/src/Makefile.am squid-3.0.STABLE6/src/Makefile.am ---- squid-3.0.STABLE6.orig/src/Makefile.am 2008-05-20 17:01:14.000000000 +0200 -+++ squid-3.0.STABLE6/src/Makefile.am 2008-06-22 13:20:06.000000000 +0200 -@@ -988,12 +988,12 @@ +diff -ur squid-3.0.STABLE8.orig/src/Makefile.am squid-3.0.STABLE8/src/Makefile.am +--- squid-3.0.STABLE8.orig/src/Makefile.am 2008-07-18 10:02:53.000000000 +0000 ++++ squid-3.0.STABLE8/src/Makefile.am 2008-08-01 21:56:22.000000000 +0000 +@@ -992,12 +992,12 @@ DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/net-proxy/squid/squid-2.7.2.ebuild b/net-proxy/squid/squid-2.7.2.ebuild deleted file mode 100644 index f41484c5cadd..000000000000 --- a/net-proxy/squid/squid-2.7.2.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.2.ebuild,v 1.1 2008/06/22 11:52:08 mrness Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils pam toolchain-funcs autotools linux-info - -#lame archive versioning scheme.. -S_PMV="${PV%%.*}" -S_PV="${PV%.*}" -S_PL="${PV##*.}" -S_PL="${S_PL/_rc/-RC}" -S_PP="${PN}-${S_PV}.STABLE${S_PL}" - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate \ - qos zero-penalty-hit \ - pf-transparent ipf-transparent \ - elibc_uclibc kernel_linux" - -DEPEND="pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -RDEPEND="${DEPEND} - samba? ( net-fs/samba )" - -S="${WORKDIR}/${S_PP}" - -pkg_setup() { - if use qos; then - eerror "qos patch is no longer supported!" - eerror "Please remove qos USE flag and use zph* config options instead." - die "unsupported USE flags detected" - fi - if use zero-penalty-hit; then - ewarn "This version supports natively IP TOS/Priority mangling," - ewarn "but it does not support zph_preserve_miss_tos." - ewarn "If you need that, please use squid-3.0.6-r2 or higher." - fi - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_unpack() { - unpack ${A} || die "unpack failed" - - cd "${S}" || die "source dir not found" - epatch "${FILESDIR}"/${P}-gentoo.patch - eautoreconf -} - -src_compile() { - 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}" - - 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,${ntlm_helpers}" - - local myconf="" - - # Support for uclibc #61175 - if use elibc_uclibc; then - myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" - myconf="${myconf} --disable-async-io" - else - myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" - myconf="${myconf} --enable-async-io" - fi - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter" - if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then - myconf="${myconf} --enable-epoll" - fi - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} --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 \ - --datadir=/usr/share/squid \ - --enable-auth="basic,digest,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-ident-lookups \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-pthreads \ - --with-large-files \ - --enable-htcp \ - --enable-carp \ - --enable-follow-x-forwarded-for \ - --with-maxfd=8192 \ - $(use_enable snmp) \ - $(use_enable ssl) \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/pam_auth - - # 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 - ewarn "Squid authentication helpers have been installed suid root." - ewarn "This allows shadow based authentication (see bug #52977 for more)." - echo - ewarn "Be careful what type of cache_dir you select!" - ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" - ewarn "when there isn't sufficient traffic to keep squid reasonably busy." - ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." - echo - ewarn "Squid can be configured to run in transparent mode like this:" - ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" -} diff --git a/net-proxy/squid/squid-3.0.5.ebuild b/net-proxy/squid/squid-3.0.5.ebuild deleted file mode 100644 index 3768681a0595..000000000000 --- a/net-proxy/squid/squid-3.0.5.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.5.ebuild,v 1.1 2008/05/14 22:02:09 mrness Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils pam toolchain-funcs autotools linux-info - -# lame archive versioning scheme.. -S_PMV="${PV%%.*}" -S_PV="${PV%.*}" -S_PL="${PV##*.}" -S_PP="${PN}-${S_PV}.STABLE${S_PL}" - -RESTRICT="test" # check if test works in next bump - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \ - pf-transparent ipf-transparent \ - elibc_uclibc kernel_linux" - -DEPEND="pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -RDEPEND="${DEPEND} - samba? ( net-fs/samba )" - -S="${WORKDIR}/${S_PP}" - -pkg_setup() { - if hasq qos ${USE} || hasq zero-penalty-hit ${USE} ; then - eerror "qos and zero-penalty-hit useflags are not supported by squid-3." - eerror "Please remove them from your USE or use =net-proxy/squid-2.6* instead." - die "unsupported USE flags detected" - fi - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_unpack() { - unpack ${A} || die "unpack failed" - cd "${S}" || die "source dir not found" - - epatch "${FILESDIR}"/${P}-gentoo.patch - - sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in - - eautoreconf -} - -src_compile() { - 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}" - - 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,${ntlm_helpers}" - - local myconf="" - - # Support for uclibc #61175 - if use elibc_uclibc; then - myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" - else - myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" - fi - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} --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 \ - --datadir=/usr/share/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/pam_auth - - # 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 - ewarn "Squid authentication helpers have been installed suid root." - ewarn "This allows shadow based authentication (see bug #52977 for more)." - echo - ewarn "Be careful what type of cache_dir you select!" - ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" - ewarn "when there isn't sufficient traffic to keep squid reasonably busy." - ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." - echo - ewarn "Squid can be configured to run in transparent mode like this:" - ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" -} diff --git a/net-proxy/squid/squid-3.0.6-r1.ebuild b/net-proxy/squid/squid-3.0.6-r1.ebuild deleted file mode 100644 index ee7cb5b937de..000000000000 --- a/net-proxy/squid/squid-3.0.6-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.6-r1.ebuild,v 1.1 2008/05/28 19:48:53 mrness Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils pam toolchain-funcs autotools linux-info - -# lame archive versioning scheme.. -S_PMV="${PV%%.*}" -S_PV="${PV%.*}" -S_PL="${PV##*.}" -S_PP="${PN}-${S_PV}.STABLE${S_PL}" - -RESTRICT="test" # check if test works in next bump - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \ - pf-transparent ipf-transparent \ - elibc_uclibc kernel_linux" - -DEPEND="pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -RDEPEND="${DEPEND} - samba? ( net-fs/samba )" - -S="${WORKDIR}/${S_PP}" - -pkg_setup() { - if hasq qos ${USE} || hasq zero-penalty-hit ${USE} ; then - eerror "qos and zero-penalty-hit useflags are not supported by squid-3." - eerror "Please remove them from your USE or use =net-proxy/squid-2.6* instead." - die "unsupported USE flags detected" - fi - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_unpack() { - unpack ${A} || die "unpack failed" - cd "${S}" || die "source dir not found" - - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-lincapver.patch - - sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in - - eautoreconf -} - -src_compile() { - 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}" - - 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,${ntlm_helpers}" - - local myconf="" - - # Support for uclibc #61175 - if use elibc_uclibc; then - myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" - else - myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" - fi - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} --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 \ - --datadir=/usr/share/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/pam_auth - - # 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 - ewarn "Squid authentication helpers have been installed suid root." - ewarn "This allows shadow based authentication (see bug #52977 for more)." - echo - ewarn "Be careful what type of cache_dir you select!" - ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" - ewarn "when there isn't sufficient traffic to keep squid reasonably busy." - ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." - echo - ewarn "Squid can be configured to run in transparent mode like this:" - ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" -} diff --git a/net-proxy/squid/squid-3.0.6-r2.ebuild b/net-proxy/squid/squid-3.0.8.ebuild index a3a1fb4a0277..98951cbf2c89 100644 --- a/net-proxy/squid/squid-3.0.6-r2.ebuild +++ b/net-proxy/squid/squid-3.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.6-r2.ebuild,v 1.1 2008/06/22 11:52:08 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.8.ebuild,v 1.1 2008/08/01 22:13:41 mrness Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -55,7 +55,6 @@ src_unpack() { cd "${S}" || die "source dir not found" epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-lincapver.patch use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch eautoreconf |