Remove obsolete versions. Version bump (#180067). Add qos patch and USE flag (#180067).

Package-Manager: portage-2.1.2.7

14 files changed, 413 insertions, 1067 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index c2e7bca558ff..5c8c704a7f8d 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.136 2007/04/24 21:59:38 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.137 2007/05/28 05:07:21 mrness Exp $
+
+*squid-2.6.13 (28 May 2007)
+
+  28 May 2007; Alin Năstac <mrness@gentoo.org>
+  -files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch,
+  -files/squid-2.6.9-gentoo.patch,
+  -files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch,
+  -files/squid-2.6.10-gentoo.patch,
+  +files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch,
+  +files/squid-2.6.13-gentoo.patch, +files/squid-2.6.13-qos.patch,
+  -squid-2.6.7.ebuild, -squid-2.6.9-r1.ebuild, -squid-2.6.10.ebuild,
+  +squid-2.6.13.ebuild:
+  Remove obsolete versions. Version bump (#180067). Add qos patch and USE flag
+  (#180067).
 
   24 Apr 2007; Alexander Færøy <eroyf@gentoo.org> squid-2.6.12.ebuild:
   Stable on MIPS
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 883b875d65dc..aa37a7710fbe 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,14 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX squid-2.6.10-ToS_Hit_ToS_Preserve.patch 7810 RMD160 45479e58ed0b67a2b52fe34dfa1995ac24ed6279 SHA1 7911b167d79e07e1892b0fdce342482bfdb35c47 SHA256 9b542ce11aecbb8f4d322dbb840793bb9195dc21c358f343300b2a1c9344f06c
-MD5 769f1e0a72be23004d4a292cd88d5c8c files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch 7810
-RMD160 45479e58ed0b67a2b52fe34dfa1995ac24ed6279 files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch 7810
-SHA256 9b542ce11aecbb8f4d322dbb840793bb9195dc21c358f343300b2a1c9344f06c files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch 7810
-AUX squid-2.6.10-gentoo.patch 13128 RMD160 08b3b0d13151bf46b4037c0fe8cc8a9d0a91a8b7 SHA1 b2f498997943910b9a232b57dda98ca99c00ca32 SHA256 dc46d7933e7e145b85bde70b0ac394ade8965f450ff9d37160425501aa6ef375
-MD5 d25035c85129f8f083c2d6ada254d41f files/squid-2.6.10-gentoo.patch 13128
-RMD160 08b3b0d13151bf46b4037c0fe8cc8a9d0a91a8b7 files/squid-2.6.10-gentoo.patch 13128
-SHA256 dc46d7933e7e145b85bde70b0ac394ade8965f450ff9d37160425501aa6ef375 files/squid-2.6.10-gentoo.patch 13128
 AUX squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810 RMD160 f5c1cf54dca620f540baf842f1e677ec7f325c8c SHA1 8ed0aa5aacdb9cf44644d8259e9fa8186a06841b SHA256 d7b081c72063e3a64d9abb583ba1bc520089fea4e451d646eade30dc81bc44f5
 MD5 35dbafcc1b37d853f836a267b2035756 files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810
 RMD160 f5c1cf54dca620f540baf842f1e677ec7f325c8c files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810
@@ -17,14 +9,18 @@ AUX squid-2.6.12-gentoo.patch 13104 RMD160 0ef584b87d199401aa4f0003858adc255fe47
 MD5 7977fabee86c22278b059e9a8eaca6c7 files/squid-2.6.12-gentoo.patch 13104
 RMD160 0ef584b87d199401aa4f0003858adc255fe47d28 files/squid-2.6.12-gentoo.patch 13104
 SHA256 8e95e00ce6244f2414dbf02c88d70f35a680b71a62a9fcd2539bba4b8b7f5f56 files/squid-2.6.12-gentoo.patch 13104
-AUX squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794 RMD160 768c087050681d20d8fa680c1d3e1264ac1863fb SHA1 7e270c59eb25145add5f112a174978cd669419ec SHA256 0ab6611c2cd6fe5f7b57385d7b86b58c6b6aa7158de007d8d56d0546a49892dc
-MD5 e310b7604b6d8da5fa03f4ad4973d2a5 files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
-RMD160 768c087050681d20d8fa680c1d3e1264ac1863fb files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
-SHA256 0ab6611c2cd6fe5f7b57385d7b86b58c6b6aa7158de007d8d56d0546a49892dc files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch 7794
-AUX squid-2.6.9-gentoo.patch 13084 RMD160 8eb5948fcbc73118373cc0ac9cb7ba0cefc87e39 SHA1 3d09fb88e74a4c7a90def35982751d6079ec90e8 SHA256 dfda498807b0adc85ba0e7b1bc628f019577f932e3f4a45f58e1dadc2803f76d
-MD5 d582aa8ccd44542c4dbcaf71b50a1a67 files/squid-2.6.9-gentoo.patch 13084
-RMD160 8eb5948fcbc73118373cc0ac9cb7ba0cefc87e39 files/squid-2.6.9-gentoo.patch 13084
-SHA256 dfda498807b0adc85ba0e7b1bc628f019577f932e3f4a45f58e1dadc2803f76d files/squid-2.6.9-gentoo.patch 13084
+AUX squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810 RMD160 273973cc1f5072a21410ae11b7da3e1996467bb6 SHA1 c4f0bf1a177f3d13d6f3d9012902b3d1458fd2ce SHA256 68248b85f59e743a4944575b95a6d7d8f31ff48947bec6bb6d5845a6bcd55553
+MD5 beecfea2c05de23050e344666bc6fae0 files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810
+RMD160 273973cc1f5072a21410ae11b7da3e1996467bb6 files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810
+SHA256 68248b85f59e743a4944575b95a6d7d8f31ff48947bec6bb6d5845a6bcd55553 files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810
+AUX squid-2.6.13-gentoo.patch 13104 RMD160 61f3fb7dd3d07fb13378dedce2d656bd49e26a91 SHA1 722784ffa932d2a3898c662901f07452d3ed1b6c SHA256 b00ac55600f700a9be6a67ad694072e1f54666e3bc9e1a01b59e8b30cbfbcb49
+MD5 0eef467fb46939a84386cb2b3ce47bb1 files/squid-2.6.13-gentoo.patch 13104
+RMD160 61f3fb7dd3d07fb13378dedce2d656bd49e26a91 files/squid-2.6.13-gentoo.patch 13104
+SHA256 b00ac55600f700a9be6a67ad694072e1f54666e3bc9e1a01b59e8b30cbfbcb49 files/squid-2.6.13-gentoo.patch 13104
+AUX squid-2.6.13-qos.patch 9677 RMD160 2f0446dd7e76d9d3779d3f191c2dc50e792063fb SHA1 49b3794bb00ba28537caa4c29f830c52f6076513 SHA256 0e041ae5cc2461f2b2a1592fab46ea4ff6dae2df43fb10ae27ec88d5eaee35cc
+MD5 103dd991681d1d0ee65cb565a00e3218 files/squid-2.6.13-qos.patch 9677
+RMD160 2f0446dd7e76d9d3779d3f191c2dc50e792063fb files/squid-2.6.13-qos.patch 9677
+SHA256 0e041ae5cc2461f2b2a1592fab46ea4ff6dae2df43fb10ae27ec88d5eaee35cc files/squid-2.6.13-qos.patch 9677
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
@@ -49,51 +45,34 @@ AUX squid.pam 315 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 SHA1 f694dbc62
 MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315
 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 files/squid.pam 315
 SHA256 dec9bd5ea16977fa334db04eb657e0598af411dad7ff279acf86beddcd22a8fd files/squid.pam 315
-DIST squid-2.6.STABLE10.tar.gz 1626611 RMD160 470ce18f02a4628f021924fb0bc79a8e600284c5 SHA1 dbc0e816283ed740083e648e9ef679acca5c8be0 SHA256 29b2700786c0e92cfdb733d30edcfa23c600657d8f6dff59f2e7cb77168606a8
 DIST squid-2.6.STABLE12.tar.gz 1626994 RMD160 8e9463969064312b5f2fbe83b039be09646efbed SHA1 06a733cc04ba894cf4f7621278a1145b8e5807f9 SHA256 b4a1dd476371327369894ff73f729e5a24ec76b07f40a823cf04ca5c1210fc42
-DIST squid-2.6.STABLE7-patches-20070116.tar.gz 7165 RMD160 4df56f7a82d0462537ed0a9c16943c99df5d3f4b SHA1 3ce0fff6708c2bdec0d286568f4cd279611a1350 SHA256 2ef51e75fc6c01d2613e6db7a2ecc4661718d8239a6d80ff42a510757ef90d1d
-DIST squid-2.6.STABLE7.tar.gz 1624607 RMD160 78715604c7dff188f0ee957e97c983ed90a770e6 SHA1 a84d80bc12d812503254f99dc969c6886c0584a0 SHA256 c4e2cdc1c01b33e1c25db01e09e12193f91fc47f74553ef89c369374c2699c61
-DIST squid-2.6.STABLE9.tar.gz 1625942 RMD160 293ac5ad2d40f50c42fbee64576f12b72d493c8e SHA1 ba09f5cb4aadc535d63bb0fda564fcacb67b2e4c SHA256 8d68c61eb07c2cdaf82d9b6a4babff3eade3ae864cb1f094b7115086b20d070e
-EBUILD squid-2.6.10.ebuild 6144 RMD160 e5cf2a9a40d819268a9cc030bfbfe004a4e766c1 SHA1 102df36b6b6071d7eef7538adef1a460877e573c SHA256 cd2381102bc532b03e703839b3194a2c4c0e9e5ee5341254dcbd9c5be6d78fe9
-MD5 ab50d8eed92e66727b8456a9e23fb1dd squid-2.6.10.ebuild 6144
-RMD160 e5cf2a9a40d819268a9cc030bfbfe004a4e766c1 squid-2.6.10.ebuild 6144
-SHA256 cd2381102bc532b03e703839b3194a2c4c0e9e5ee5341254dcbd9c5be6d78fe9 squid-2.6.10.ebuild 6144
+DIST squid-2.6.STABLE13.tar.gz 1627479 RMD160 6a01a10482ed1ce9715ae89905629472103bd394 SHA1 6e5783c928325b3652a5a7ffb5b167318d5937f1 SHA256 1c32265ec15af7cfa28dec12f356c9abcb1c38ecf97de263674bb61732d4076b
 EBUILD squid-2.6.12.ebuild 6135 RMD160 47895fbd209fb6d2b8f47e9214a82647332744ae SHA1 b06a5ee4b832214e5ed51f834e68d3ab0b11e0e2 SHA256 d336b2c5797cd9f73f382217a612a8869d45b35d93ec4abdd6a8bb47719b6e89
 MD5 67dd998ba1081c2335b89283dca076b4 squid-2.6.12.ebuild 6135
 RMD160 47895fbd209fb6d2b8f47e9214a82647332744ae squid-2.6.12.ebuild 6135
 SHA256 d336b2c5797cd9f73f382217a612a8869d45b35d93ec4abdd6a8bb47719b6e89 squid-2.6.12.ebuild 6135
-EBUILD squid-2.6.7.ebuild 6071 RMD160 1c91ed9abdea7f1f06b0211635d4ced136ef7835 SHA1 6cb3c7cfa4775812e3be59bc63ca77a4faa878c4 SHA256 cca9c9eb4a52f5600210198ff6250751de65334e19b17d5fa5c1bf677e008579
-MD5 9821afa2318f7a6d9195a6c2e4c92048 squid-2.6.7.ebuild 6071
-RMD160 1c91ed9abdea7f1f06b0211635d4ced136ef7835 squid-2.6.7.ebuild 6071
-SHA256 cca9c9eb4a52f5600210198ff6250751de65334e19b17d5fa5c1bf677e008579 squid-2.6.7.ebuild 6071
-EBUILD squid-2.6.9-r1.ebuild 6146 RMD160 50a61da6d730b1957698594a8f665efe709706d0 SHA1 b8d042aa49a11b09fcf08d8d224c4986d8e3bf3a SHA256 af3437302a20971112487bf2a7c6b6f6df80cdbdfedebeff8005639682c66f5f
-MD5 99774bf2027e55bd250ba2718db71633 squid-2.6.9-r1.ebuild 6146
-RMD160 50a61da6d730b1957698594a8f665efe709706d0 squid-2.6.9-r1.ebuild 6146
-SHA256 af3437302a20971112487bf2a7c6b6f6df80cdbdfedebeff8005639682c66f5f squid-2.6.9-r1.ebuild 6146
-MISC ChangeLog 34266 RMD160 82233ddf39c119edd792b1e3419657191462e743 SHA1 a6660c9e634aa7669f199081cdaf988ae92e02d9 SHA256 265bef94e0fb79e97f6423118b877555ba43ccd825ebbe2285c48cb225cb153b
-MD5 c4cb5893721f6319c6ebe9c9edb1557a ChangeLog 34266
-RMD160 82233ddf39c119edd792b1e3419657191462e743 ChangeLog 34266
-SHA256 265bef94e0fb79e97f6423118b877555ba43ccd825ebbe2285c48cb225cb153b ChangeLog 34266
+EBUILD squid-2.6.13.ebuild 6196 RMD160 f2fbbbac872f8bbb78ecac5c80636a1fbe153c36 SHA1 76b0214e962cbc05e1bc718532e759c7766d9512 SHA256 00906da2086175a2a9f05ebdab67c5478036f76e6a8bc75fce7235f416921172
+MD5 d5c9637c45f0e6bce64c5f32a2500374 squid-2.6.13.ebuild 6196
+RMD160 f2fbbbac872f8bbb78ecac5c80636a1fbe153c36 squid-2.6.13.ebuild 6196
+SHA256 00906da2086175a2a9f05ebdab67c5478036f76e6a8bc75fce7235f416921172 squid-2.6.13.ebuild 6196
+MISC ChangeLog 34817 RMD160 910b55d82f4f94f63290843a2d42e0de56b1d3f9 SHA1 5b9ae848d1e4df4a2d0402e3e4785b367727e3d7 SHA256 d90e06e8ab2b82ce790d81571a0d6021fc2c75fd871c6db10e019a8e399f551d
+MD5 68c83a8dbb90665b5f1b8f30d4456037 ChangeLog 34817
+RMD160 910b55d82f4f94f63290843a2d42e0de56b1d3f9 ChangeLog 34817
+SHA256 d90e06e8ab2b82ce790d81571a0d6021fc2c75fd871c6db10e019a8e399f551d ChangeLog 34817
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87 metadata.xml 229
-MD5 944329597da4181599efc6f43877d2f9 files/digest-squid-2.6.10 259
-RMD160 7a7bbe1c0453d92362749b89bded87157489747d files/digest-squid-2.6.10 259
-SHA256 26b19e1f953b9cab2fab9662e4035adbd8a530babe7f59a984310206e55b878a files/digest-squid-2.6.10 259
 MD5 1c58d840387efb4b97f84ee057e5011d files/digest-squid-2.6.12 259
 RMD160 ce91ceb53561121e1b79405277b23a2a327cbd5b files/digest-squid-2.6.12 259
 SHA256 4c277802753ea30ca9be81361e42899274a072f082d06cc793a352bcf7fec253 files/digest-squid-2.6.12 259
-MD5 5a1e44725f0f6da3a63f95721a3fe4e0 files/digest-squid-2.6.7 554
-RMD160 be687a353ce0c44ae93e2c4a986af23f0dda7e12 files/digest-squid-2.6.7 554
-SHA256 dbfcd684010150818fae13125c64f85b792786a412ac4d58703b8a437468b689 files/digest-squid-2.6.7 554
-MD5 abce45f2679e15f9efb147ed7492b6bd files/digest-squid-2.6.9-r1 256
-RMD160 d75f3cc9f3a1889d5d91ce2cc41e9a983955f9e8 files/digest-squid-2.6.9-r1 256
-SHA256 9ed721fecb9f6488cf0dc959522f0f515f315e7c1641bd164917cfea2e75d58f files/digest-squid-2.6.9-r1 256
+MD5 bece67ae4733616c75ab2c6b864a23c2 files/digest-squid-2.6.13 259
+RMD160 dcd0886e50bfed9cbbb470ee2c2bcb6ebf7c4dbd files/digest-squid-2.6.13 259
+SHA256 04d841d3dc6bf9aad0831ec3ecb08ef55aeb12fc23dec3d3c500e804d5d90dfc files/digest-squid-2.6.13 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGLn1t6Xxn2nLwtdQRAuk2AKCXXkKGsdCk12me5cD4v7j1/xrHuwCgotK0
-PFsqF9VYs+XRUcqQnWnesh0=
-=UqVw
+iD8DBQFGWmOUJnxX6mF440QRAsTUAKCZrufTVdJjxB3gkoVhTp7RG4F/BACg6+dA
+xuqwE7JsQViQ6fdWAVga9uY=
+=CIHE
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.10 b/net-proxy/squid/files/digest-squid-2.6.10
deleted file mode 100644
index 8803fc85ecd7..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2b5efbaf6f95f94ab4a71914a86ace0 squid-2.6.STABLE10.tar.gz 1626611
-RMD160 470ce18f02a4628f021924fb0bc79a8e600284c5 squid-2.6.STABLE10.tar.gz 1626611
-SHA256 29b2700786c0e92cfdb733d30edcfa23c600657d8f6dff59f2e7cb77168606a8 squid-2.6.STABLE10.tar.gz 1626611
diff --git a/net-proxy/squid/files/digest-squid-2.6.13 b/net-proxy/squid/files/digest-squid-2.6.13
new file mode 100644
index 000000000000..8c0450fef0ef
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-2.6.13
@@ -0,0 +1,3 @@
+MD5 f152224c3edbc0acbb85565c1942332b squid-2.6.STABLE13.tar.gz 1627479
+RMD160 6a01a10482ed1ce9715ae89905629472103bd394 squid-2.6.STABLE13.tar.gz 1627479
+SHA256 1c32265ec15af7cfa28dec12f356c9abcb1c38ecf97de263674bb61732d4076b squid-2.6.STABLE13.tar.gz 1627479
diff --git a/net-proxy/squid/files/digest-squid-2.6.7 b/net-proxy/squid/files/digest-squid-2.6.7
deleted file mode 100644
index d05ea8833ca4..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.7
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c0bd145ab3f00fe81f653569062dfce4 squid-2.6.STABLE7-patches-20070116.tar.gz 7165
-RMD160 4df56f7a82d0462537ed0a9c16943c99df5d3f4b squid-2.6.STABLE7-patches-20070116.tar.gz 7165
-SHA256 2ef51e75fc6c01d2613e6db7a2ecc4661718d8239a6d80ff42a510757ef90d1d squid-2.6.STABLE7-patches-20070116.tar.gz 7165
-MD5 dee0f75f561169b8ea8009e833110dd1 squid-2.6.STABLE7.tar.gz 1624607
-RMD160 78715604c7dff188f0ee957e97c983ed90a770e6 squid-2.6.STABLE7.tar.gz 1624607
-SHA256 c4e2cdc1c01b33e1c25db01e09e12193f91fc47f74553ef89c369374c2699c61 squid-2.6.STABLE7.tar.gz 1624607
diff --git a/net-proxy/squid/files/digest-squid-2.6.9-r1 b/net-proxy/squid/files/digest-squid-2.6.9-r1
deleted file mode 100644
index 2f5006a40c5e..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8580e473e894b531e9b5ae97144fda7 squid-2.6.STABLE9.tar.gz 1625942
-RMD160 293ac5ad2d40f50c42fbee64576f12b72d493c8e squid-2.6.STABLE9.tar.gz 1625942
-SHA256 8d68c61eb07c2cdaf82d9b6a4babff3eade3ae864cb1f094b7115086b20d070e squid-2.6.STABLE9.tar.gz 1625942
diff --git a/net-proxy/squid/files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch b/net-proxy/squid/files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch
index 36d2ec5b4c7a..9edb6be9ee4f 100644
--- a/net-proxy/squid/files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch
+++ b/net-proxy/squid/files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE10.orig/src/cf.data.pre squid-2.6.STABLE10/src/cf.data.pre
---- squid-2.6.STABLE10.orig/src/cf.data.pre	2007-03-10 10:16:19.000000000 +0200
-+++ squid-2.6.STABLE10/src/cf.data.pre	2007-03-10 10:16:55.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/cf.data.pre squid-2.6.STABLE13/src/cf.data.pre
+--- squid-2.6.STABLE13.orig/src/cf.data.pre	2007-05-28 07:27:37.000000000 +0300
++++ squid-2.6.STABLE13/src/cf.data.pre	2007-05-28 07:28:11.000000000 +0300
 @@ -3193,6 +3193,64 @@
  	to off when using this directive in such configurations.
  DOC_END
@@ -66,9 +66,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/cf.data.pre squid-2.6.STABLE10/src/cf.data
  NAME: tcp_outgoing_address
  TYPE: acl_address
  DEFAULT: none
-diff -Nru squid-2.6.STABLE10.orig/src/client_side.c squid-2.6.STABLE10/src/client_side.c
---- squid-2.6.STABLE10.orig/src/client_side.c	2007-03-10 10:16:19.000000000 +0200
-+++ squid-2.6.STABLE10/src/client_side.c	2007-03-10 10:16:55.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/client_side.c squid-2.6.STABLE13/src/client_side.c
+--- squid-2.6.STABLE13.orig/src/client_side.c	2007-05-28 07:27:37.000000000 +0300
++++ squid-2.6.STABLE13/src/client_side.c	2007-05-28 07:28:11.000000000 +0300
 @@ -2621,6 +2621,55 @@
  	return;
      }
@@ -125,10 +125,10 @@ diff -Nru squid-2.6.STABLE10.orig/src/client_side.c squid-2.6.STABLE10/src/clien
      rep = http->reply = clientBuildReply(http, buf, size);
      if (!rep) {
  	/* Forward as HTTP/0.9 body with no reply */
-diff -Nru squid-2.6.STABLE10.orig/src/http.c squid-2.6.STABLE10/src/http.c
---- squid-2.6.STABLE10.orig/src/http.c	2007-02-27 00:41:46.000000000 +0200
-+++ squid-2.6.STABLE10/src/http.c	2007-03-10 10:16:55.000000000 +0200
-@@ -1373,6 +1373,53 @@
+diff -Nru squid-2.6.STABLE13.orig/src/http.c squid-2.6.STABLE13/src/http.c
+--- squid-2.6.STABLE13.orig/src/http.c	2007-03-27 02:08:00.000000000 +0300
++++ squid-2.6.STABLE13/src/http.c	2007-05-28 07:28:11.000000000 +0300
+@@ -1389,6 +1389,53 @@
      peer *p = httpState->peer;
      CWCB *sendHeaderDone;
      int fd = httpState->fd;
@@ -182,9 +182,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/http.c squid-2.6.STABLE10/src/http.c
  
      debug(11, 5) ("httpSendRequest: FD %d: httpState %p.\n", fd, httpState);
  
-diff -Nru squid-2.6.STABLE10.orig/src/structs.h squid-2.6.STABLE10/src/structs.h
---- squid-2.6.STABLE10.orig/src/structs.h	2007-02-27 03:20:01.000000000 +0200
-+++ squid-2.6.STABLE10/src/structs.h	2007-03-10 10:16:55.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/structs.h squid-2.6.STABLE13/src/structs.h
+--- squid-2.6.STABLE13.orig/src/structs.h	2007-04-27 02:11:51.000000000 +0300
++++ squid-2.6.STABLE13/src/structs.h	2007-05-28 07:28:11.000000000 +0300
 @@ -669,6 +669,8 @@
  	int relaxed_header_parser;
  	int accel_no_pmtu_disc;
diff --git a/net-proxy/squid/files/squid-2.6.10-gentoo.patch b/net-proxy/squid/files/squid-2.6.13-gentoo.patch
index 72bcb9e65fef..f2c9e0f4d064 100644
--- a/net-proxy/squid/files/squid-2.6.10-gentoo.patch
+++ b/net-proxy/squid/files/squid-2.6.13-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE10/helpers/basic_auth/SMB/Makefile.am
---- squid-2.6.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 19:56:26.000000000 +0300
-+++ squid-2.6.STABLE10/helpers/basic_auth/SMB/Makefile.am	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE13/helpers/basic_auth/SMB/Makefile.am
+--- squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 19:56:26.000000000 +0300
++++ squid-2.6.STABLE13/helpers/basic_auth/SMB/Makefile.am	2007-05-28 07:26:25.000000000 +0300
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -10,9 +10,9 @@ diff -Nru squid-2.6.STABLE10.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.S
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-2.6.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE10/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.6.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
-+++ squid-2.6.STABLE10/helpers/basic_auth/SMB/smb_auth.sh	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE13/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
++++ squid-2.6.STABLE13/helpers/basic_auth/SMB/smb_auth.sh	2007-05-28 07:26:25.000000000 +0300
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -31,9 +31,9 @@ diff -Nru squid-2.6.STABLE10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.S
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -Nru squid-2.6.STABLE10.orig/snmplib/snmp_api.c squid-2.6.STABLE10/snmplib/snmp_api.c
---- squid-2.6.STABLE10.orig/snmplib/snmp_api.c	2006-06-02 20:32:44.000000000 +0300
-+++ squid-2.6.STABLE10/snmplib/snmp_api.c	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/snmplib/snmp_api.c squid-2.6.STABLE13/snmplib/snmp_api.c
+--- squid-2.6.STABLE13.orig/snmplib/snmp_api.c	2006-06-02 20:32:44.000000000 +0300
++++ squid-2.6.STABLE13/snmplib/snmp_api.c	2007-05-28 07:26:25.000000000 +0300
 @@ -121,7 +121,7 @@
  }
  
@@ -43,9 +43,9 @@ diff -Nru squid-2.6.STABLE10.orig/snmplib/snmp_api.c squid-2.6.STABLE10/snmplib/
   * the input pdu.  length is the length of the input packet.  If any errors
   * are encountered, NULL is returned.  If not, the community is.
   */
-diff -Nru squid-2.6.STABLE10.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE10/src/auth/digest/auth_digest.c
---- squid-2.6.STABLE10.orig/src/auth/digest/auth_digest.c	2006-07-31 02:27:04.000000000 +0300
-+++ squid-2.6.STABLE10/src/auth/digest/auth_digest.c	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE13/src/auth/digest/auth_digest.c
+--- squid-2.6.STABLE13.orig/src/auth/digest/auth_digest.c	2006-07-31 02:27:04.000000000 +0300
++++ squid-2.6.STABLE13/src/auth/digest/auth_digest.c	2007-05-28 07:26:25.000000000 +0300
 @@ -1271,7 +1271,7 @@
      nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
      if (!nonce) {
@@ -66,9 +66,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE
  	authDigestLogUsername(auth_user_request, username);
  
  	/* we don't need the scheme specific data anymore */
-diff -Nru squid-2.6.STABLE10.orig/src/cf.data.pre squid-2.6.STABLE10/src/cf.data.pre
---- squid-2.6.STABLE10.orig/src/cf.data.pre	2007-02-03 23:59:24.000000000 +0200
-+++ squid-2.6.STABLE10/src/cf.data.pre	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/cf.data.pre squid-2.6.STABLE13/src/cf.data.pre
+--- squid-2.6.STABLE13.orig/src/cf.data.pre	2007-04-25 00:30:03.000000000 +0300
++++ squid-2.6.STABLE13/src/cf.data.pre	2007-05-28 07:26:25.000000000 +0300
 @@ -344,12 +344,12 @@
  NAME: htcp_port
  IFDEF: USE_HTCP
@@ -172,10 +172,10 @@ diff -Nru squid-2.6.STABLE10.orig/src/cf.data.pre squid-2.6.STABLE10/src/cf.data
  DOC_END
  
  NAME: snmp_access
-diff -Nru squid-2.6.STABLE10.orig/src/client_side.c squid-2.6.STABLE10/src/client_side.c
---- squid-2.6.STABLE10.orig/src/client_side.c	2007-02-27 04:08:10.000000000 +0200
-+++ squid-2.6.STABLE10/src/client_side.c	2007-03-10 10:15:12.000000000 +0200
-@@ -4589,14 +4589,7 @@
+diff -Nru squid-2.6.STABLE13.orig/src/client_side.c squid-2.6.STABLE13/src/client_side.c
+--- squid-2.6.STABLE13.orig/src/client_side.c	2007-03-20 23:26:34.000000000 +0200
++++ squid-2.6.STABLE13/src/client_side.c	2007-05-28 07:26:25.000000000 +0300
+@@ -4591,14 +4591,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)) {
@@ -190,9 +190,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/client_side.c squid-2.6.STABLE10/src/clien
  	    /* Note: This does not automatically fflush the log file.. */
  	}
  	debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-diff -Nru squid-2.6.STABLE10.orig/src/defines.h squid-2.6.STABLE10/src/defines.h
---- squid-2.6.STABLE10.orig/src/defines.h	2007-02-04 00:58:20.000000000 +0200
-+++ squid-2.6.STABLE10/src/defines.h	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/defines.h squid-2.6.STABLE13/src/defines.h
+--- squid-2.6.STABLE13.orig/src/defines.h	2007-02-04 00:58:20.000000000 +0200
++++ squid-2.6.STABLE13/src/defines.h	2007-05-28 07:26:25.000000000 +0300
 @@ -259,7 +259,7 @@
  
  /* were to look for errors if config path fails */
@@ -202,9 +202,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/defines.h squid-2.6.STABLE10/src/defines.h
  #endif
  
  /* gb_type operations */
-diff -Nru squid-2.6.STABLE10.orig/src/delay_pools.c squid-2.6.STABLE10/src/delay_pools.c
---- squid-2.6.STABLE10.orig/src/delay_pools.c	2006-10-23 14:22:21.000000000 +0300
-+++ squid-2.6.STABLE10/src/delay_pools.c	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/delay_pools.c squid-2.6.STABLE13/src/delay_pools.c
+--- squid-2.6.STABLE13.orig/src/delay_pools.c	2006-10-23 14:22:21.000000000 +0300
++++ squid-2.6.STABLE13/src/delay_pools.c	2007-05-28 07:26:25.000000000 +0300
 @@ -613,7 +613,7 @@
  }
  
@@ -214,9 +214,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/delay_pools.c squid-2.6.STABLE10/src/delay
   * class is disabled - it's more efficient to just do it than to do all
   * the checks.
   */
-diff -Nru squid-2.6.STABLE10.orig/src/main.c squid-2.6.STABLE10/src/main.c
---- squid-2.6.STABLE10.orig/src/main.c	2007-02-03 23:55:42.000000000 +0200
-+++ squid-2.6.STABLE10/src/main.c	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/main.c squid-2.6.STABLE13/src/main.c
+--- squid-2.6.STABLE13.orig/src/main.c	2007-03-13 00:25:40.000000000 +0200
++++ squid-2.6.STABLE13/src/main.c	2007-05-28 07:26:25.000000000 +0300
 @@ -372,6 +372,22 @@
      asnFreeMemory();
  }
@@ -276,27 +276,28 @@ diff -Nru squid-2.6.STABLE10.orig/src/main.c squid-2.6.STABLE10/src/main.c
      if ((pid = fork()) < 0)
  	syslog(LOG_ALERT, "fork failed: %s", xstrerror());
      else if (pid > 0)
-@@ -1008,14 +1028,14 @@
+@@ -1008,7 +1028,7 @@
  	mainStartScript(argv[0]);
  	if ((pid = fork()) == 0) {
  	    /* child */
 -	    openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+	    openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
++	    openlog(appname, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
  	    prog = xstrdup(argv[0]);
  	    argv[0] = xstrdup("(squid)");
  	    execvp(prog, argv);
- 	    syslog(LOG_ALERT, "execvp failed: %s", xstrerror());
+@@ -1016,7 +1036,7 @@
+ 	    exit(1);
  	}
  	/* parent */
 -	openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+	openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
++	openlog(appname, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
  	syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  	time(&start);
  	squid_signal(SIGINT, SIG_IGN, SA_RESTART);
-diff -Nru squid-2.6.STABLE10.orig/src/Makefile.am squid-2.6.STABLE10/src/Makefile.am
---- squid-2.6.STABLE10.orig/src/Makefile.am	2006-10-30 02:07:33.000000000 +0200
-+++ squid-2.6.STABLE10/src/Makefile.am	2007-03-10 10:15:12.000000000 +0200
-@@ -314,12 +314,12 @@
+diff -Nru squid-2.6.STABLE13.orig/src/Makefile.am squid-2.6.STABLE13/src/Makefile.am
+--- squid-2.6.STABLE13.orig/src/Makefile.am	2007-05-06 01:06:55.000000000 +0300
++++ squid-2.6.STABLE13/src/Makefile.am	2007-05-28 07:26:25.000000000 +0300
+@@ -320,12 +320,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
  DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -312,9 +313,9 @@ diff -Nru squid-2.6.STABLE10.orig/src/Makefile.am squid-2.6.STABLE10/src/Makefil
  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 -Nru squid-2.6.STABLE10.orig/src/mib.txt squid-2.6.STABLE10/src/mib.txt
---- squid-2.6.STABLE10.orig/src/mib.txt	2006-09-22 05:49:24.000000000 +0300
-+++ squid-2.6.STABLE10/src/mib.txt	2007-03-10 10:15:12.000000000 +0200
+diff -Nru squid-2.6.STABLE13.orig/src/mib.txt squid-2.6.STABLE13/src/mib.txt
+--- squid-2.6.STABLE13.orig/src/mib.txt	2006-09-22 05:49:24.000000000 +0300
++++ squid-2.6.STABLE13/src/mib.txt	2007-05-28 07:26:25.000000000 +0300
 @@ -314,7 +314,7 @@
                  MAX-ACCESS read-only
                  STATUS current
diff --git a/net-proxy/squid/files/squid-2.6.13-qos.patch b/net-proxy/squid/files/squid-2.6.13-qos.patch
new file mode 100644
index 000000000000..b77deb289f8e
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.6.13-qos.patch
@@ -0,0 +1,311 @@
+diff -Nru squid-2.6.STABLE13.orig/src/cache_cf.c squid-2.6.STABLE13/src/cache_cf.c
+--- squid-2.6.STABLE13.orig/src/cache_cf.c	2007-02-27 00:45:24.000000000 +0200
++++ squid-2.6.STABLE13/src/cache_cf.c	2007-05-28 07:30:55.000000000 +0300
+@@ -888,6 +888,65 @@
+     }
+ }
+ 
++CBDATA_TYPE(acl_priority);
++
++static void
++dump_acl_priority(StoreEntry * entry, const char *name, acl_priority * head)
++{
++    acl_priority *l;
++    for (l = head; l; l = l->next) {
++	if (l->priority > 0)
++	    storeAppendPrintf(entry, "%s %04X:%04X", name,
++	                      l->priority >> 16, l->priority & 0xFFFF);
++	else
++	    storeAppendPrintf(entry, "%s none", name);
++	dump_acl_list(entry, l->acl_list);
++	storeAppendPrintf(entry, "\n");
++    }
++}
++
++static void
++freed_acl_priority(void *data)
++{
++    acl_priority *l = data;
++    aclDestroyAclList(&l->acl_list);
++}
++
++static void
++parse_acl_priority(acl_priority ** head)
++{
++    acl_priority *l;
++    acl_priority **tail = head;	/* sane name below */
++    unsigned long priority, t1, t2;
++    char junk;
++    char *token = strtok(NULL, w_space);
++    if (!token)
++	self_destruct();
++    if (sscanf(token, "%x:%x%c", &t1, &t2, &junk) != 2)
++	self_destruct();
++    if (t1 < 0 || t1 > 0xFFFF || t2 < 0 || t2 > 0xFFFF)
++	self_destruct();
++    priority = t1 << 16 | t2;
++    CBDATA_INIT_TYPE_FREECB(acl_priority, freed_acl_priority);
++    l = cbdataAlloc(acl_priority);
++    l->priority = priority;
++    aclParseAclList(&l->acl_list);
++    while (*tail)
++	tail = &(*tail)->next;
++    *tail = l;
++}
++
++static void
++free_acl_priority(acl_priority ** head)
++{
++    while (*head) {
++	acl_priority *l = *head;
++	*head = l->next;
++	l->next = NULL;
++	cbdataFree(l);
++    }
++}
++
+ #if DELAY_POOLS
+ 
+ /* do nothing - free_delay_pool_count is the magic free function.
+diff -Nru squid-2.6.STABLE13.orig/src/cf.data.pre squid-2.6.STABLE13/src/cf.data.pre
+--- squid-2.6.STABLE13.orig/src/cf.data.pre	2007-05-28 07:28:57.000000000 +0300
++++ squid-2.6.STABLE13/src/cf.data.pre	2007-05-28 07:30:55.000000000 +0300
+@@ -3251,6 +3251,27 @@
+ 	Default: 255 (TOS from server is not changed).
+ DOC_END
+ 
++NAME: tcp_outgoing_priority
++TYPE: acl_priority
++DEFAULT: none
++LOC: Config.accessList.outgoing_priority
++DOC_START
++	Allows you to select the priority of the outgoing connection, 
++	based on the username or source address making the request. The
++	priority can be used by Linux QoS Qdiscs for classification.
++
++	tcp_outgoing_priority priority [!]aclname ...
++
++	Example where requests from special_service_net are assigned
++	priority 10:100
++
++	acl special_service_net src 10.0.0.0/255.255.255.0
++	tcp_outgoing_priority 10:100 special_service_net
++
++	Processing proceeds in the order specified, and stops at first fully
++	matching line.
++DOC_END
++
+ NAME: tcp_outgoing_address
+ TYPE: acl_address
+ DEFAULT: none
+diff -Nru squid-2.6.STABLE13.orig/src/comm.c squid-2.6.STABLE13/src/comm.c
+--- squid-2.6.STABLE13.orig/src/comm.c	2007-04-17 12:39:56.000000000 +0300
++++ squid-2.6.STABLE13/src/comm.c	2007-05-28 07:30:55.000000000 +0300
+@@ -162,7 +162,7 @@
+     int flags,
+     const char *note)
+ {
+-    return comm_openex(sock_type, proto, addr, port, flags, 0, note);
++    return comm_openex(sock_type, proto, addr, port, flags, 0, 0, note);
+ }
+ 
+ 
+@@ -175,10 +175,12 @@
+     u_short port,
+     int flags,
+     unsigned char TOS,
++    unsigned long PRIORITY,
+     const char *note)
+ {
+     int new_socket;
+     int tos = 0;
++    unsigned long priority = 0;
+     fde *F = NULL;
+ 
+     /* Create socket for accepting new connections. */
+@@ -209,12 +211,25 @@
+ 	debug(5, 0) ("comm_open: setsockopt(IP_TOS) not supported on this platform\n");
+ #endif
+     }
++    if (PRIORITY) {
++#ifdef SO_PRIORITY
++	priority = PRIORITY;
++        enter_suid();
++	if (setsockopt(new_socket, SOL_SOCKET, SO_PRIORITY, (char *) &priority, sizeof(unsigned long)) < 0)
++		debug(50, 1) ("comm_open: setsockopt(SO_PRIORITY) on FD %d: %s\n",
++		new_socket, xstrerror());
++        leave_suid();
++#else
++	debug(50, 0) ("comm_open: setsockopt(SO_PRIORITY) not supported on this platform\n");
++#endif
++    }
+     /* update fdstat */
+     debug(5, 5) ("comm_open: FD %d is a new socket\n", new_socket);
+     fd_open(new_socket, FD_SOCKET, note);
+     F = &fd_table[new_socket];
+     F->local_addr = addr;
+     F->tos = tos;
++    F->priority = priority;
+     if (!(flags & COMM_NOCLOEXEC))
+ 	commSetCloseOnExec(new_socket);
+     if ((flags & COMM_REUSEADDR))
+@@ -382,6 +397,15 @@
+ 	        debug(5, 1) ("commResetFD: setsockopt(IP_TOS) on FD %d: %s\n", cs->fd, xstrerror());
+     }
+ #endif
++#ifdef SO_PRIORITY
++    if (F->priority) {
++        unsigned long priority = F->priority;
++        enter_suid();
++	if (setsockopt(cs->fd, SOL_SOCKET, SO_PRIORITY, (char *)&priority, sizeof(unsigned long)) < 0)
++		debug(50, 1) ("commResetFD: setsockopt(SO_PRIORITY) on FD %d: %s\n", cs->fd, xstrerror());
++        leave_suid();
++    }
++#endif
+     if (F->flags.close_on_exec)
+ 	commSetCloseOnExec(cs->fd);
+     if (F->flags.nonblocking)
+diff -Nru squid-2.6.STABLE13.orig/src/forward.c squid-2.6.STABLE13/src/forward.c
+--- squid-2.6.STABLE13.orig/src/forward.c	2007-04-17 12:35:17.000000000 +0300
++++ squid-2.6.STABLE13/src/forward.c	2007-05-28 07:30:55.000000000 +0300
+@@ -418,6 +418,17 @@
+     return 0;
+ }
+ 
++static unsigned long
++aclMapPriority(acl_priority * head, aclCheck_t * ch)
++{
++    acl_priority *l;
++    for (l = head; l; l = l->next) {
++        if (aclMatchAclList(l->acl_list, ch))
++            return l->priority;
++    }
++    return 0;
++}
++
+ struct in_addr
+ getOutgoingAddr(request_t * request)
+ {
+@@ -446,6 +457,20 @@
+     return aclMapTOS(Config.accessList.outgoing_tos, &ch);
+ }
+ 
++unsigned long
++getOutgoingPriority(request_t * request)
++{
++    aclCheck_t ch;
++    memset(&ch, '\0', sizeof(aclCheck_t));
++    if (request) {
++        ch.src_addr = request->client_addr;
++	ch.my_addr = request->my_addr;
++	ch.my_port = request->my_port;
++	ch.request = request;
++    }
++    return aclMapPriority(Config.accessList.outgoing_priority, &ch);
++}
++
+ static void
+ fwdConnectStart(void *data)
+ {
+@@ -462,6 +487,7 @@
+     int ftimeout = Config.Timeout.forward - (squid_curtime - fwdState->start);
+     struct in_addr outgoing;
+     unsigned short tos;
++    unsigned long priority;
+ #if LINUX_TPROXY
+     struct in_tproxy itp;
+ #endif
+@@ -547,15 +573,17 @@
+ #endif
+     outgoing = getOutgoingAddr(fwdState->request);
+     tos = getOutgoingTOS(fwdState->request);
++    priority = getOutgoingPriority(fwdState->request);
+ 
+-    debug(17, 3) ("fwdConnectStart: got addr %s, tos %d\n",
+-	inet_ntoa(outgoing), tos);
++    debug(17, 3) ("fwdConnectStart: got addr %s, tos %d, priority %lu\n",
++	inet_ntoa(outgoing), tos, priority);
+     fd = comm_openex(SOCK_STREAM,
+ 	IPPROTO_TCP,
+ 	outgoing,
+ 	0,
+ 	COMM_NONBLOCKING,
+ 	tos,
++	priority,
+ 	url);
+     if (fd < 0) {
+ 	debug(50, 4) ("fwdConnectStart: %s\n", xstrerror());
+diff -Nru squid-2.6.STABLE13.orig/src/protos.h squid-2.6.STABLE13/src/protos.h
+--- squid-2.6.STABLE13.orig/src/protos.h	2007-03-27 02:14:09.000000000 +0300
++++ squid-2.6.STABLE13/src/protos.h	2007-05-28 07:30:55.000000000 +0300
+@@ -160,7 +160,7 @@
+ extern void comm_init(void);
+ extern int comm_listen(int sock);
+ extern int comm_open(int, int, struct in_addr, u_short port, int, const char *note);
+-extern int comm_openex(int, int, struct in_addr, u_short, int, unsigned char TOS, const char *);
++extern int comm_openex(int, int, struct in_addr, u_short, int, unsigned char TOS, unsigned long PRIORITY, const char *);
+ extern u_short comm_local_port(int fd);
+ 
+ extern void commDeferFD(int fd);
+@@ -733,6 +733,7 @@
+ #endif
+ struct in_addr getOutgoingAddr(request_t * request);
+ unsigned long getOutgoingTOS(request_t * request);
++unsigned long getOutgoingPriority(request_t * request);
+ 
+ extern void urnStart(request_t *, StoreEntry *);
+ 
+diff -Nru squid-2.6.STABLE13.orig/src/ssl.c squid-2.6.STABLE13/src/ssl.c
+--- squid-2.6.STABLE13.orig/src/ssl.c	2007-02-03 23:53:38.000000000 +0200
++++ squid-2.6.STABLE13/src/ssl.c	2007-05-28 07:30:55.000000000 +0300
+@@ -524,6 +524,7 @@
+ 	0,
+ 	COMM_NONBLOCKING,
+ 	getOutgoingTOS(request),
+++	getOutgoingPriority(request),
+ 	url);
+     if (sock == COMM_ERROR) {
+ 	debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
+diff -Nru squid-2.6.STABLE13.orig/src/structs.h squid-2.6.STABLE13/src/structs.h
+--- squid-2.6.STABLE13.orig/src/structs.h	2007-05-28 07:28:57.000000000 +0300
++++ squid-2.6.STABLE13/src/structs.h	2007-05-28 07:30:55.000000000 +0300
+@@ -296,6 +296,12 @@
+     int tos;
+ };
+ 
++struct _acl_priority {
++    acl_priority *next;
++    acl_list *acl_list;
++    unsigned long priority;
++};
++
+ struct _aclCheck_t {
+     const acl_access *access_list;
+     struct in_addr src_addr;
+@@ -705,6 +711,7 @@
+ 	acl_access *reply;
+ 	acl_address *outgoing_address;
+ 	acl_tos *outgoing_tos;
++	acl_priority *outgoing_priority;
+ #if USE_HTCP
+ 	acl_access *htcp;
+ 	acl_access *htcp_clr;
+@@ -876,6 +883,7 @@
+     u_short remote_port;
+     struct in_addr local_addr;
+     unsigned char tos;
++    unsigned long priority;
+     char ipaddr[16];		/* dotted decimal address of peer */
+     char desc[FD_DESC_SZ];
+     struct {
+diff -Nru squid-2.6.STABLE13.orig/src/typedefs.h squid-2.6.STABLE13/src/typedefs.h
+--- squid-2.6.STABLE13.orig/src/typedefs.h	2006-09-02 17:08:42.000000000 +0300
++++ squid-2.6.STABLE13/src/typedefs.h	2007-05-28 07:30:55.000000000 +0300
+@@ -102,6 +102,7 @@
+ typedef struct _acl_access acl_access;
+ typedef struct _acl_address acl_address;
+ typedef struct _acl_tos acl_tos;
++typedef struct _acl_priority acl_priority;
+ typedef struct _aclCheck_t aclCheck_t;
+ typedef struct _wordlist wordlist;
+ typedef struct _intlist intlist;
diff --git a/net-proxy/squid/files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch b/net-proxy/squid/files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch
deleted file mode 100644
index 4cba6882845a..000000000000
--- a/net-proxy/squid/files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -Nru squid-2.6.STABLE9.orig/src/cf.data.pre squid-2.6.STABLE9/src/cf.data.pre
---- squid-2.6.STABLE9.orig/src/cf.data.pre	2007-01-27 08:18:53.000000000 +0200
-+++ squid-2.6.STABLE9/src/cf.data.pre	2007-01-27 08:19:12.000000000 +0200
-@@ -3191,6 +3191,64 @@
- 	to off when using this directive in such configurations.
- 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.
-+	Has no effect under FreeBSD, works only under linux ZPH patched
-+	kernels.
-+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.
-+	See zph_preserve_miss_tos for details.
-+	
-+	Default: 255 (TOS from server is not changed).
-+DOC_END
-+
- NAME: tcp_outgoing_address
- TYPE: acl_address
- DEFAULT: none
-diff -Nru squid-2.6.STABLE9.orig/src/client_side.c squid-2.6.STABLE9/src/client_side.c
---- squid-2.6.STABLE9.orig/src/client_side.c	2007-01-27 08:18:53.000000000 +0200
-+++ squid-2.6.STABLE9/src/client_side.c	2007-01-27 08:19:12.000000000 +0200
-@@ -2629,6 +2629,55 @@
- 	return;
-     }
-     assert(http->out.offset == 0);
-+	
-+	if ( Config.zph_tos_local || Config.zph_tos_peer ||
-+         (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask) )
-+    {
-+       int need_change = 0;
-+       int hit = 0;
-+       int tos = 0;
-+       int tos_old = 0;
-+       int tos_len = sizeof(tos_old);
-+       int res;
-+                   
-+       if (Config.zph_tos_local && isTcpHit(http->log_type)) {     /* local hit */
-+           hit = 1;
-+           tos = Config.zph_tos_local;
-+       } else if (Config.zph_tos_peer &&
-+           (http->request->hier.code == SIBLING_HIT ||             /* sibling hit */
-+           (Config.onoff.zph_tos_parent &&
-+           http->request->hier.code == PARENT_HIT))) {             /* parent hit */
-+           hit = 1;
-+           tos = Config.zph_tos_peer;
-+       }
-+       if (http->request->flags.proxy_keepalive) {
-+           if (getsockopt(fd, IPPROTO_IP, IP_TOS, &tos_old, &tos_len) < 0) {
-+               debug(33, 1) ("ZPH: getsockopt(IP_TOS) on FD %d: %s\n", fd, xstrerror());
-+           } else if (hit && tos_old != tos) {     /* HIT: 1-st request, or previous was MISS, */
-+               need_change = 1;                    /* or local/parent hit change */
-+           } else if (!hit && (tos_old ||  /* MISS: previous was HIT */
-+                            Config.onoff.zph_preserve_miss_tos)) { /* TOS copying is on */
-+#if defined(_SQUID_LINUX_)			    
-+                   if ( Config.onoff.zph_preserve_miss_tos ) {
-+                     tos = (entry->mem_obj != NULL) ?
-+                           (entry->mem_obj->recvTOS & Config.zph_preserve_miss_tos_mask):0;
-+                   } else tos = 0;
-+#else
-+		    tos = 0;
-+#endif		   
-+               need_change = 1;
-+           } 
-+       } else if (hit) {                           /* no keepalive */
-+           need_change = 1;
-+       }
-+       if (need_change) {
-+           if (!hit) enter_suid(); /* Setting TOS bit6-7 is privilleged */
-+           res = setsockopt(fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos));
-+           if (!hit) leave_suid(); /* Setting bit5-7 is privilleged */
-+           if ( res < 0)
-+               debug(33, 1) ("ZPH: setsockopt(IP_TOS) on FD %d: %s\n", fd, xstrerror());
-+       }
-+    }
-     rep = http->reply = clientBuildReply(http, buf, size);
-     if (!rep) {
- 	/* Forward as HTTP/0.9 body with no reply */
-diff -Nru squid-2.6.STABLE9.orig/src/http.c squid-2.6.STABLE9/src/http.c
---- squid-2.6.STABLE9.orig/src/http.c	2007-01-21 12:26:44.000000000 +0200
-+++ squid-2.6.STABLE9/src/http.c	2007-01-27 08:19:12.000000000 +0200
-@@ -1263,6 +1263,53 @@
-     peer *p = httpState->peer;
-     CWCB *sendHeaderDone;
-     int fd = httpState->fd;
-+    
-+#if defined(_SQUID_LINUX_)    
-+/* ZPH patch starts here (M.Stavrev 25-05-2005)
-+ * Retrieve connection peer's TOS value (which its SYN_ACK TCP segment
-+ * was encapsulated into an IP packet)
-+ */
-+    int tos, tos_len;
-+    if ( entry && entry->mem_obj ) { // Is this check necessary ? Seems not, but
-+				 // have no time to investigate further.
-+	    entry->mem_obj->recvTOS = 0;
-+	    tos = 1;
-+	    tos_len = sizeof(tos);
-+	 	if ( setsockopt(fd,SOL_IP, IP_RECVTOS, &tos, tos_len) == 0 ) {
-+		    unsigned char buf[128];
-+		    int len = 128;
-+		    if (getsockopt(fd, SOL_IP, IP_PKTOPTIONS, buf, &len) == 0)
-+		    {
-+		    	/* Parse the PKTOPTIONS structure to locate the TOS data message
-+		    	 * prepared in the kernel by the ZPH incoming TCP TOS preserving
-+		    	 * patch. In 99,99% the TOS should be located at buf[12], but
-+		    	 * let's do it the right way.
-+		    	 */
-+		    	unsigned char * p = buf;
-+		    	while ( p-buf < len ) {
-+		    		struct cmsghdr * o = (struct cmsghdr*)p;
-+		    		if ( o->cmsg_len <= 0 || o->cmsg_len > 52 )
-+		    		   break;
-+		    		if ( o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS ) {
-+	    			   entry->mem_obj->recvTOS = (unsigned char)(*(int*)
-+			    	   						(p + sizeof(struct cmsghdr)));
-+				       debug(11, 5) ("ZPH: Incomming TOS=%d on FD %d\n",
-+				       			entry->mem_obj->recvTOS, fd );
-+			    	   break;
-+		    		}
-+		    		p += o->cmsg_len;
-+		    	}
-+		    } else {
-+		    	debug(11, 5) ("ZPH: getsockopt(IP_PKTOPTIONS) on FD %d: %s\n",
-+		    				 fd, xstrerror());
-+		    }
-+		} else {
-+	    	debug(11, 5) ("ZPH: setsockopt(IP_RECVTOS) on FD %d: %s\n",
-+	    					 fd, xstrerror());
-+		}
-+    }
-+/* ZPH patch ends here */    
-+#endif
- 
-     debug(11, 5) ("httpSendRequest: FD %d: httpState %p.\n", fd, httpState);
- 
-diff -Nru squid-2.6.STABLE9.orig/src/structs.h squid-2.6.STABLE9/src/structs.h
---- squid-2.6.STABLE9.orig/src/structs.h	2007-01-21 12:26:44.000000000 +0200
-+++ squid-2.6.STABLE9/src/structs.h	2007-01-27 08:19:12.000000000 +0200
-@@ -669,6 +669,8 @@
- 	int relaxed_header_parser;
- 	int accel_no_pmtu_disc;
- 	int global_internal_static;
-+	int zph_tos_parent;
-+	int zph_preserve_miss_tos;	
- 	int httpd_suppress_version_string;
- 	int via;
- 	int check_hostnames;
-@@ -793,6 +795,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;    
-     errormap *errorMapList;
- #if USE_SSL
-     struct {
-@@ -1719,6 +1724,9 @@
-     const char *vary_encoding;
-     StoreEntry *ims_entry;
-     time_t refresh_timestamp;
-+#if defined(_SQUID_LINUX_)    
-+    unsigned char recvTOS; /* ZPH patch - stores remote server's TOS */
-+#endif	
- };
- 
- struct _StoreEntry {
diff --git a/net-proxy/squid/files/squid-2.6.9-gentoo.patch b/net-proxy/squid/files/squid-2.6.9-gentoo.patch
deleted file mode 100644
index 01abea3780ee..000000000000
--- a/net-proxy/squid/files/squid-2.6.9-gentoo.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-diff -Nru squid-2.6.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE9/helpers/basic_auth/SMB/Makefile.am
---- squid-2.6.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 19:56:26.000000000 +0300
-+++ squid-2.6.STABLE9/helpers/basic_auth/SMB/Makefile.am	2007-01-27 08:17:28.000000000 +0200
-@@ -14,7 +14,7 @@
- ## FIXME: autoconf should test for the samba path.
- 
- SMB_AUTH_HELPER	= smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-2.6.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE9/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.6.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
-+++ squid-2.6.STABLE9/helpers/basic_auth/SMB/smb_auth.sh	2007-01-27 08:17:28.000000000 +0200
-@@ -24,7 +24,7 @@
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
- 
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@
-   addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
- 
-diff -Nru squid-2.6.STABLE9.orig/snmplib/snmp_api.c squid-2.6.STABLE9/snmplib/snmp_api.c
---- squid-2.6.STABLE9.orig/snmplib/snmp_api.c	2006-06-02 20:32:44.000000000 +0300
-+++ squid-2.6.STABLE9/snmplib/snmp_api.c	2007-01-27 08:17:28.000000000 +0200
-@@ -121,7 +121,7 @@
- }
- 
- /*
-- * Parses the packet recieved on the input session, and places the data into
-+ * Parses the packet received on the input session, and places the data into
-  * the input pdu.  length is the length of the input packet.  If any errors
-  * are encountered, NULL is returned.  If not, the community is.
-  */
-diff -Nru squid-2.6.STABLE9.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE9/src/auth/digest/auth_digest.c
---- squid-2.6.STABLE9.orig/src/auth/digest/auth_digest.c	2006-07-31 02:27:04.000000000 +0300
-+++ squid-2.6.STABLE9/src/auth/digest/auth_digest.c	2007-01-27 08:17:28.000000000 +0200
-@@ -1271,7 +1271,7 @@
-     nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
-     if (!nonce) {
- 	/* we couldn't find a matching nonce! */
--	debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce recieved\n");
-+	debug(29, 4) ("authenticateDigestDecode: Unexpected or invalid nonce received\n");
- 	authDigestLogUsername(auth_user_request, username);
- 
- 	/* we don't need the scheme specific data anymore */
-@@ -1285,8 +1285,8 @@
-     /* check the qop is what we expected. Note that for compatability with 
-      * RFC 2069 we should support a missing qop. Tough. */
-     if (!digest_request->qop || strcmp(digest_request->qop, QOP_AUTH)) {
--	/* we recieved a qop option we didn't send */
--	debug(29, 4) ("authenticateDigestDecode: Invalid qop option recieved\n");
-+	/* we received a qop option we didn't send */
-+	debug(29, 4) ("authenticateDigestDecode: Invalid qop option received\n");
- 	authDigestLogUsername(auth_user_request, username);
- 
- 	/* we don't need the scheme specific data anymore */
-diff -Nru squid-2.6.STABLE9.orig/src/cf.data.pre squid-2.6.STABLE9/src/cf.data.pre
---- squid-2.6.STABLE9.orig/src/cf.data.pre	2007-01-20 00:03:03.000000000 +0200
-+++ squid-2.6.STABLE9/src/cf.data.pre	2007-01-27 08:17:28.000000000 +0200
-@@ -344,12 +344,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
- 
- 
-@@ -2841,6 +2841,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
-@@ -2960,6 +2962,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
-@@ -2978,6 +2983,9 @@
- #acl our_networks src 192.168.1.0/24 192.168.2.0/24
- #http_access allow our_networks
- 
-+# 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
-@@ -3274,7 +3282,7 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
-@@ -3309,7 +3317,7 @@
- 
- 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
-@@ -3693,6 +3701,9 @@
- 	If you disable this, it will appear as
- 
- 		X-Forwarded-For: unknown
-+NOCOMMENT_START
-+forwarded_for off
-+NOCOMMENT_END
- DOC_END
- 
- 
-@@ -4127,7 +4138,11 @@
- 	If you wish to create your own versions of the default
- 	(English) error files, either to customize them to suit your
- 	language or company copy the template English files to another
--	directory and point this tag at them.
-+	directory where the error files are read from.
-+	/usr/share/squid/errors contains sets of error files
-+	in different languages. The default error directory
-+	is /etc/squid/errors, which is a link to one of these
-+	error sets.
- DOC_END
- 
- NAME: maximum_single_addr_tries
-@@ -4161,12 +4176,15 @@
- 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".
-+
-+	Note: on Gentoo Linux, the default is zero - you need to
-+	set it to 3401 to enable it.
- DOC_END
- 
- NAME: snmp_access
-diff -Nru squid-2.6.STABLE9.orig/src/client_side.c squid-2.6.STABLE9/src/client_side.c
---- squid-2.6.STABLE9.orig/src/client_side.c	2007-01-24 03:38:16.000000000 +0200
-+++ squid-2.6.STABLE9/src/client_side.c	2007-01-27 08:17:38.000000000 +0200
-@@ -4599,14 +4599,7 @@
- 	debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-     } else {
- 	if (do_debug(83, 4)) {
--	    /* Write out the SSL session details.. actually the call below, but
--	     * OpenSSL headers do strange typecasts confusing GCC.. */
--	    /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
--#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L
--	    PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
--#else
- 	    PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL);
--#endif
- 	    /* Note: This does not automatically fflush the log file.. */
- 	}
- 	debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
-diff -Nru squid-2.6.STABLE9.orig/src/defines.h squid-2.6.STABLE9/src/defines.h
---- squid-2.6.STABLE9.orig/src/defines.h	2006-11-29 17:58:52.000000000 +0200
-+++ squid-2.6.STABLE9/src/defines.h	2007-01-27 08:17:28.000000000 +0200
-@@ -249,7 +249,7 @@
- 
- /* were to look for errors if config path fails */
- #ifndef DEFAULT_SQUID_ERROR_DIR
--#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
-+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
- #endif
- 
- /* gb_type operations */
-diff -Nru squid-2.6.STABLE9.orig/src/delay_pools.c squid-2.6.STABLE9/src/delay_pools.c
---- squid-2.6.STABLE9.orig/src/delay_pools.c	2006-10-23 14:22:21.000000000 +0300
-+++ squid-2.6.STABLE9/src/delay_pools.c	2007-01-27 08:17:28.000000000 +0200
-@@ -613,7 +613,7 @@
- }
- 
- /*
-- * this records actual bytes recieved.  always recorded, even if the
-+ * this records actual bytes received.  always recorded, even if the
-  * class is disabled - it's more efficient to just do it than to do all
-  * the checks.
-  */
-diff -Nru squid-2.6.STABLE9.orig/src/main.c squid-2.6.STABLE9/src/main.c
---- squid-2.6.STABLE9.orig/src/main.c	2007-01-13 18:10:14.000000000 +0200
-+++ squid-2.6.STABLE9/src/main.c	2007-01-27 08:17:28.000000000 +0200
-@@ -372,6 +372,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)
- {
-@@ -395,6 +411,7 @@
-     locationRewriteShutdown();
-     authenticateShutdown();
-     externalAclShutdown();
-+    unlinkdClose();
-     storeDirCloseSwapLogs();
-     storeLogClose();
-     accessLogClose();
-@@ -430,6 +447,9 @@
- #if USE_WCCPv2
-     wccp2Init();
- #endif
-+#if USE_UNLINKD
-+    if (needUnlinkd()) unlinkdInit();
-+#endif
-     serverConnectionsOpen();
-     neighbors_init();
-     storeDirOpenSwapLogs();
-@@ -593,7 +613,7 @@
- 
-     if (!configured_once) {
- #if USE_UNLINKD
--	unlinkdInit();
-+	if (needUnlinkd()) unlinkdInit();
- #endif
- 	urlInitialize();
- 	cachemgrInit();
-@@ -972,7 +992,7 @@
-     int nullfd;
-     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());
-     else if (pid > 0)
-@@ -1008,14 +1028,14 @@
- 	mainStartScript(argv[0]);
- 	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);
- 	    syslog(LOG_ALERT, "execvp failed: %s", xstrerror());
- 	}
- 	/* 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);
- 	time(&start);
- 	squid_signal(SIGINT, SIG_IGN, SA_RESTART);
-diff -Nru squid-2.6.STABLE9.orig/src/Makefile.am squid-2.6.STABLE9/src/Makefile.am
---- squid-2.6.STABLE9.orig/src/Makefile.am	2006-10-30 02:07:33.000000000 +0200
-+++ squid-2.6.STABLE9/src/Makefile.am	2007-01-27 08:17:28.000000000 +0200
-@@ -314,12 +314,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-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-diff -Nru squid-2.6.STABLE9.orig/src/mib.txt squid-2.6.STABLE9/src/mib.txt
---- squid-2.6.STABLE9.orig/src/mib.txt	2006-09-22 05:49:24.000000000 +0300
-+++ squid-2.6.STABLE9/src/mib.txt	2007-01-27 08:17:28.000000000 +0200
-@@ -314,7 +314,7 @@
-                 MAX-ACCESS read-only
-                 STATUS current
- 		DESCRIPTION
--			" Number of HTTP KB's recieved "
-+			" Number of HTTP KB's received "
-         ::= { cacheProtoAggregateStats 4 }
- 
-         cacheHttpOutKb OBJECT-TYPE
-@@ -354,7 +354,7 @@
-                 MAX-ACCESS read-only
-                 STATUS current
- 		DESCRIPTION
--                        " Number of ICP KB's recieved "
-+                        " Number of ICP KB's received "
-         ::= { cacheProtoAggregateStats 9 }
- 
-         cacheServerRequests OBJECT-TYPE
-@@ -378,7 +378,7 @@
-                 MAX-ACCESS read-only
-                 STATUS current
- 		DESCRIPTION
--                        " KB's of traffic recieved from servers "
-+                        " KB's of traffic received from servers "
-         ::= { cacheProtoAggregateStats 12 }
- 
-         cacheServerOutKb OBJECT-TYPE
diff --git a/net-proxy/squid/squid-2.6.10.ebuild b/net-proxy/squid/squid-2.6.10.ebuild
deleted file mode 100644
index 43060233a7e9..000000000000
--- a/net-proxy/squid/squid-2.6.10.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.10.ebuild,v 1.1 2007/03/10 09:39:42 mrness Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
-
-#lame archive versioning scheme..
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	ssl? ( >=dev-libs/openssl-0.9.7j )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd "${S}" || die "dir ${S} not found"
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-ToS_Hit_ToS_Preserve.patch
-
-	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
-		helpers/basic_auth/*/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	local basic_modules="getpwnam,NCSA,MSNT"
-	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-
-	local ext_helpers="ip_user,session,unix_group"
-	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local ntlm_helpers="fakeauth"
-	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
-
-	local myconf=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-		if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then
-			myconf="${myconf} --enable-epoll"
-		fi
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		${myconf} || die "econf failed"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	#some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-
-	#Remove this after all versions prior to 2.6.4 has been removed from the tree
-	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
-		rm "${ROOT}/etc/squid/errors"
-	fi
-}
-
-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 "/etc/squid/errors symlink has been removed from your system."
-	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}
diff --git a/net-proxy/squid/squid-2.6.9-r1.ebuild b/net-proxy/squid/squid-2.6.13.ebuild
index 98ee4723f409..000c7403478f 100644
--- a/net-proxy/squid/squid-2.6.9-r1.ebuild
+++ b/net-proxy/squid/squid-2.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.9-r1.ebuild,v 1.2 2007/02/25 20:32:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.13.ebuild,v 1.1 2007/05/28 05:07:21 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -20,7 +20,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate zero-penalty-hit \
+IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate qos zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux"
 
@@ -48,6 +48,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-ToS_Hit_ToS_Preserve.patch
+	use qos && epatch "${FILESDIR}"/${P}-qos.patch
 
 	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
 
diff --git a/net-proxy/squid/squid-2.6.7.ebuild b/net-proxy/squid/squid-2.6.7.ebuild
deleted file mode 100644
index b4aed44826b5..000000000000
--- a/net-proxy/squid/squid-2.6.7.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.7.ebuild,v 1.10 2007/01/21 07:32:42 mrness Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
-
-#lame archive versioning scheme..
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-PATCH_VERSION="20070116"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp selinux logrotate zero-penalty-hit \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux"
-
-RDEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	ssl? ( >=dev-libs/openssl-0.9.7j )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd "${S}" || die "dir ${S} not found"
-
-	# Do bulk patching from squids bug fix list as well as our patches
-	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
-	EPATCH_SUFFIX="patch"
-	epatch "${WORKDIR}/patch"
-
-	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
-		helpers/basic_auth/*/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-
-	local ext_helpers="ip_user,session,unix_group,wbinfo_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter"
-		if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then
-			myconf="${myconf} --enable-epoll"
-		fi
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="SMB,fakeauth" \
-		--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 \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		${myconf} || die "econf failed"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	#some clean ups
-	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_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-
-	#Remove this after all versions prior to 2.6.4 has been removed from the tree
-	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
-		rm "${ROOT}/etc/squid/errors"
-	fi
-}
-
-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 "/etc/squid/errors symlink has been removed from your system."
-	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}