1 files changed, 27 insertions, 47 deletions

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-----