Version bumps (#294871). Speed up service stop when squid has crashed (#291911). Add digest_auth_ldap helper (#293803).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

12 files changed, 908 insertions, 221 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 7c736984108b..6bd159a0d5dd 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.291 2009/11/08 17:43:36 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.292 2009/11/28 12:32:59 mrness Exp $
+
+*squid-3.1.0.15_beta (28 Nov 2009)
+*squid-3.0.20 (28 Nov 2009)
+
+  28 Nov 2009; Alin Năstac <mrness@gentoo.org> +squid-3.0.20.ebuild,
+  +files/squid-3.0.20-adapted-zph.patch,
+  +files/squid-3.0.20-cross-compile.patch, +files/squid-3.0.20-gentoo.patch,
+  -squid-3.1.0.13_beta-r2.ebuild,
+  -files/squid-3.1.0.13_beta-cve-2009-2855.patch,
+  -files/squid-3.1.0.13_beta-gentoo.patch,
+  -files/squid-3.1.0.13_beta-qafixes.patch, +squid-3.1.0.15_beta.ebuild,
+  +files/squid-3.1.0.15_beta-gentoo.patch,
+  +files/squid-3.1.0.15_beta-qafixes.patch, files/squid.initd,
+  files/squid.initd-logrotate:
+  Version bumps (#294871). Speed up service stop when squid has crashed
+  (#291911). Add digest_auth_ldap helper (#293803).
 
   08 Nov 2009; Tobias Klausmann <klausman@gentoo.org> squid-3.0.19.ebuild:
   Stable on alpha, bug #290185
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index b68369a2610e..a4da9ff9d35f 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2-capability.patch 970 RMD160 01edc052d32b6531e6db93ff1addef91e193c6df SHA1 533bff849dbcbfb2d85c4a995eaea6585a593fd7 SHA256 4e0cef8fc9643e7b4922c510bf25fbd902eaeaec0846eb49a809229ab75b21c6
 AUX squid-2-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
 AUX squid-2.7.6-cve-2009-2855.patch 1117 RMD160 4d04db9e091725eab9dfd51870ef353fcd9ddd9a SHA1 ac1e88120322b1143d06ab4efe97552aaa3e0fa8 SHA256 203a0ceb25bb99894ad0180f5676daa9c5b4c51a3d76112fa0c3e669db278e24
@@ -12,28 +15,39 @@ AUX squid-3.0.18-gentoo.patch 13095 RMD160 a051aadf18dd2a902d174ac638acb01a12a28
 AUX squid-3.0.19-adapted-zph.patch 6951 RMD160 70c29454281d31a90093199eac410fd539f98dbc SHA1 5c4a381161bc2a3908d8c941a6f7494184b0a01b SHA256 33d17e6241aa4ce240d98f068a6839b639d78ce5cba4b7be91b0761d25d7e1d3
 AUX squid-3.0.19-cross-compile.patch 1234 RMD160 211ac61245bcf4bc7bbdac69fe49a671d46cd919 SHA1 22b6c343f672c9ac70a92910564b7f398e846024 SHA256 74927a2ebf39b8da29baf4f8cd12ee67034dcde29a28966fd7b0d51573610ee2
 AUX squid-3.0.19-gentoo.patch 13095 RMD160 579701b8461fc340181e89d1f27f52473a3a7c26 SHA1 926b5e44a3e3b129ccb955e570af4caa856b7697 SHA256 af1e67885e531a47d74c672e3ef94095e25d6f3b35d5c12395f1b41a03bb30a2
-AUX squid-3.1.0.13_beta-cve-2009-2855.patch 1159 RMD160 a45298f835852e1a3cfc793ea3a81569c24fe87b SHA1 c329b19f632652bd7f6c36e36b793ebdf8551097 SHA256 30e03878fead8aad19ce3739bddce6c42d62ea572feb6a4387393e24b92ee580
-AUX squid-3.1.0.13_beta-gentoo.patch 12746 RMD160 c231d5ff2fa0f925f040575d758d8ea145124436 SHA1 0a2b8149b88a40710b877cb68ce70451dd9654a1 SHA256 191305a90a663742ce04f2d05a8a15ee79c429906a323da18d52c90a266ff9f1
-AUX squid-3.1.0.13_beta-qafixes.patch 4374 RMD160 7680091baa7a94362a096a60723f29bc025d1b0b SHA1 dd846563e541f039f2822e4ff2d965d758445959 SHA256 89132cc2cf4682c9175b14208efe772fe66b49a1f5d7e93b9d07f76f818aa5ee
+AUX squid-3.0.20-adapted-zph.patch 6951 RMD160 3178642934680e710bb3ddcfdba7dcea49dcf255 SHA1 a65e08bce07fdde6323c6051b6e15336091eb58d SHA256 dd45c86bf52550c681e54a952acc617a19a23edcf7fe2ee1c060740f846e392b
+AUX squid-3.0.20-cross-compile.patch 1234 RMD160 f77c20557d83d4c630b1ec66403f53b1d0123b6d SHA1 7c9cd4558b040fe50dc2f86b9535d4ab52babdef SHA256 05d2b0eb6be2e8898073acd89b5241e6a5cfdb054aa1b048b52c660ae7be1f55
+AUX squid-3.0.20-gentoo.patch 13157 RMD160 e017a2d0c9a5d873e624bfcf507a60b3947ff59f SHA1 0f2bc6545b4f9e1784350bf66378ab904a5f84f8 SHA256 2ca42644b5b16f8a8e82cc3dbdda568cfb06e1475531b16be090be8a374d4fca
 AUX squid-3.1.0.14_beta-gentoo.patch 12827 RMD160 1edc0fce87637502056597560011a4ff58178499 SHA1 0ee38f3b1b61099109cc51f026b68bdc5515d969 SHA256 c41d729ae4927d988729ce99973455c18bf00e71bc58ffcf3f574979b1b9fbb2
 AUX squid-3.1.0.14_beta-qafixes.patch 3056 RMD160 315cf6724fdcd54086d1004feaded3e6d85152ed SHA1 d467ab7e8baffded6b6deb40d113b2beb3e67a48 SHA256 e67028d04a0362e5564690cd193220f8b19098c7f91df06830a4adbd6d6249d0
+AUX squid-3.1.0.15_beta-gentoo.patch 12492 RMD160 54ac45d44181b0375b2af9c44ba58dd9adcc1167 SHA1 4b315d1217306b82ae3998e9cf202f61892c9156 SHA256 be9ef7ea828403703267e2dbeaa5cc43a3a5600ea3bd400b655ec30cfd5aaab3
+AUX squid-3.1.0.15_beta-qafixes.patch 3056 RMD160 04651a43cd8d93d7290d34c5d18ffc5f41861691 SHA1 ada18d7d1776891aca0fc8e0128a52d5573569d4 SHA256 06a3bbb7559ebc4a8b335e22fe0d069a1c20d695963a0c3e2fcd0f829ec9c97c
 AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
-AUX squid.initd 3209 RMD160 3c0ac65b53dd6882859d89d080e5f914d9eaeb09 SHA1 c62b0211a2769cfdc970a83e67b78270285e358a SHA256 838f1a9d0bab03d0a0f503d611d5e58fec627921ba2c3e3ff3886655387f467c
-AUX squid.initd-logrotate 3057 RMD160 70fa5cb92b8d8a010fb6f0c244c4fb08dafe7086 SHA1 0a51b26ecb948e24eec04e6995bb523d07f54614 SHA256 4efb8b35febb6dc72f963f4868be8563d0b0181ba710378918a6ea259c014885
+AUX squid.initd 3315 RMD160 a6209a27770eb2aebdd533c946e790efec0de53b SHA1 08519fa20a7286cba9ea82e7b23dd8116ab7f77b SHA256 d3eac36c2fc313688e19cde7ace63783cd202315b23c0b2bd0219a4504cb2b35
+AUX squid.initd-logrotate 3163 RMD160 b7d58517e4198ceb7416c00004c91ac30a241bfb SHA1 714d51e0c449817c12e7230942f89c1a62012107 SHA256 b403b7ffebc08c2ce76cd2b8b6c53a639f24e3e35933ba9766aa4623a34a1279
 AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
 DIST squid-2.7.STABLE6.tar.gz 1786189 RMD160 ca59583e9d938c3184a306984f034553f768e942 SHA1 0f66afca85444f7d4f49a527470ef14741904db0 SHA256 0aeb0dd601822711cf8e131d82de8bc64e918adbcfea7e834c4529895759331a
 DIST squid-2.7.STABLE7.tar.gz 1784325 RMD160 c2ada1aab388244aaa20476a5884e94b3107fbfc SHA1 94a385a494f50cf3394e226ce743ae3a3ad51440 SHA256 2b926aece7d4beac0370d9b72899d3be7f48c29e973a1328666938a2e4c4ffa6
 DIST squid-3.0.STABLE18.tar.gz 2451806 RMD160 58858b1b8fb2d34ce482a6001b950b0aa5c87a2c SHA1 5855ecaf6f427ec95f52848efd679ea1bdd2c304 SHA256 71e74c48a19b901d1b4dd8fcbfa15c6b510befa524929a63ecef6a9ef5699d85
 DIST squid-3.0.STABLE19.tar.gz 2450451 RMD160 33a2fc1ace6ae4319ba32c781418965e91bf244e SHA1 70bb80c3e32484f3ec2c92a72c256dec133d616b SHA256 6930df9063e3f2d9211ea38e79ed3a1ac93bc0126fcff5340caf178f130a8dd5
-DIST squid-3.1.0.13.tar.gz 3247124 RMD160 263a42af1ff2d9a967862f77389f9bd3bd6b9b2e SHA1 bfe7ea82b67d07211ae3221920aad87424444f30 SHA256 f4e7c3933575f86072220863f38a6f8d1923ab4b8954a38e06248fc80a0dec00
+DIST squid-3.0.STABLE20.tar.gz 2452224 RMD160 e3926f0ff0c18d13859d83952573f63db9d24c03 SHA1 19b122d5c0ab293b76ef974c91047eb6981615ad SHA256 ba4d7cc4ea523675bf4be1ff91644180f92533870671fd1e748c67bb56349f93
 DIST squid-3.1.0.14.tar.gz 3260229 RMD160 2d55d0ea6a87068a854a49aec24eb3e9103840e0 SHA1 eb7ef7b0f2612ccf6345d32f5f962ed629ff8ecc SHA256 ed5eda950f0a7412d8d893b63c6558620aacc0d923d6e7ba10d29fbdcde8576c
+DIST squid-3.1.0.15.tar.gz 3271945 RMD160 f78bad07110ee90b62eb54cd9cc7d73a3bd6b191 SHA1 9ea18422bf42d1b3d3598f1b5d93ae27cbc589c7 SHA256 a284e723ac67900a5b503cba0e28e836967c6a23525ffcb684257b1820444ef9
 EBUILD squid-2.7.6-r2.ebuild 6039 RMD160 b5355c33e3a7b9dce57f75da87da71854d880321 SHA1 aac17f4c96fd9e104d595f8ceadf0c6799284aac SHA256 7873717f430431b12c5405fadd7fa3e62d6374991cb077f6b53e43dbec9e9d92
 EBUILD squid-2.7.7.ebuild 5998 RMD160 b77880af5a9fd3bddb8d2578d29eb86e9e66982f SHA1 a92001eae71c8686f3c81fce2fafb15f9992d94a SHA256 f6f55a553e30585903db9c1d50c0e4226c54756ee2573d252409c6568172dc21
 EBUILD squid-3.0.18-r1.ebuild 6438 RMD160 3f2e0054891d77062da0445e95a60281ab3ab878 SHA1 ad8cb75bf4d0b44c6943de10d4f98f5bee64b451 SHA256 69bb7ef4a8c789e061955e69aeb7d9ca20fb29c2b5764211532a8bd34cbea580
 EBUILD squid-3.0.19.ebuild 6395 RMD160 3285b7d91a04b691f92a6925269fce4c0cd867a0 SHA1 28167450bf99ad48fc1862cb8b82b10a41a2c8c5 SHA256 c60359945a51a944327496c445b2dfa38e7c6de3f909b580523213c9fa3590f8
-EBUILD squid-3.1.0.13_beta-r2.ebuild 6638 RMD160 7e8c5e11faaf8d10ce44a2457fe7b3f0149a252e SHA1 8189105b515603c0b6ee1de21fd1bab463619516 SHA256 42a5b73b165932657ff4718a83a5965dea007067c2a6b7be93094719399ff5f8
+EBUILD squid-3.0.20.ebuild 6446 RMD160 697fcd4723782eeb80fb81d51d096f91da43426d SHA1 ab1f0f97db4121488296790c94673254e291f253 SHA256 9ca6273b35532fe61101309bdbd0281ca6952df869391aecc085fdf7b07b3704
 EBUILD squid-3.1.0.14_beta.ebuild 6638 RMD160 0aacb360eaa5057b7ea6e0d750079ea4f46cd193 SHA1 66231abca6ff7fba7b80a069e88e6fa719148260 SHA256 7b7110fc9bc6f04b91063b3733fcac0c1dfeed358749e1f12a2ef97145135108
-MISC ChangeLog 62587 RMD160 bb8437589f61aa8901f013916d191a0a8fb71648 SHA1 c8f778f9773e9ac262f7e457bcfc08f34f55cbb9 SHA256 b5bd1a6474e4157be092b7619b3f3bcf657be622fec224c6b889ada8b8ddc3d5
+EBUILD squid-3.1.0.15_beta.ebuild 6784 RMD160 73c7a434c480206838bfbb2aa471653723ac4a98 SHA1 1c0b036ed983a3fd74adacfe2b3cdf9f3aff1501 SHA256 9b034ed7223d7a611a5310dd0c3a3193cf4610c29b76f28e2d1c1723b77c752b
+MISC ChangeLog 63299 RMD160 a3075570d6ef7bc2522ccab51042d6cd6bfb0865 SHA1 8586b43e657d6b146c105242c6dd6a430b3dbd6f SHA256 d95672bd2ef5017007e92015f1c3f0b0b783a778aa547130d9aa4a952aa7dae0
 MISC metadata.xml 919 RMD160 b856eed05f8176a9acd50d22d1d9bf5659aa931d SHA1 7942c78c916c16982034ee5bd862cf417a97d1ac SHA256 04f29ce4a7c46e5b46edf51129540e2f960ea3cee9d248b4317161de3a78d27b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksRGNEACgkQ9A5kJBGSrsvC9gCfctA/DS8A7nrF8eLdOGKio8Hd
+AEwAn2/BuEvi9YWyEUQhRnyKFiAtPw8T
+=pry3
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch
new file mode 100644
index 000000000000..cab36cf494e8
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.20-adapted-zph.patch
@@ -0,0 +1,207 @@
+diff -Nru squid-3.0.STABLE20.orig/src/cf.data.pre squid-3.0.STABLE20/src/cf.data.pre
+--- squid-3.0.STABLE20.orig/src/cf.data.pre	2009-11-28 10:11:48.000000000 +0100
++++ squid-3.0.STABLE20/src/cf.data.pre	2009-11-28 10:13:15.000000000 +0100
+@@ -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.STABLE20.orig/src/client_side_reply.cc squid-3.0.STABLE20/src/client_side_reply.cc
+--- squid-3.0.STABLE20.orig/src/client_side_reply.cc	2009-10-29 11:05:47.000000000 +0100
++++ squid-3.0.STABLE20/src/client_side_reply.cc	2009-11-28 10:13:15.000000000 +0100
+@@ -48,6 +48,7 @@
+ #include "ESI.h"
+ #endif
+ #include "MemObject.h"
++#include "fde.h"
+ #include "ACLChecklist.h"
+ #include "ACL.h"
+ #if DELAY_POOLS
+@@ -1549,6 +1550,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;
+@@ -1829,6 +1835,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.STABLE20.orig/src/fde.h squid-3.0.STABLE20/src/fde.h
+--- squid-3.0.STABLE20.orig/src/fde.h	2009-10-29 11:05:47.000000000 +0100
++++ squid-3.0.STABLE20/src/fde.h	2009-11-28 10:13:15.000000000 +0100
+@@ -106,7 +106,7 @@
+         long handle;
+     } win32;
+ #endif
+-
++    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
+ };
+ 
+ #endif /* SQUID_FDE_H */
+diff -Nru squid-3.0.STABLE20.orig/src/forward.cc squid-3.0.STABLE20/src/forward.cc
+--- squid-3.0.STABLE20.orig/src/forward.cc	2009-10-29 11:05:47.000000000 +0100
++++ squid-3.0.STABLE20/src/forward.cc	2009-11-28 10:13:15.000000000 +0100
+@@ -965,6 +965,57 @@
+ 
+     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)
++	              {
++	            	  union {
++			     unsigned char *pchar;
++			     int  *pint;
++			  } data;
++			  data.pchar = CMSG_DATA(o);
++	            	  clientFde->upstreamTOS = (unsigned char)*data.pint;
++	            	  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.STABLE20.orig/src/structs.h squid-3.0.STABLE20/src/structs.h
+--- squid-3.0.STABLE20.orig/src/structs.h	2009-10-29 11:05:48.000000000 +0100
++++ squid-3.0.STABLE20/src/structs.h	2009-11-28 10:13:15.000000000 +0100
+@@ -554,6 +554,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;
+     }
+@@ -722,6 +724,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.20-cross-compile.patch b/net-proxy/squid/files/squid-3.0.20-cross-compile.patch
new file mode 100644
index 000000000000..f48419bbf7c9
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.20-cross-compile.patch
@@ -0,0 +1,38 @@
+diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
+--- squid-3.0.STABLE20.orig/configure.in	2009-11-28 10:11:48.000000000 +0100
++++ squid-3.0.STABLE20/configure.in	2009-11-28 10:12:23.000000000 +0100
+@@ -1895,6 +1895,10 @@
+ 	;;
+ esac
+ 
++dnl Define HOSTCXX
++HOSTCXX="$build-g++"
++AC_SUBST(HOSTCXX)
++
+ dnl Check for programs
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+diff -Nru squid-3.0.STABLE20.orig/src/Makefile.am squid-3.0.STABLE20/src/Makefile.am
+--- squid-3.0.STABLE20.orig/src/Makefile.am	2009-11-28 10:11:48.000000000 +0100
++++ squid-3.0.STABLE20/src/Makefile.am	2009-11-28 10:12:23.000000000 +0100
+@@ -1011,6 +1011,8 @@
+ 
+ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
+ 
++HOSTCXX ?= @HOSTCXX@
++
+ $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
+ 
+ snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
+@@ -1034,6 +1036,11 @@
+ squid.conf.default: cf_parser.h
+ 	true
+ 
++cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
++	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
++		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
++		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
++
+ cf_parser.h: cf.data cf_gen$(EXEEXT)
+ 	./cf_gen cf.data $(srcdir)/cf.data.depend
+ 
diff --git a/net-proxy/squid/files/squid-3.0.20-gentoo.patch b/net-proxy/squid/files/squid-3.0.20-gentoo.patch
new file mode 100644
index 000000000000..f76e6e90829f
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.20-gentoo.patch
@@ -0,0 +1,293 @@
+diff -Nru squid-3.0.STABLE20.orig/acinclude.m4 squid-3.0.STABLE20/acinclude.m4
+--- squid-3.0.STABLE20.orig/acinclude.m4	2009-10-29 11:05:32.000000000 +0100
++++ squid-3.0.STABLE20/acinclude.m4	2009-11-28 10:10:44.000000000 +0100
+@@ -73,7 +73,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
+-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
+--- squid-3.0.STABLE20.orig/configure.in	2009-10-29 11:05:49.000000000 +0100
++++ squid-3.0.STABLE20/configure.in	2009-11-28 10:10:01.000000000 +0100
+@@ -15,9 +15,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
+@@ -177,13 +177,13 @@
+ dnl TODO: check if the problem will be present in any other newer MinGW release.
+     case "$host_os" in
+     mingw|mingw32)
+-        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ 	;;
+     *)
+-        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
++        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
+ 	;;
+     esac
+-    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ else
+     SQUID_CFLAGS=
+     SQUID_CXXFLAGS=
+diff -Nru squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE20/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/confload.c	2009-10-29 11:05:38.000000000 +0100
++++ squid-3.0.STABLE20/helpers/basic_auth/MSNT/confload.c	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-10-29 11:05:38.000000000 +0100
++++ squid-3.0.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE20/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am	2009-10-29 11:05:38.000000000 +0100
++++ squid-3.0.STABLE20/helpers/basic_auth/SMB/Makefile.am	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE20/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-10-29 11:05:38.000000000 +0100
++++ squid-3.0.STABLE20/helpers/basic_auth/SMB/smb_auth.sh	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE20/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE20.orig/helpers/external_acl/session/squid_session.8	2009-10-29 11:05:39.000000000 +0100
++++ squid-3.0.STABLE20/helpers/external_acl/session/squid_session.8	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-10-29 11:05:39.000000000 +0100
++++ squid-3.0.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE20/helpers/negotiate_auth/squid_kerb_auth/do.sh
+--- squid-3.0.STABLE20.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-10-29 11:05:42.000000000 +0100
++++ squid-3.0.STABLE20/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-11-28 10:10:01.000000000 +0100
+@@ -7,7 +7,7 @@
+ #
+ CC=gcc
+ #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
+-CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
++CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
+ if [ "$1" = "HEIMDAL" ]; then
+   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
+   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
+diff -Nru squid-3.0.STABLE20.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE20/lib/libTrie/acinclude.m4
+--- squid-3.0.STABLE20.orig/lib/libTrie/acinclude.m4	2009-10-29 11:05:44.000000000 +0100
++++ squid-3.0.STABLE20/lib/libTrie/acinclude.m4	2009-11-28 10:10:01.000000000 +0100
+@@ -9,7 +9,7 @@
+   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
+   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
+     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
+-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
+ res=$?
+ rm -f conftest.*
+ echo yes
+diff -Nru squid-3.0.STABLE20.orig/lib/libTrie/configure.in squid-3.0.STABLE20/lib/libTrie/configure.in
+--- squid-3.0.STABLE20.orig/lib/libTrie/configure.in	2009-10-29 11:05:44.000000000 +0100
++++ squid-3.0.STABLE20/lib/libTrie/configure.in	2009-11-28 10:10:01.000000000 +0100
+@@ -58,8 +58,8 @@
+ 
+ dnl set useful flags
+ if test "$GCC" = "yes"; then
+-   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+-   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
++   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
++   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
+ else
+    TRIE_CFLAGS=
+    TRIE_CXXFLAGS=
+diff -Nru squid-3.0.STABLE20.orig/src/cf.data.pre squid-3.0.STABLE20/src/cf.data.pre
+--- squid-3.0.STABLE20.orig/src/cf.data.pre	2009-10-29 11:05:47.000000000 +0100
++++ squid-3.0.STABLE20/src/cf.data.pre	2009-11-28 10:10:01.000000000 +0100
+@@ -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
+@@ -3296,11 +3304,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
+@@ -5250,6 +5258,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.STABLE20.orig/src/debug.cc squid-3.0.STABLE20/src/debug.cc
+--- squid-3.0.STABLE20.orig/src/debug.cc	2009-10-29 11:05:47.000000000 +0100
++++ squid-3.0.STABLE20/src/debug.cc	2009-11-28 10:10:01.000000000 +0100
+@@ -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.STABLE20.orig/src/defines.h squid-3.0.STABLE20/src/defines.h
+--- squid-3.0.STABLE20.orig/src/defines.h	2009-10-29 11:05:47.000000000 +0100
++++ squid-3.0.STABLE20/src/defines.h	2009-11-28 10:10:01.000000000 +0100
+@@ -218,7 +218,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.STABLE20.orig/src/main.cc squid-3.0.STABLE20/src/main.cc
+--- squid-3.0.STABLE20.orig/src/main.cc	2009-10-29 11:05:48.000000000 +0100
++++ squid-3.0.STABLE20/src/main.cc	2009-11-28 10:10:01.000000000 +0100
+@@ -1490,7 +1490,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());
+@@ -1534,7 +1534,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);
+@@ -1542,7 +1542,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.STABLE20.orig/src/Makefile.am squid-3.0.STABLE20/src/Makefile.am
+--- squid-3.0.STABLE20.orig/src/Makefile.am	2009-10-29 11:05:46.000000000 +0100
++++ squid-3.0.STABLE20/src/Makefile.am	2009-11-28 10:10:01.000000000 +0100
+@@ -995,12 +995,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.1.0.13_beta-cve-2009-2855.patch b/net-proxy/squid/files/squid-3.1.0.13_beta-cve-2009-2855.patch
deleted file mode 100644
index 5c3818c5e489..000000000000
--- a/net-proxy/squid/files/squid-3.1.0.13_beta-cve-2009-2855.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nru squid-3.1.0.13.orig/src/HttpHeaderTools.cc squid-3.1.0.13/src/HttpHeaderTools.cc
---- squid-3.1.0.13.orig/src/HttpHeaderTools.cc	2009-08-04 15:32:12.000000000 +0200
-+++ squid-3.1.0.13/src/HttpHeaderTools.cc	2009-08-22 11:59:17.000000000 +0200
-@@ -229,6 +229,10 @@
- strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos)
- {
-     size_t len;
-+    /* ',' is always enabled as field delimiter as this is required for
-+     * processing merged header values properly, even if Cookie normally
-+     * uses ';' as delimiter.
-+    */
-     static char delim[3][8] = {
-         "\"?,",
-         "\"\\",
-@@ -256,19 +260,16 @@
-     do {
-         *pos += strcspn(*pos, delim[quoted]);
- 
--        if (**pos == del)
--            break;
--
-         if (**pos == '"') {
-             quoted = !quoted;
-             *pos += 1;
--        }
--
--        if (quoted && **pos == '\\') {
-+        } else if (quoted && **pos == '\\') {
-             *pos += 1;
- 
-             if (**pos)
-                 *pos += 1;
-+        } else {
-+            break;		/* Delimiter found, marking the end of this value */
-         }
-     } while (**pos);
- 
diff --git a/net-proxy/squid/files/squid-3.1.0.13_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.15_beta-gentoo.patch
index 987665b272b8..0003fe37a4bc 100644
--- a/net-proxy/squid/files/squid-3.1.0.13_beta-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.1.0.15_beta-gentoo.patch
@@ -1,18 +1,18 @@
-diff -Nru squid-3.1.0.13.orig/acinclude.m4 squid-3.1.0.13/acinclude.m4
---- squid-3.1.0.13.orig/acinclude.m4	2009-08-04 15:32:06.000000000 +0200
-+++ squid-3.1.0.13/acinclude.m4	2009-08-22 12:05:53.000000000 +0200
-@@ -73,7 +73,7 @@
+diff -Nru squid-3.1.0.15.orig/acinclude.m4 squid-3.1.0.15/acinclude.m4
+--- squid-3.1.0.15.orig/acinclude.m4	2009-11-23 04:09:49.000000000 +0100
++++ squid-3.1.0.15/acinclude.m4	2009-11-28 10:40:46.000000000 +0100
+@@ -74,7 +74,7 @@
    AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
    AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
+     ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
+-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
  res=$?
  rm -f conftest.*
  echo yes
-diff -Nru squid-3.1.0.13.orig/configure.in squid-3.1.0.13/configure.in
---- squid-3.1.0.13.orig/configure.in	2009-08-22 12:05:19.000000000 +0200
-+++ squid-3.1.0.13/configure.in	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/configure.in squid-3.1.0.15/configure.in
+--- squid-3.1.0.15.orig/configure.in	2009-11-23 04:11:00.000000000 +0100
++++ squid-3.1.0.15/configure.in	2009-11-28 10:40:46.000000000 +0100
 @@ -16,9 +16,9 @@
  PRESET_LDFLAGS="$LDFLAGS"
  
@@ -26,26 +26,9 @@ diff -Nru squid-3.1.0.13.orig/configure.in squid-3.1.0.13/configure.in
  
  dnl Check for GNU cc
  AC_PROG_CC
-@@ -259,13 +259,13 @@
- dnl TODO: check if the problem will be present in any other newer MinGW release.
-     case "$host_os" in
-     mingw|mingw32)
--        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- 	;;
-     *)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
- 	;;
-     esac
--    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-     SQUID_CFLAGS=
-     SQUID_CXXFLAGS=
-diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.13/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.0.13.orig/helpers/basic_auth/MSNT/confload.c	2009-08-04 15:32:09.000000000 +0200
-+++ squid-3.1.0.13/helpers/basic_auth/MSNT/confload.c	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.15/helpers/basic_auth/MSNT/confload.c
+--- squid-3.1.0.15.orig/helpers/basic_auth/MSNT/confload.c	2009-11-23 04:09:55.000000000 +0100
++++ squid-3.1.0.15/helpers/basic_auth/MSNT/confload.c	2009-11-28 10:40:46.000000000 +0100
 @@ -27,7 +27,7 @@
  
  /* Path to configuration file */
@@ -55,9 +38,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.13/
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.13/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.0.13.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-08-04 15:32:09.000000000 +0200
-+++ squid-3.1.0.13/helpers/basic_auth/MSNT/msntauth.conf.default	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.15/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.1.0.15.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-11-23 04:09:55.000000000 +0100
++++ squid-3.1.0.15/helpers/basic_auth/MSNT/msntauth.conf.default	2009-11-28 10:40:46.000000000 +0100
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -67,9 +50,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/MSNT/msntauth.conf.default squi
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.13.orig/helpers/basic_auth/SMB/Makefile.am	2009-08-04 15:32:09.000000000 +0200
-+++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.1.0.15.orig/helpers/basic_auth/SMB/Makefile.am	2009-11-23 04:09:56.000000000 +0100
++++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am	2009-11-28 10:40:46.000000000 +0100
 @@ -16,7 +16,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -79,9 +62,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.13/
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.13/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.0.13.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-08-04 15:32:09.000000000 +0200
-+++ squid-3.1.0.13/helpers/basic_auth/SMB/smb_auth.sh	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.15/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.1.0.15.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-11-23 04:09:56.000000000 +0100
++++ squid-3.1.0.15/helpers/basic_auth/SMB/smb_auth.sh	2009-11-28 10:40:46.000000000 +0100
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -100,9 +83,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.13/
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -Nru squid-3.1.0.13.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.13/helpers/external_acl/session/squid_session.8
---- squid-3.1.0.13.orig/helpers/external_acl/session/squid_session.8	2009-08-04 15:32:09.000000000 +0200
-+++ squid-3.1.0.13/helpers/external_acl/session/squid_session.8	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.15/helpers/external_acl/session/squid_session.8
+--- squid-3.1.0.15.orig/helpers/external_acl/session/squid_session.8	2009-11-23 04:09:57.000000000 +0100
++++ squid-3.1.0.15/helpers/external_acl/session/squid_session.8	2009-11-28 10:40:46.000000000 +0100
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -112,9 +95,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/external_acl/session/squid_session.8 squid
  .IP
  acl session external session
  .IP
-diff -Nru squid-3.1.0.13.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.13/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.0.13.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-08-04 15:32:10.000000000 +0200
-+++ squid-3.1.0.13/helpers/external_acl/unix_group/squid_unix_group.8	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.15/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.1.0.15.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-11-23 04:09:57.000000000 +0100
++++ squid-3.1.0.15/helpers/external_acl/unix_group/squid_unix_group.8	2009-11-28 10:40:46.000000000 +0100
 @@ -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
@@ -124,9 +107,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/external_acl/unix_group/squid_unix_group.8
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-08-04 15:32:10.000000000 +0200
-+++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-11-23 04:09:58.000000000 +0100
++++ squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-11-28 10:40:46.000000000 +0100
 @@ -17,6 +17,7 @@
  
  AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
@@ -135,7 +118,7 @@ diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.i
  AC_CONFIG_SRCDIR([squid_kerb_auth.c])
  
  AC_PROG_CC
-@@ -531,7 +532,7 @@
+@@ -529,7 +530,7 @@
  dnl set variable for use in automakefile(s)
  AM_CONDITIONAL(HAVE_SPNEGO, test x"$ac_cv_have_spnego" = x"yes" )
  
@@ -144,9 +127,9 @@ diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.i
  for ac_cv_my_cflag in $MY_CFLAGS; do
  echo "int main()
    {
-diff -Nru squid-3.1.0.13.orig/lib/libTrie/acinclude.m4 squid-3.1.0.13/lib/libTrie/acinclude.m4
---- squid-3.1.0.13.orig/lib/libTrie/acinclude.m4	2009-08-04 15:32:11.000000000 +0200
-+++ squid-3.1.0.13/lib/libTrie/acinclude.m4	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/lib/libTrie/acinclude.m4 squid-3.1.0.15/lib/libTrie/acinclude.m4
+--- squid-3.1.0.15.orig/lib/libTrie/acinclude.m4	2009-11-23 04:09:59.000000000 +0100
++++ squid-3.1.0.15/lib/libTrie/acinclude.m4	2009-11-28 10:40:46.000000000 +0100
 @@ -9,7 +9,7 @@
    AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
    AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
@@ -156,9 +139,9 @@ diff -Nru squid-3.1.0.13.orig/lib/libTrie/acinclude.m4 squid-3.1.0.13/lib/libTri
  res=$?
  rm -f conftest.*
  echo yes
-diff -Nru squid-3.1.0.13.orig/lib/libTrie/configure.in squid-3.1.0.13/lib/libTrie/configure.in
---- squid-3.1.0.13.orig/lib/libTrie/configure.in	2009-08-04 15:32:11.000000000 +0200
-+++ squid-3.1.0.13/lib/libTrie/configure.in	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/lib/libTrie/configure.in squid-3.1.0.15/lib/libTrie/configure.in
+--- squid-3.1.0.15.orig/lib/libTrie/configure.in	2009-11-23 04:09:59.000000000 +0100
++++ squid-3.1.0.15/lib/libTrie/configure.in	2009-11-28 10:40:46.000000000 +0100
 @@ -59,8 +59,8 @@
  
  dnl set useful flags
@@ -170,10 +153,10 @@ diff -Nru squid-3.1.0.13.orig/lib/libTrie/configure.in squid-3.1.0.13/lib/libTri
  else
     TRIE_CFLAGS=
     TRIE_CXXFLAGS=
-diff -Nru squid-3.1.0.13.orig/src/cf.data.pre squid-3.1.0.13/src/cf.data.pre
---- squid-3.1.0.13.orig/src/cf.data.pre	2009-08-04 15:32:16.000000000 +0200
-+++ squid-3.1.0.13/src/cf.data.pre	2009-08-22 12:06:21.000000000 +0200
-@@ -708,6 +708,7 @@
+diff -Nru squid-3.1.0.15.orig/src/cf.data.pre squid-3.1.0.15/src/cf.data.pre
+--- squid-3.1.0.15.orig/src/cf.data.pre	2009-11-23 04:10:08.000000000 +0100
++++ squid-3.1.0.15/src/cf.data.pre	2009-11-28 10:40:46.000000000 +0100
+@@ -718,6 +718,7 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
  acl Safe_ports port 777		# multiling http
@@ -181,7 +164,7 @@ diff -Nru squid-3.1.0.13.orig/src/cf.data.pre squid-3.1.0.13/src/cf.data.pre
  acl CONNECT method CONNECT
  NOCOMMENT_END
  DOC_END
-@@ -851,6 +852,9 @@
+@@ -867,6 +868,9 @@
  http_access allow localnet
  http_access allow localhost
  
@@ -191,7 +174,7 @@ diff -Nru squid-3.1.0.13.orig/src/cf.data.pre squid-3.1.0.13/src/cf.data.pre
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3942,11 +3946,11 @@
+@@ -3969,11 +3973,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -205,7 +188,7 @@ diff -Nru squid-3.1.0.13.orig/src/cf.data.pre squid-3.1.0.13/src/cf.data.pre
  DOC_END
  
  NAME: mail_from
-@@ -6243,7 +6247,7 @@
+@@ -6267,7 +6271,7 @@
  NAME: forwarded_for
  COMMENT: on|off|transparent|truncate|delete
  TYPE: string
@@ -214,9 +197,9 @@ diff -Nru squid-3.1.0.13.orig/src/cf.data.pre squid-3.1.0.13/src/cf.data.pre
  LOC: opt_forwarded_for
  DOC_START
  	If set to "on", Squid will append your client's IP address
-diff -Nru squid-3.1.0.13.orig/src/debug.cc squid-3.1.0.13/src/debug.cc
---- squid-3.1.0.13.orig/src/debug.cc	2009-08-04 15:32:16.000000000 +0200
-+++ squid-3.1.0.13/src/debug.cc	2009-08-22 12:05:53.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/src/debug.cc squid-3.1.0.15/src/debug.cc
+--- squid-3.1.0.15.orig/src/debug.cc	2009-11-23 04:10:09.000000000 +0100
++++ squid-3.1.0.15/src/debug.cc	2009-11-28 10:40:46.000000000 +0100
 @@ -452,7 +452,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
@@ -226,10 +209,10 @@ diff -Nru squid-3.1.0.13.orig/src/debug.cc squid-3.1.0.13/src/debug.cc
  
  #endif /* HAVE_SYSLOG */
  
-diff -Nru squid-3.1.0.13.orig/src/main.cc squid-3.1.0.13/src/main.cc
---- squid-3.1.0.13.orig/src/main.cc	2009-08-04 15:32:17.000000000 +0200
-+++ squid-3.1.0.13/src/main.cc	2009-08-22 12:05:53.000000000 +0200
-@@ -1533,7 +1533,7 @@
+diff -Nru squid-3.1.0.15.orig/src/main.cc squid-3.1.0.15/src/main.cc
+--- squid-3.1.0.15.orig/src/main.cc	2009-11-23 04:10:10.000000000 +0100
++++ squid-3.1.0.15/src/main.cc	2009-11-28 10:40:46.000000000 +0100
+@@ -1529,7 +1529,7 @@
      if (*(argv[0]) == '(')
          return;
  
@@ -238,7 +221,7 @@ diff -Nru squid-3.1.0.13.orig/src/main.cc squid-3.1.0.13/src/main.cc
  
      if ((pid = fork()) < 0)
          syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1577,7 +1577,7 @@
+@@ -1573,7 +1573,7 @@
  
          if ((pid = fork()) == 0) {
              /* child */
@@ -247,7 +230,7 @@ diff -Nru squid-3.1.0.13.orig/src/main.cc squid-3.1.0.13/src/main.cc
              prog = xstrdup(argv[0]);
              argv[0] = xstrdup("(squid)");
              execvp(prog, argv);
-@@ -1585,7 +1585,7 @@
+@@ -1581,7 +1581,7 @@
          }
  
          /* parent */
@@ -256,10 +239,10 @@ diff -Nru squid-3.1.0.13.orig/src/main.cc squid-3.1.0.13/src/main.cc
  
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
-diff -Nru squid-3.1.0.13.orig/src/Makefile.am squid-3.1.0.13/src/Makefile.am
---- squid-3.1.0.13.orig/src/Makefile.am	2009-08-04 15:32:13.000000000 +0200
-+++ squid-3.1.0.13/src/Makefile.am	2009-08-22 12:05:53.000000000 +0200
-@@ -636,7 +636,6 @@
+diff -Nru squid-3.1.0.15.orig/src/Makefile.am squid-3.1.0.15/src/Makefile.am
+--- squid-3.1.0.15.orig/src/Makefile.am	2009-11-23 04:10:01.000000000 +0100
++++ squid-3.1.0.15/src/Makefile.am	2009-11-28 10:50:22.000000000 +0100
+@@ -638,7 +638,6 @@
  
  sysconf_DATA = \
  	squid.conf.default \
@@ -267,10 +250,10 @@ diff -Nru squid-3.1.0.13.orig/src/Makefile.am squid-3.1.0.13/src/Makefile.am
  	mime.conf.default
  
  data_DATA = \
-@@ -711,8 +710,8 @@
+@@ -718,8 +717,8 @@
  DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
- DEFAULT_PID_FILE        = @DEFAULT_PIDFILE@
+ DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
 -DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
 -DEFAULT_SWAP_DIR        = $(localstatedir)/cache
 +DEFAULT_NETDB_FILE      = $(localstatedir)/run/netdb.state
@@ -278,21 +261,21 @@ diff -Nru squid-3.1.0.13.orig/src/Makefile.am squid-3.1.0.13/src/Makefile.am
  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)/'`
-@@ -746,7 +745,7 @@
- 	true
- 
- squid.conf.default: squid.conf.documented
--	$(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default
-+	cp squid.conf.documented squid.conf.default
- 
- cf_parser.h: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
-@@ -800,8 +799,6 @@
+@@ -797,13 +796,11 @@
+ 	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+ 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ 	else \
+-	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+-	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
++	        echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
++	        $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
  	fi
- 	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
- 	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
+-	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
+-	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
 -	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
 -	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
++	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
++	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
  	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
  
- uninstall-local:
+ uninstall-local: squid.conf.default
diff --git a/net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch b/net-proxy/squid/files/squid-3.1.0.15_beta-qafixes.patch
index bea2d6f279c6..370ab7dc2b44 100644
--- a/net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch
+++ b/net-proxy/squid/files/squid-3.1.0.15_beta-qafixes.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-09-19 13:30:54.000000000 +0200
-+++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-09-19 13:33:38.000000000 +0200
+diff -Nru squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.0.15.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-11-28 10:51:49.000000000 +0100
++++ squid-3.1.0.15/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-11-28 10:52:03.000000000 +0100
 @@ -94,7 +94,7 @@
                         else
                           ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
@@ -37,19 +37,10 @@ diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.i
                       else
                           for lib in $ac_gss_libs; do
                              AC_CHECK_LIB($lib,main)
-@@ -425,6 +425,8 @@
-   [ squid_dir=$withval ]
- )
- 
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- eval ac_p_include=$includedir
- CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
- AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
-diff -Nru squid-3.1.0.13.orig/src/forward.cc squid-3.1.0.13/src/forward.cc
---- squid-3.1.0.13.orig/src/forward.cc	2009-08-04 15:32:17.000000000 +0200
-+++ squid-3.1.0.13/src/forward.cc	2009-09-19 13:33:38.000000000 +0200
-@@ -995,7 +995,12 @@
+diff -Nru squid-3.1.0.15.orig/src/forward.cc squid-3.1.0.15/src/forward.cc
+--- squid-3.1.0.15.orig/src/forward.cc	2009-11-23 04:10:09.000000000 +0100
++++ squid-3.1.0.15/src/forward.cc	2009-11-28 10:52:03.000000000 +0100
+@@ -999,7 +999,12 @@
                          break;
  
                      if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
@@ -63,29 +54,3 @@ diff -Nru squid-3.1.0.13.orig/src/forward.cc squid-3.1.0.13/src/forward.cc
                          break;
                      }
                      p += CMSG_LEN(o->cmsg_len);
-diff -Nru squid-3.1.0.13.orig/src/ftp.cc squid-3.1.0.13/src/ftp.cc
---- squid-3.1.0.13.orig/src/ftp.cc	2009-08-04 15:32:17.000000000 +0200
-+++ squid-3.1.0.13/src/ftp.cc	2009-09-19 13:33:38.000000000 +0200
-@@ -534,16 +534,18 @@
- void
- FtpStateData::loginParser(const char *login, int escaped)
- {
--    char *s = NULL;
-+    const char *s = NULL;
-     debugs(9, 4, HERE << ": login='" << login << "', escaped=" << escaped);
-     debugs(9, 9, HERE << ": IN : login='" << login << "', escaped=" << escaped << ", user=" << user << ", password=" << password);
- 
-     if ((s = strchr(login, ':'))) {
--        *s = '\0';
--
-         /* if there was a username part */
-         if (s > login) {
--            xstrncpy(user, login, MAX_URL);
-+	    int len = s - login;
-+	    if (len > MAX_URL)
-+		len = MAX_URL;
-+            xstrncpy(user, login, len);
-+	    user[len] = '\0';
-             if (escaped)
-                 rfc1738_unescape(user);
-         }
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index 59c96bc67f42..cc145bd55e64 100644
--- a/net-proxy/squid/files/squid.initd
+++ b/net-proxy/squid/files/squid.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.12 2009/10/25 08:35:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.13 2009/11/28 12:32:58 mrness Exp $
 
 opts="${opts} reload rotate"
 
@@ -89,24 +89,27 @@ start() {
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	/usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf
-	# Now we have to wait until squid has _really_ stopped.
-	sleep 1
-	if [ -f /var/run/${SVCNAME}.pid ] ; then
-		einfon "Waiting for squid to shutdown ."
-		cnt=0
-		while [ -f /var/run/${SVCNAME}.pid ] ; do
-			cnt=$(expr $cnt + 1)
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				break
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
+	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+		# Now we have to wait until squid has _really_ stopped.
+		sleep 1
+		if [ -f /var/run/${SVCNAME}.pid ] ; then
+			einfon "Waiting for squid to shutdown ."
+			cnt=0
+			while [ -f /var/run/${SVCNAME}.pid ] ; do
+				cnt=$(expr $cnt + 1)
+				if [ $cnt -gt 60 ] ; then
+					# Waited 120 seconds now. Fail.
+					echo
+					eend 1 "Failed."
+					break
+				fi
+				sleep 2
+				echo -n "."
+			done
+			echo
+		fi
+	else
+		eerror "Squid shutdown failed, probably service is already down."
 	fi
 	eend 0
 }
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
index 40bf525af217..255ec8dfbf74 100644
--- a/net-proxy/squid/files/squid.initd-logrotate
+++ b/net-proxy/squid/files/squid.initd-logrotate
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.10 2009/10/25 08:35:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.11 2009/11/28 12:32:58 mrness Exp $
 
 opts="${opts} reload"
 
@@ -89,24 +89,27 @@ start() {
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	/usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf
-	# Now we have to wait until squid has _really_ stopped.
-	sleep 1
-	if [ -f /var/run/${SVCNAME}.pid ] ; then
-		einfon "Waiting for squid to shutdown ."
-		cnt=0
-		while [ -f /var/run/${SVCNAME}.pid ] ; do
-			cnt=$(expr $cnt + 1)
-			if [ $cnt -gt 60 ] ; then
-				# Waited 120 seconds now. Fail.
-				echo
-				eend 1 "Failed."
-				break
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
+	if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+		# Now we have to wait until squid has _really_ stopped.
+		sleep 1
+		if [ -f /var/run/${SVCNAME}.pid ] ; then
+			einfon "Waiting for squid to shutdown ."
+			cnt=0
+			while [ -f /var/run/${SVCNAME}.pid ] ; do
+				cnt=$(expr $cnt + 1)
+				if [ $cnt -gt 60 ] ; then
+					# Waited 120 seconds now. Fail.
+					echo
+					eend 1 "Failed."
+					break
+				fi
+				sleep 2
+				echo -n "."
+			done
+			echo
+		fi
+	else
+		eerror "Squid shutdown failed, probably service is already down."
 	fi
 	eend 0
 }
diff --git a/net-proxy/squid/squid-3.0.20.ebuild b/net-proxy/squid/squid-3.0.20.ebuild
new file mode 100644
index 000000000000..10f82d5f19da
--- /dev/null
+++ b/net-proxy/squid/squid-3.0.20.ebuild
@@ -0,0 +1,195 @@
+# 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-3.0.20.ebuild,v 1.1 2009/11/28 12:32:59 mrness Exp $
+
+EAPI="2"
+
+inherit eutils pam toolchain-funcs autotools
+
+# 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+	mysql postgres sqlite \
+	zero-penalty-hit \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux +epoll"
+
+DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
+	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 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+S="${WORKDIR}/${S_PP}"
+
+pkg_setup() {
+	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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="getpwnam,NCSA,MSNT"
+	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	use sasl && basic_modules="SASL,${basic_modules}"
+	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
+	use radius && basic_modules="squid_radius_auth,${basic_modules}"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules="DB,${basic_modules}"
+	fi
+
+	local digest_modules="password"
+	use ldap && digest_modules="ldap,${digest_modules}"
+
+	local ext_helpers="ip_user,session,unix_group"
+	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local ntlm_helpers="fakeauth"
+	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
+
+	local negotiate_helpers=
+	use kerberos && local negotiate_helpers="squid_kerb_auth"
+
+	local myconf=""
+
+	# 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
+			$(use_enable epoll)"
+	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		myconf="${myconf} $(use_enable kqueue)"
+		if use pf-transparent; then
+			myconf="${myconf} --enable-pf-transparent"
+		elif use ipf-transparent; then
+			myconf="${myconf} --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--datadir=/usr/share/squid \
+		--with-default-user=squid \
+		--enable-auth="basic,digest,negotiate,ntlm" \
+		--enable-removal-policies="lru,heap" \
+		--enable-digest-auth-helpers="${digest_modules}" \
+		--enable-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-large-files \
+		--with-filedescriptors=8192 \
+		$(use_enable caps) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable icap-client) \
+		${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	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}"
+	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
+}
diff --git a/net-proxy/squid/squid-3.1.0.13_beta-r2.ebuild b/net-proxy/squid/squid-3.1.0.15_beta.ebuild
index 5e3a8ebc199a..52e2abbeb025 100644
--- a/net-proxy/squid/squid-3.1.0.13_beta-r2.ebuild
+++ b/net-proxy/squid/squid-3.1.0.15_beta.ebuild
@@ -1,6 +1,6 @@
 # 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-3.1.0.13_beta-r2.ebuild,v 1.1 2009/09/19 11:58:15 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.15_beta.ebuild,v 1.1 2009/11/28 12:32:59 mrness Exp $
 
 EAPI="2"
 
@@ -13,11 +13,13 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P/_beta}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate test \
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux +epoll"
+RESTRICT=test
 
 COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	pam? ( virtual/pam )
@@ -25,6 +27,7 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
 	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap )
 	selinux? ( sec-policy/selinux-squid )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
@@ -56,8 +59,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3-capability.patch
-	epatch "${FILESDIR}"/${P}-cve-2009-2855.patch
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-qafixes.patch
 
@@ -79,6 +80,9 @@ src_configure() {
 		basic_modules="DB,${basic_modules}"
 	fi
 
+	local digest_modules="password"
+	use ldap && digest_modules="ldap,${digest_modules}"
+
 	local ext_helpers="ip_user,session,unix_group"
 	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
 	use ldap && ext_helpers="ldap_group,${ext_helpers}"
@@ -116,12 +120,13 @@ src_configure() {
 		--sysconfdir=/etc/squid \
 		--libexecdir=/usr/libexec/squid \
 		--localstatedir=/var \
+		--with-pidfile=/var/run/squid.pid \
 		--datadir=/usr/share/squid \
 		--with-logdir=/var/log/squid \
 		--with-default-user=squid \
 		--enable-auth="basic,digest,negotiate,ntlm" \
 		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
+		--enable-digest-auth-helpers="${digest_modules}" \
 		--enable-basic-auth-helpers="${basic_modules}" \
 		--enable-external-acl-helpers="${ext_helpers}" \
 		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
@@ -133,11 +138,13 @@ src_configure() {
 		--enable-arp-acl \
 		--with-large-files \
 		--with-filedescriptors=8192 \
+		--disable-strict-error-checking \
 		$(use_enable caps) \
 		$(use_enable ipv6) \
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		$(use_enable icap-client) \
+		$(use_enable ecap) \
 		$(use_enable zero-penalty-hit zph-qos) \
 		${myconf} || die "econf failed"
 }