diff options
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/ChangeLog | 13 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-2.7.4-charset.patch | 21 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-2.7.4-gentoo.patch | 307 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.11-adapted-zph.patch | 202 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.11-gentoo.patch | 226 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.11-heimdal.patch (renamed from net-proxy/squid/files/squid-2.7.4-heimdal.patch) | 6 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.0.11.ebuild (renamed from net-proxy/squid/squid-2.7.4-r2.ebuild) | 67 |
7 files changed, 476 insertions, 366 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index f7bc2009e99c..249d4e1616cd 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,15 @@ # 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.220 2008/12/22 16:57:04 armin76 Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.221 2009/01/10 12:43:41 mrness Exp $ + +*squid-3.0.11 (10 Jan 2009) + + 10 Jan 2009; Alin Năstac <mrness@gentoo.org> + -files/squid-2.7.4-charset.patch, -files/squid-2.7.4-gentoo.patch, + -files/squid-2.7.4-heimdal.patch, +files/squid-3.0.11-adapted-zph.patch, + +files/squid-3.0.11-gentoo.patch, +files/squid-3.0.11-heimdal.patch, + -squid-2.7.4-r2.ebuild, +squid-3.0.11.ebuild: + Version bump (#252365). 22 Dec 2008; Raúl Porcel <armin76@gentoo.org> squid-2.7.5-r1.ebuild: ia64/sparc stable wrt #250928 diff --git a/net-proxy/squid/files/squid-2.7.4-charset.patch b/net-proxy/squid/files/squid-2.7.4-charset.patch deleted file mode 100644 index dcca2915eb9b..000000000000 --- a/net-proxy/squid/files/squid-2.7.4-charset.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur squid-2.7.STABLE4.orig/src/cf.data.pre squid-2.7.STABLE4/src/cf.data.pre ---- squid-2.7.STABLE4.orig/src/cf.data.pre 2008-07-10 09:47:28.000000000 +0000 -+++ squid-2.7.STABLE4/src/cf.data.pre 2008-08-15 06:00:39.000000000 +0000 -@@ -3538,7 +3538,7 @@ - - When using the concurrency option, the protocol is changed by introducing - a query channel tag infront of the request/response. The query channel -- tag is a number between 0 and concurrency−1. -+ tag is a number between 0 and concurrency-1. - - FORMAT specifications: - -@@ -3570,7 +3570,7 @@ - present, the supplied value completely replaces - the cached value. - -- In the event of a helper−related error (e.g., overload), Squid -+ In the event of a helper-related error (e.g., overload), Squid - will always default to STALE. - DOC_END - diff --git a/net-proxy/squid/files/squid-2.7.4-gentoo.patch b/net-proxy/squid/files/squid-2.7.4-gentoo.patch deleted file mode 100644 index 6175c6722316..000000000000 --- a/net-proxy/squid/files/squid-2.7.4-gentoo.patch +++ /dev/null @@ -1,307 +0,0 @@ -diff -ur squid-2.7.STABLE4.orig/configure.in squid-2.7.STABLE4/configure.in ---- squid-2.7.STABLE4.orig/configure.in 2008-08-08 19:21:03.000000000 +0000 -+++ squid-2.7.STABLE4/configure.in 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE4/helpers/basic_auth/MSNT/confload.c ---- squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 19:09:48.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/basic_auth/MSNT/confload.c 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE4/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-2.7.STABLE4.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 18:44:28.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/basic_auth/MSNT/msntauth.conf.default 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE4/helpers/basic_auth/SMB/Makefile.am ---- squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 16:56:26.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/basic_auth/SMB/Makefile.am 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE4/helpers/basic_auth/SMB/smb_auth.sh ---- squid-2.7.STABLE4.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-07 23:36:46.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/basic_auth/SMB/smb_auth.sh 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE4/helpers/external_acl/session/squid_session.8 ---- squid-2.7.STABLE4.orig/helpers/external_acl/session/squid_session.8 2007-01-06 17:28:35.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/external_acl/session/squid_session.8 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE4/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-2.7.STABLE4.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 15:07:24.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/external_acl/unix_group/squid_unix_group.8 2008-08-09 08:12:02.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 - .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 -ur squid-2.7.STABLE4.orig/src/access_log.c squid-2.7.STABLE4/src/access_log.c ---- squid-2.7.STABLE4.orig/src/access_log.c 2008-03-18 02:48:43.000000000 +0000 -+++ squid-2.7.STABLE4/src/access_log.c 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/src/cf.data.pre squid-2.7.STABLE4/src/cf.data.pre ---- squid-2.7.STABLE4.orig/src/cf.data.pre 2008-07-10 09:47:28.000000000 +0000 -+++ squid-2.7.STABLE4/src/cf.data.pre 2008-08-09 08:12:02.000000000 +0000 -@@ -676,6 +676,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 -@@ -709,6 +711,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 -@@ -726,6 +731,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 -@@ -3722,11 +3730,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 -@@ -3755,12 +3763,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 -@@ -4397,12 +4405,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 -@@ -4473,12 +4481,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 -@@ -5375,6 +5383,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 -ur squid-2.7.STABLE4.orig/src/client_side.c squid-2.7.STABLE4/src/client_side.c ---- squid-2.7.STABLE4.orig/src/client_side.c 2008-07-21 20:43:27.000000000 +0000 -+++ squid-2.7.STABLE4/src/client_side.c 2008-08-09 08:12:02.000000000 +0000 -@@ -4687,14 +4687,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 -ur squid-2.7.STABLE4.orig/src/defines.h squid-2.7.STABLE4/src/defines.h ---- squid-2.7.STABLE4.orig/src/defines.h 2007-09-24 13:31:19.000000000 +0000 -+++ squid-2.7.STABLE4/src/defines.h 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/src/main.c squid-2.7.STABLE4/src/main.c ---- squid-2.7.STABLE4.orig/src/main.c 2008-05-26 23:14:30.000000000 +0000 -+++ squid-2.7.STABLE4/src/main.c 2008-08-09 08:12:02.000000000 +0000 -@@ -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 -ur squid-2.7.STABLE4.orig/src/Makefile.am squid-2.7.STABLE4/src/Makefile.am ---- squid-2.7.STABLE4.orig/src/Makefile.am 2008-01-02 15:50:39.000000000 +0000 -+++ squid-2.7.STABLE4/src/Makefile.am 2008-08-09 08:12:02.000000000 +0000 -@@ -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.11-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.11-adapted-zph.patch new file mode 100644 index 000000000000..e5a025cab30f --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.11-adapted-zph.patch @@ -0,0 +1,202 @@ +diff -Nru squid-3.0.STABLE11.orig/src/cf.data.pre squid-3.0.STABLE11/src/cf.data.pre +--- squid-3.0.STABLE11.orig/src/cf.data.pre 2009-01-10 11:50:23.000000000 +0000 ++++ squid-3.0.STABLE11/src/cf.data.pre 2009-01-10 11:51:24.000000000 +0000 +@@ -1133,6 +1133,60 @@ + making the request. + DOC_END + ++NAME: zph_tos_local ++TYPE: int ++DEFAULT: 0 ++LOC: Config.zph_tos_local ++DOC_START ++ Allows you to select a TOS/Diffserv value to mark local hits. Read above ++ (tcp_outgoing_tos) for details/requirements about TOS. ++ Default: 0 (disabled). ++DOC_END ++ ++NAME: zph_tos_peer ++TYPE: int ++DEFAULT: 0 ++LOC: Config.zph_tos_peer ++DOC_START ++ Allows you to select a TOS/Diffserv value to mark peer hits. Read above ++ (tcp_outgoing_tos) for details/requirements about TOS. ++ Default: 0 (disabled). ++DOC_END ++ ++NAME: zph_tos_parent ++COMMENT: on|off ++TYPE: onoff ++LOC: Config.onoff.zph_tos_parent ++DEFAULT: on ++DOC_START ++ Set this to off if you want only sibling hits to be marked. ++ If set to on (default), parent hits are being marked too. ++DOC_END ++ ++NAME: zph_preserve_miss_tos ++COMMENT: on|off ++TYPE: onoff ++LOC: Config.onoff.zph_preserve_miss_tos ++DEFAULT: on ++DOC_START ++ If set to on (default), any HTTP response towards clients will ++ have the TOS value of the response comming from the remote ++ server masked with the value of zph_preserve_miss_tos_mask. ++ For this to work correctly, you will need to patch your linux ++ kernel with the TOS preserving ZPH patch. ++DOC_END ++ ++NAME: zph_preserve_miss_tos_mask ++TYPE: int ++DEFAULT: 255 ++LOC: Config.zph_preserve_miss_tos_mask ++DOC_START ++ Allows you to mask certain bits in the TOS received from the ++ remote server, before copying the value to the TOS send towards ++ clients. ++ Default: 255 (TOS from server is not changed). ++DOC_END ++ + NAME: tcp_outgoing_address + TYPE: acl_address + DEFAULT: none +diff -Nru squid-3.0.STABLE11.orig/src/client_side_reply.cc squid-3.0.STABLE11/src/client_side_reply.cc +--- squid-3.0.STABLE11.orig/src/client_side_reply.cc 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/client_side_reply.cc 2009-01-10 11:51:24.000000000 +0000 +@@ -48,6 +48,7 @@ + #include "ESI.h" + #endif + #include "MemObject.h" ++#include "fde.h" + #include "ACLChecklist.h" + #include "ACL.h" + #if DELAY_POOLS +@@ -1548,6 +1549,11 @@ + /* guarantee nothing has been sent yet! */ + assert(http->out.size == 0); + assert(http->out.offset == 0); ++ if (Config.zph_tos_local) ++ { ++ debugs(33, 1, "ZPH hit hier.code=" << http->request->hier.code <<" TOS="<<Config.zph_tos_local); ++ comm_set_tos(http->getConn()->fd,Config.zph_tos_local); ++ } + tempBuffer.offset = reqofs; + tempBuffer.length = getNextNode()->readBuffer.length; + tempBuffer.data = getNextNode()->readBuffer.data; +@@ -1827,6 +1833,24 @@ + char *buf = next()->readBuffer.data; + + char *body_buf = buf; ++ ++ if (reqofs==0 && !logTypeIsATcpHit(http->logType)) ++ { ++ int tos = 0; ++ if (Config.zph_tos_peer && ++ (http->request->hier.code==SIBLING_HIT || ++ (Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT))) ++ { ++ tos = Config.zph_tos_peer; ++ debugs(33, 1, "ZPH: Peer hit, TOS="<<tos<<" hier.code="<<http->request->hier.code); ++ } ++ else if (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask) ++ { ++ tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask; ++ debugs(33, 1, "ZPH: Preserving TOS on miss, TOS="<<tos); ++ } ++ comm_set_tos(fd,tos); ++ } + + if (buf != result.data) { + /* we've got to copy some data */ +diff -Nru squid-3.0.STABLE11.orig/src/fde.h squid-3.0.STABLE11/src/fde.h +--- squid-3.0.STABLE11.orig/src/fde.h 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/fde.h 2009-01-10 11:51:24.000000000 +0000 +@@ -106,7 +106,7 @@ + long handle; + } win32; + #endif +- ++ unsigned char upstreamTOS; /* see FwdState::dispatch() */ + }; + + #endif /* SQUID_FDE_H */ +diff -Nru squid-3.0.STABLE11.orig/src/forward.cc squid-3.0.STABLE11/src/forward.cc +--- squid-3.0.STABLE11.orig/src/forward.cc 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/forward.cc 2009-01-10 11:51:24.000000000 +0000 +@@ -964,6 +964,52 @@ + + netdbPingSite(request->host); + ++ /* Retrieves remote server TOS value, and stores it as part of the ++ * original client request FD object. It is later used to forward ++ * remote server's TOS in the response to the client in case of a MISS. ++ */ ++ fde * clientFde = &fd_table[client_fd]; ++ if (clientFde) ++ { ++ int tos = 1; ++ int tos_len = sizeof(tos); ++ clientFde->upstreamTOS = 0; ++ if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0) ++ { ++ unsigned char buf[512]; ++ int len = 512; ++ if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0) ++ { ++ /* Parse the PKTOPTIONS structure to locate the TOS data message ++ * prepared in the kernel by the ZPH incoming TCP TOS preserving ++ * patch. ++ */ ++ unsigned char * p = buf; ++ while (p-buf < len) ++ { ++ struct cmsghdr *o = (struct cmsghdr*)p; ++ if (o->cmsg_len<=0) ++ break; ++ ++ if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) ++ { ++ clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o)); ++ break; ++ } ++ p += CMSG_LEN(o->cmsg_len); ++ } ++ } ++ else ++ { ++ debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror()); ++ } ++ } ++ else ++ { ++ debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror()); ++ } ++ } ++ + if (servers && (p = servers->_peer)) { + p->stats.fetches++; + request->peer_login = p->login; +diff -Nru squid-3.0.STABLE11.orig/src/structs.h squid-3.0.STABLE11/src/structs.h +--- squid-3.0.STABLE11.orig/src/structs.h 2008-12-23 04:19:33.000000000 +0000 ++++ squid-3.0.STABLE11/src/structs.h 2009-01-10 11:51:24.000000000 +0000 +@@ -553,6 +553,8 @@ + int emailErrData; + int httpd_suppress_version_string; + int global_internal_static; ++ int zph_tos_parent; ++ int zph_preserve_miss_tos; + int debug_override_X; + int WIN32_IpAddrChangeMonitor; + } +@@ -721,6 +723,9 @@ + int sleep_after_fork; /* microseconds */ + time_t minimum_expiry_time; /* seconds */ + external_acl *externalAclHelperList; ++ int zph_tos_local; ++ int zph_tos_peer; ++ int zph_preserve_miss_tos_mask; + #if USE_SSL + + struct diff --git a/net-proxy/squid/files/squid-3.0.11-gentoo.patch b/net-proxy/squid/files/squid-3.0.11-gentoo.patch new file mode 100644 index 000000000000..a19b7be662a3 --- /dev/null +++ b/net-proxy/squid/files/squid-3.0.11-gentoo.patch @@ -0,0 +1,226 @@ +diff -Nru squid-3.0.STABLE11.orig/configure.in squid-3.0.STABLE11/configure.in +--- squid-3.0.STABLE11.orig/configure.in 2008-12-23 04:19:33.000000000 +0000 ++++ squid-3.0.STABLE11/configure.in 2009-01-10 11:48:27.000000000 +0000 +@@ -16,9 +16,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-3.0.STABLE11.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE11/helpers/basic_auth/MSNT/confload.c +--- squid-3.0.STABLE11.orig/helpers/basic_auth/MSNT/confload.c 2008-12-23 04:19:25.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/basic_auth/MSNT/confload.c 2009-01-10 11:48:27.000000000 +0000 +@@ -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 -Nru squid-3.0.STABLE11.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE11/helpers/basic_auth/MSNT/msntauth.conf.default +--- squid-3.0.STABLE11.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2008-12-23 04:19:25.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/basic_auth/MSNT/msntauth.conf.default 2009-01-10 11:48:27.000000000 +0000 +@@ -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.STABLE11.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE11/helpers/basic_auth/SMB/Makefile.am +--- squid-3.0.STABLE11.orig/helpers/basic_auth/SMB/Makefile.am 2008-12-23 04:19:25.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/basic_auth/SMB/Makefile.am 2009-01-10 11:48:27.000000000 +0000 +@@ -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.STABLE11.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE11/helpers/basic_auth/SMB/smb_auth.sh +--- squid-3.0.STABLE11.orig/helpers/basic_auth/SMB/smb_auth.sh 2008-12-23 04:19:25.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/basic_auth/SMB/smb_auth.sh 2009-01-10 11:48:27.000000000 +0000 +@@ -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.STABLE11.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE11/helpers/external_acl/session/squid_session.8 +--- squid-3.0.STABLE11.orig/helpers/external_acl/session/squid_session.8 2008-12-23 04:19:26.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/external_acl/session/squid_session.8 2009-01-10 11:48:27.000000000 +0000 +@@ -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.STABLE11.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE11/helpers/external_acl/unix_group/squid_unix_group.8 +--- squid-3.0.STABLE11.orig/helpers/external_acl/unix_group/squid_unix_group.8 2008-12-23 04:19:26.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/external_acl/unix_group/squid_unix_group.8 2009-01-10 11:48:27.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 + .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.STABLE11.orig/src/cf.data.pre squid-3.0.STABLE11/src/cf.data.pre +--- squid-3.0.STABLE11.orig/src/cf.data.pre 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/cf.data.pre 2009-01-10 11:48:27.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 ++acl Safe_ports port 901 # SWAT ++acl purge method PURGE + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -685,6 +687,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 +@@ -702,6 +707,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 +@@ -3259,11 +3267,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 +@@ -5213,6 +5221,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.STABLE11.orig/src/debug.cc squid-3.0.STABLE11/src/debug.cc +--- squid-3.0.STABLE11.orig/src/debug.cc 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/debug.cc 2009-01-10 11:48:27.000000000 +0000 +@@ -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.STABLE11.orig/src/defines.h squid-3.0.STABLE11/src/defines.h +--- squid-3.0.STABLE11.orig/src/defines.h 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/defines.h 2009-01-10 11:48:27.000000000 +0000 +@@ -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.STABLE11.orig/src/main.cc squid-3.0.STABLE11/src/main.cc +--- squid-3.0.STABLE11.orig/src/main.cc 2008-12-23 04:19:33.000000000 +0000 ++++ squid-3.0.STABLE11/src/main.cc 2009-01-10 11:48:27.000000000 +0000 +@@ -1486,7 +1486,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()); +@@ -1530,7 +1530,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); +@@ -1538,7 +1538,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.STABLE11.orig/src/Makefile.am squid-3.0.STABLE11/src/Makefile.am +--- squid-3.0.STABLE11.orig/src/Makefile.am 2008-12-23 04:19:32.000000000 +0000 ++++ squid-3.0.STABLE11/src/Makefile.am 2009-01-10 11:48:27.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)/'` +-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-2.7.4-heimdal.patch b/net-proxy/squid/files/squid-3.0.11-heimdal.patch index 4271501aa227..33c22baa6f73 100644 --- a/net-proxy/squid/files/squid-2.7.4-heimdal.patch +++ b/net-proxy/squid/files/squid-3.0.11-heimdal.patch @@ -1,6 +1,6 @@ -diff -ur squid-2.7.STABLE4.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE4/helpers/negotiate_auth/squid_kerb_auth/Makefile.am ---- squid-2.7.STABLE4.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2007-05-14 23:36:29.000000000 +0000 -+++ squid-2.7.STABLE4/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2008-10-17 20:09:19.000000000 +0000 +diff -Nru squid-3.0.STABLE11.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE11/helpers/negotiate_auth/squid_kerb_auth/Makefile.am +--- squid-3.0.STABLE11.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2008-12-23 04:19:26.000000000 +0000 ++++ squid-3.0.STABLE11/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2009-01-10 11:49:46.000000000 +0000 @@ -18,10 +18,10 @@ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) diff --git a/net-proxy/squid/squid-2.7.4-r2.ebuild b/net-proxy/squid/squid-3.0.11.ebuild index 16227b439bf6..8efeb094b9f9 100644 --- a/net-proxy/squid/squid-2.7.4-r2.ebuild +++ b/net-proxy/squid/squid-3.0.11.ebuild @@ -1,31 +1,32 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.4-r2.ebuild,v 1.9 2008/11/30 19:20:44 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.11.ebuild,v 1.1 2009/01/10 12:43:41 mrness Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" inherit eutils pam toolchain-funcs autotools linux-info -#lame archive versioning scheme.. +# 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}" +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 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \ +KEYWORDS="~alpha ~amd64 -arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \ mysql postgres sqlite \ zero-penalty-hit \ - pf-transparent ipf-transparent \ - elibc_uclibc kernel_linux" + pf-transparent ipf-transparent kqueue \ + elibc_uclibc kernel_linux epoll" DEPEND="pam? ( virtual/pam ) ldap? ( net-nds/openldap ) @@ -45,11 +46,14 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${S_PP}" pkg_setup() { - 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." + 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 use a disabled store type" fi + enewgroup squid 31 enewuser squid 31 -1 /var/cache/squid squid } @@ -59,8 +63,9 @@ src_unpack() { cd "${S}" || die "source dir not found" epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-charset.patch + use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch + eautoreconf } @@ -71,6 +76,7 @@ src_compile() { 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 @@ -87,22 +93,15 @@ src_compile() { 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 + # 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,null" 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 + myconf="${myconf} --enable-linux-netfilter + $(use_enable epoll)" elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} --enable-kqueue" + myconf="${myconf} $(use_enable kqueue)" if use pf-transparent; then myconf="${myconf} --enable-pf-transparent" elif use ipf-transparent; then @@ -117,27 +116,24 @@ src_compile() { --libexecdir=/usr/libexec/squid \ --localstatedir=/var \ --datadir=/usr/share/squid \ - --enable-auth="basic,digest,ntlm" \ + --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-negotiate-auth-helpers="${negotiate_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 \ + --with-filedescriptors=8192 \ $(use_enable snmp) \ $(use_enable ssl) \ + $(use_enable icap-client) \ ${myconf} || die "econf failed" emake || die "emake failed" @@ -192,4 +188,9 @@ pkg_postinst() { echo ewarn "Squid can be configured to run in transparent mode like this:" ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" + if use zero-penalty-hit; then + echo + ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" + ewarn "with the patch that can be found on http://zph.bratcheda.org site." + fi } |