Remove obsolete version (#182301)

Package-Manager: portage-2.1.3.9

12 files changed, 46 insertions, 828 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 94e2568969e3..adbac4833b5e 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # 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.153 2007/09/09 05:34:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.154 2007/09/23 09:23:40 mrness Exp $
+
+  23 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  -files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch,
+  -files/squid-2.6.12-gentoo.patch, files/squid.pam, -files/squid.pam.1,
+  -squid-2.6.12.ebuild, squid-2.6.13-r1.ebuild, squid-2.6.14.ebuild,
+  squid-2.6.16.ebuild, squid-3.0_pre7.ebuild:
+  Remove obsolete version (#182301).
 
 *squid-3.0_pre7 (09 Sep 2007)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index b5dca54c0d13..af47e30ab8d0 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.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
-SHA256 d7b081c72063e3a64d9abb583ba1bc520089fea4e451d646eade30dc81bc44f5 files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810
-AUX squid-2.6.12-gentoo.patch 13104 RMD160 0ef584b87d199401aa4f0003858adc255fe47d28 SHA1 f50a48744a2d8144c406326f3058732528b68d02 SHA256 8e95e00ce6244f2414dbf02c88d70f35a680b71a62a9fcd2539bba4b8b7f5f56
-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.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
@@ -69,50 +61,38 @@ AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8
 MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid.logrotate 101
 RMD160 57f6c2461bd8948524dc08c2665593234380891e files/squid.logrotate 101
 SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6 files/squid.logrotate 101
-AUX squid.pam 315 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 SHA1 f694dbc6246812841fa9015e12d4cf2fe0c7319e SHA256 dec9bd5ea16977fa334db04eb657e0598af411dad7ff279acf86beddcd22a8fd
-MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315
-RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 files/squid.pam 315
-SHA256 dec9bd5ea16977fa334db04eb657e0598af411dad7ff279acf86beddcd22a8fd files/squid.pam 315
-AUX squid.pam.1 320 RMD160 9c954060bcdc0c7e0e2a9ad75ac43c5bfa1c7eed SHA1 47d12ce636e8d38f3cf9bd1e40732de6ef809017 SHA256 a309b168faa161cf13357acc3f6c0398b90337d3a8bc3373924749ebce485d09
-MD5 331d93b8caba46e6e0260e9061e8a052 files/squid.pam.1 320
-RMD160 9c954060bcdc0c7e0e2a9ad75ac43c5bfa1c7eed files/squid.pam.1 320
-SHA256 a309b168faa161cf13357acc3f6c0398b90337d3a8bc3373924749ebce485d09 files/squid.pam.1 320
-DIST squid-2.6.STABLE12.tar.gz 1626994 RMD160 8e9463969064312b5f2fbe83b039be09646efbed SHA1 06a733cc04ba894cf4f7621278a1145b8e5807f9 SHA256 b4a1dd476371327369894ff73f729e5a24ec76b07f40a823cf04ca5c1210fc42
+AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
+MD5 4cdf88cc558177b8c7ff33cb876eb2de files/squid.pam 315
+RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 files/squid.pam 315
+SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f files/squid.pam 315
 DIST squid-2.6.STABLE13.tar.gz 1627479 RMD160 6a01a10482ed1ce9715ae89905629472103bd394 SHA1 6e5783c928325b3652a5a7ffb5b167318d5937f1 SHA256 1c32265ec15af7cfa28dec12f356c9abcb1c38ecf97de263674bb61732d4076b
 DIST squid-2.6.STABLE14.tar.gz 1694713 RMD160 53efeb4db8f118fe336970599ea97f963234f620 SHA1 860fc6cada0a91f93b85e725367219f3815cb86e SHA256 c2e9465ca3cf77efb0d625a9b2bc1ffed52b9b674c1d84d50ddf36b9a24874b0
 DIST squid-2.6.STABLE16.tar.gz 1710035 RMD160 a6a1de36baf28c36916e09a713ca30d33a10054a SHA1 6e56df7270512f9676b20a4d9e5a96f675aa0d23 SHA256 0326bd0bb36d9f19349b5e103f94f675bd4ead225766645035b7bec7452fe72f
 DIST squid-3.0.PRE7.tar.gz 2379458 RMD160 b586c392f9d7e5884edd6b40babe352e864abe06 SHA1 25fc030750c1b4d90dfe1204399a8bc4d7a79bab SHA256 85fee652ab1886cb1bb5802173d2467db73548afae69e9f1a7eb8f7a2acef0f3
-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.13-r1.ebuild 6190 RMD160 3a611c1359adbeb472d413f41a926271449f7263 SHA1 2cb7abc0a271b94a9bdc721da6d00e8c63df51d5 SHA256 7f01431e1892e4841086b94493fb0715d220e02ef9cad1a7fd07378a43541bdf
-MD5 d675292f410b09af8cb53d2510db7641 squid-2.6.13-r1.ebuild 6190
-RMD160 3a611c1359adbeb472d413f41a926271449f7263 squid-2.6.13-r1.ebuild 6190
-SHA256 7f01431e1892e4841086b94493fb0715d220e02ef9cad1a7fd07378a43541bdf squid-2.6.13-r1.ebuild 6190
-EBUILD squid-2.6.14.ebuild 6198 RMD160 387ce95ce8d9e8d9e7197d53f67221551fa7f870 SHA1 dddd49e4ea39059ebb11353214bc8d5a1f3b79ed SHA256 f5f368903a5ecaad5b804ba748ba66dcfd32e5d138ceba28363d926507fa8c69
-MD5 3f91499020496b232c5fc6779e8e0ffa squid-2.6.14.ebuild 6198
-RMD160 387ce95ce8d9e8d9e7197d53f67221551fa7f870 squid-2.6.14.ebuild 6198
-SHA256 f5f368903a5ecaad5b804ba748ba66dcfd32e5d138ceba28363d926507fa8c69 squid-2.6.14.ebuild 6198
-EBUILD squid-2.6.16.ebuild 5892 RMD160 e49c09f985a9c39b6c85e8accd41f24c7730c96d SHA1 c0a3e898a385984afed0678c6b9dc3054a90a67f SHA256 211c9cb526c2158f44b265ca3c5b90f10328090cc4d4bae8e086e48220898395
-MD5 8f7187198f55f7f9db6005983f5cecde squid-2.6.16.ebuild 5892
-RMD160 e49c09f985a9c39b6c85e8accd41f24c7730c96d squid-2.6.16.ebuild 5892
-SHA256 211c9cb526c2158f44b265ca3c5b90f10328090cc4d4bae8e086e48220898395 squid-2.6.16.ebuild 5892
-EBUILD squid-3.0_pre7.ebuild 5691 RMD160 ecd9a9a073b72f1f784cf32b6907b653a51bd78a SHA1 c5388c9f9225af47e38b2ff0faae3bac0f508db0 SHA256 cdf93ec4152c5f8702b3e2210893ed3c191062facac14a74a8f37dc2d80e1280
-MD5 7e4d4e23b3c123e63439cb95967b50ee squid-3.0_pre7.ebuild 5691
-RMD160 ecd9a9a073b72f1f784cf32b6907b653a51bd78a squid-3.0_pre7.ebuild 5691
-SHA256 cdf93ec4152c5f8702b3e2210893ed3c191062facac14a74a8f37dc2d80e1280 squid-3.0_pre7.ebuild 5691
-MISC ChangeLog 36929 RMD160 76cc6aac93fa990c491a78f9d8dccf81edf358bc SHA1 4ad9b982da5376039977fa589ce4177d6f0efe73 SHA256 1a4ce86f7656d0aef0bda192f026958aeb5fb43fe197ce287d46ea1034127a92
-MD5 75359cfc9d5e26aba60e09c477c87a2e ChangeLog 36929
-RMD160 76cc6aac93fa990c491a78f9d8dccf81edf358bc ChangeLog 36929
-SHA256 1a4ce86f7656d0aef0bda192f026958aeb5fb43fe197ce287d46ea1034127a92 ChangeLog 36929
+EBUILD squid-2.6.13-r1.ebuild 6191 RMD160 4000b1770f1be5eea9395ac955388f42dd2c0ed5 SHA1 2eee9ffb3d755001699c505e528d8e9048b006e8 SHA256 a06d2be2b38130346b05dc3178f5e6541f9af6b32701238868a419c12ee89d15
+MD5 40d237a683f3a1fda51c67f24c4623fd squid-2.6.13-r1.ebuild 6191
+RMD160 4000b1770f1be5eea9395ac955388f42dd2c0ed5 squid-2.6.13-r1.ebuild 6191
+SHA256 a06d2be2b38130346b05dc3178f5e6541f9af6b32701238868a419c12ee89d15 squid-2.6.13-r1.ebuild 6191
+EBUILD squid-2.6.14.ebuild 6196 RMD160 254e971c808f48808d15718396c8defe23cf616a SHA1 884165f71034e9c3c2d101fbfae1813659fdb49e SHA256 d0fc16bc5b4af9332290e21a0983f61f402d33bcec3a41f7a0593066352945bd
+MD5 cd0022ac7b13882cd182e67f6484c66e squid-2.6.14.ebuild 6196
+RMD160 254e971c808f48808d15718396c8defe23cf616a squid-2.6.14.ebuild 6196
+SHA256 d0fc16bc5b4af9332290e21a0983f61f402d33bcec3a41f7a0593066352945bd squid-2.6.14.ebuild 6196
+EBUILD squid-2.6.16.ebuild 5890 RMD160 3366107ccd34b8f9d80f003ed0f2c9f9fb1e7de7 SHA1 4ee1c5a5dd7c346893c42a6017cc5e3b90c9b0de SHA256 d64e1d329e0a68fd80260e74f0eb2116f7642f19278442959347a326d57da598
+MD5 5024af075d456da158ab00a5a09429fd squid-2.6.16.ebuild 5890
+RMD160 3366107ccd34b8f9d80f003ed0f2c9f9fb1e7de7 squid-2.6.16.ebuild 5890
+SHA256 d64e1d329e0a68fd80260e74f0eb2116f7642f19278442959347a326d57da598 squid-2.6.16.ebuild 5890
+EBUILD squid-3.0_pre7.ebuild 5689 RMD160 4743b98036a3ea41ead3c4da35aefb606543b479 SHA1 c42b9bf23d31f6e9a15c619ae195053fc3d1328d SHA256 b740a180507d5e0f0343536915888c3c8ff1e7ea3c9cdb2d76c216ec3968f7de
+MD5 ab238b5c0f80e8bcbf6f467683f4dd13 squid-3.0_pre7.ebuild 5689
+RMD160 4743b98036a3ea41ead3c4da35aefb606543b479 squid-3.0_pre7.ebuild 5689
+SHA256 b740a180507d5e0f0343536915888c3c8ff1e7ea3c9cdb2d76c216ec3968f7de squid-3.0_pre7.ebuild 5689
+MISC ChangeLog 37253 RMD160 365e16806c0d5a637418af7451d659c281ab46dc SHA1 85a0de97ed383be99e58825d22ade4e8b1a81a11 SHA256 097e81e7ab4a57c0c7d3edc1047e2676a55b60436b6351f4a2ae099a4ab12257
+MD5 b688adf1238dabaad942b776d360ba55 ChangeLog 37253
+RMD160 365e16806c0d5a637418af7451d659c281ab46dc ChangeLog 37253
+SHA256 097e81e7ab4a57c0c7d3edc1047e2676a55b60436b6351f4a2ae099a4ab12257 ChangeLog 37253
 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 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 bece67ae4733616c75ab2c6b864a23c2 files/digest-squid-2.6.13-r1 259
 RMD160 dcd0886e50bfed9cbbb470ee2c2bcb6ebf7c4dbd files/digest-squid-2.6.13-r1 259
 SHA256 04d841d3dc6bf9aad0831ec3ecb08ef55aeb12fc23dec3d3c500e804d5d90dfc files/digest-squid-2.6.13-r1 259
@@ -128,7 +108,7 @@ SHA256 3f8f750c297d8cd7b4970fa73c9915f04203f375aac20646bec5be2afc7d9925 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG44XyVSA5X31g7/gRAgOxAJ42TRvfLRUM8VB6bacEAmF2N03NtwCfauCQ
-xtOgJS9Inw67UUV7Z7uy764=
-=gALu
+iD8DBQFG9jCpVSA5X31g7/gRAo8AAJ9rM1Twrwf1iXqbYiEELLWqOxmgkACgqSfd
+UoFv35B+rRAaaHI5cDbOIJk=
+=pziW
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.12 b/net-proxy/squid/files/digest-squid-2.6.12
deleted file mode 100644
index 9b0f3a59c5ef..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 442cffe4447b76d732af2b1353e283d5 squid-2.6.STABLE12.tar.gz 1626994
-RMD160 8e9463969064312b5f2fbe83b039be09646efbed squid-2.6.STABLE12.tar.gz 1626994
-SHA256 b4a1dd476371327369894ff73f729e5a24ec76b07f40a823cf04ca5c1210fc42 squid-2.6.STABLE12.tar.gz 1626994
diff --git a/net-proxy/squid/files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch b/net-proxy/squid/files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch
deleted file mode 100644
index 34f83ebcfb80..000000000000
--- a/net-proxy/squid/files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -Nru squid-2.6.STABLE12.orig/src/cf.data.pre squid-2.6.STABLE12/src/cf.data.pre
---- squid-2.6.STABLE12.orig/src/cf.data.pre	2007-03-21 19:43:48.000000000 +0200
-+++ squid-2.6.STABLE12/src/cf.data.pre	2007-03-21 19:44:08.000000000 +0200
-@@ -3193,6 +3193,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.STABLE12.orig/src/client_side.c squid-2.6.STABLE12/src/client_side.c
---- squid-2.6.STABLE12.orig/src/client_side.c	2007-03-21 19:43:48.000000000 +0200
-+++ squid-2.6.STABLE12/src/client_side.c	2007-03-21 19:44:08.000000000 +0200
-@@ -2621,6 +2621,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.STABLE12.orig/src/http.c squid-2.6.STABLE12/src/http.c
---- squid-2.6.STABLE12.orig/src/http.c	2007-03-13 00:27:09.000000000 +0200
-+++ squid-2.6.STABLE12/src/http.c	2007-03-21 19:44:08.000000000 +0200
-@@ -1373,6 +1373,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.STABLE12.orig/src/structs.h squid-2.6.STABLE12/src/structs.h
---- squid-2.6.STABLE12.orig/src/structs.h	2007-02-27 03:20:01.000000000 +0200
-+++ squid-2.6.STABLE12/src/structs.h	2007-03-21 19:44:08.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 {
-@@ -1724,6 +1729,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.12-gentoo.patch b/net-proxy/squid/files/squid-2.6.12-gentoo.patch
deleted file mode 100644
index 58b16c7b5f03..000000000000
--- a/net-proxy/squid/files/squid-2.6.12-gentoo.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-diff -Nru squid-2.6.STABLE12.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE12/helpers/basic_auth/SMB/Makefile.am
---- squid-2.6.STABLE12.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 19:56:26.000000000 +0300
-+++ squid-2.6.STABLE12/helpers/basic_auth/SMB/Makefile.am	2007-03-21 19:41:26.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.STABLE12.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE12/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.6.STABLE12.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
-+++ squid-2.6.STABLE12/helpers/basic_auth/SMB/smb_auth.sh	2007-03-21 19:41:26.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.STABLE12.orig/snmplib/snmp_api.c squid-2.6.STABLE12/snmplib/snmp_api.c
---- squid-2.6.STABLE12.orig/snmplib/snmp_api.c	2006-06-02 20:32:44.000000000 +0300
-+++ squid-2.6.STABLE12/snmplib/snmp_api.c	2007-03-21 19:41:26.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.STABLE12.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE12/src/auth/digest/auth_digest.c
---- squid-2.6.STABLE12.orig/src/auth/digest/auth_digest.c	2006-07-31 02:27:04.000000000 +0300
-+++ squid-2.6.STABLE12/src/auth/digest/auth_digest.c	2007-03-21 19:41:26.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.STABLE12.orig/src/cf.data.pre squid-2.6.STABLE12/src/cf.data.pre
---- squid-2.6.STABLE12.orig/src/cf.data.pre	2007-02-03 23:59:24.000000000 +0200
-+++ squid-2.6.STABLE12/src/cf.data.pre	2007-03-21 19:41:26.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
- 
- 
-@@ -2843,6 +2843,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
-@@ -2962,6 +2964,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
-@@ -2980,6 +2985,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
-@@ -3276,7 +3284,7 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
-@@ -3311,7 +3319,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
-@@ -3695,6 +3703,9 @@
- 	If you disable this, it will appear as
- 
- 		X-Forwarded-For: unknown
-+NOCOMMENT_START
-+forwarded_for off
-+NOCOMMENT_END
- DOC_END
- 
- 
-@@ -4129,7 +4140,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
-@@ -4163,12 +4178,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.STABLE12.orig/src/client_side.c squid-2.6.STABLE12/src/client_side.c
---- squid-2.6.STABLE12.orig/src/client_side.c	2007-03-20 23:26:34.000000000 +0200
-+++ squid-2.6.STABLE12/src/client_side.c	2007-03-21 19:41:26.000000000 +0200
-@@ -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)) {
--	    /* 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.STABLE12.orig/src/defines.h squid-2.6.STABLE12/src/defines.h
---- squid-2.6.STABLE12.orig/src/defines.h	2007-02-04 00:58:20.000000000 +0200
-+++ squid-2.6.STABLE12/src/defines.h	2007-03-21 19:41:26.000000000 +0200
-@@ -259,7 +259,7 @@
- 
- /* were to look for errors if config path fails */
- #ifndef DEFAULT_SQUID_ERROR_DIR
--#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
-+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
- #endif
- 
- /* gb_type operations */
-diff -Nru squid-2.6.STABLE12.orig/src/delay_pools.c squid-2.6.STABLE12/src/delay_pools.c
---- squid-2.6.STABLE12.orig/src/delay_pools.c	2006-10-23 14:22:21.000000000 +0300
-+++ squid-2.6.STABLE12/src/delay_pools.c	2007-03-21 19:41:26.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.STABLE12.orig/src/main.c squid-2.6.STABLE12/src/main.c
---- squid-2.6.STABLE12.orig/src/main.c	2007-03-13 00:25:40.000000000 +0200
-+++ squid-2.6.STABLE12/src/main.c	2007-03-21 19:42:30.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,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_LOCAL4);
- 	    prog = xstrdup(argv[0]);
- 	    argv[0] = xstrdup("(squid)");
- 	    execvp(prog, argv);
-@@ -1016,7 +1036,7 @@
- 	    exit(1);
- 	}
- 	/* parent */
--	openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+	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.STABLE12.orig/src/Makefile.am squid-2.6.STABLE12/src/Makefile.am
---- squid-2.6.STABLE12.orig/src/Makefile.am	2006-10-30 02:07:33.000000000 +0200
-+++ squid-2.6.STABLE12/src/Makefile.am	2007-03-21 19:41:26.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.STABLE12.orig/src/mib.txt squid-2.6.STABLE12/src/mib.txt
---- squid-2.6.STABLE12.orig/src/mib.txt	2006-09-22 05:49:24.000000000 +0300
-+++ squid-2.6.STABLE12/src/mib.txt	2007-03-21 19:41:26.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/files/squid.pam b/net-proxy/squid/files/squid.pam
index 7589298fae75..5309b8097c79 100644
--- a/net-proxy/squid/files/squid.pam
+++ b/net-proxy/squid/files/squid.pam
@@ -1,8 +1,8 @@
 #%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.2 2006/01/09 06:03:12 mrness Exp $
-auth       include		system-auth
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.3 2007/09/23 09:23:41 mrness Exp $
 auth       required		pam_nologin.so
+auth       include		system-auth
 account    include		system-auth
 password   include		system-auth
-session    include		system-auth
 session    optional		pam_limits.so
+session    include		system-auth
diff --git a/net-proxy/squid/files/squid.pam.1 b/net-proxy/squid/files/squid.pam.1
deleted file mode 100644
index fc78b7191693..000000000000
--- a/net-proxy/squid/files/squid.pam.1
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam.1,v 1.2 2007/07/02 10:15:56 flameeyes Exp $
-auth       required		pam_nologin.so
-auth       include		system-auth
-account    include		system-auth
-password   include		system-auth
-session    optional		pam_limits.so
-session    include		system-auth
diff --git a/net-proxy/squid/squid-2.6.12.ebuild b/net-proxy/squid/squid-2.6.12.ebuild
deleted file mode 100644
index e35a9b37b22f..000000000000
--- a/net-proxy/squid/squid-2.6.12.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.12.ebuild,v 1.10 2007/04/24 21:59:38 eroyf 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.13-r1.ebuild b/net-proxy/squid/squid-2.6.13-r1.ebuild
index b3f509582233..d14fa7a7ca44 100644
--- a/net-proxy/squid/squid-2.6.13-r1.ebuild
+++ b/net-proxy/squid/squid-2.6.13-r1.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.13-r1.ebuild,v 1.7 2007/07/09 05:29:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.13-r1.ebuild,v 1.8 2007/09/23 09:23:40 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -153,7 +153,7 @@ src_install() {
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	newpamd "${FILESDIR}/squid.pam.1" squid
+	newpamd "${FILESDIR}/squid.pam" squid
 	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		newinitd "${FILESDIR}/squid.initd-logrotate" squid
diff --git a/net-proxy/squid/squid-2.6.14.ebuild b/net-proxy/squid/squid-2.6.14.ebuild
index ca068e4800b2..698090226e86 100644
--- a/net-proxy/squid/squid-2.6.14.ebuild
+++ b/net-proxy/squid/squid-2.6.14.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.14.ebuild,v 1.1 2007/08/16 17:35:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.14.ebuild,v 1.2 2007/09/23 09:23:40 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -153,7 +153,7 @@ src_install() {
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	newpamd "${FILESDIR}/squid.pam.1" squid
+	newpamd "${FILESDIR}/squid.pam" squid
 	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		newinitd "${FILESDIR}/squid.initd-logrotate" squid
diff --git a/net-proxy/squid/squid-2.6.16.ebuild b/net-proxy/squid/squid-2.6.16.ebuild
index 15d75773c851..787d0b9c5f2b 100644
--- a/net-proxy/squid/squid-2.6.16.ebuild
+++ b/net-proxy/squid/squid-2.6.16.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.16.ebuild,v 1.2 2007/09/08 07:49:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.16.ebuild,v 1.3 2007/09/23 09:23:40 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -154,7 +154,7 @@ src_install() {
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	newpamd "${FILESDIR}/squid.pam.1" squid
+	newpamd "${FILESDIR}/squid.pam" squid
 	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		newinitd "${FILESDIR}/squid.initd-logrotate" squid
diff --git a/net-proxy/squid/squid-3.0_pre7.ebuild b/net-proxy/squid/squid-3.0_pre7.ebuild
index b7ccf7f685d8..0180c0d2bdbb 100644
--- a/net-proxy/squid/squid-3.0_pre7.ebuild
+++ b/net-proxy/squid/squid-3.0_pre7.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-3.0_pre7.ebuild,v 1.1 2007/09/09 05:34:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0_pre7.ebuild,v 1.2 2007/09/23 09:23:40 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -146,7 +146,7 @@ src_install() {
 	doman helpers/basic_auth/LDAP/*.8
 	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
 
-	newpamd "${FILESDIR}/squid.pam.1" squid
+	newpamd "${FILESDIR}/squid.pam" squid
 	newconfd "${FILESDIR}/squid.confd" squid
 	if use logrotate; then
 		newinitd "${FILESDIR}/squid.initd-logrotate" squid