Version bumps (#218968).

Package-Manager: portage-2.1.4.4

8 files changed, 171 insertions, 162 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 041b2661ab4f..1a8a64a76062 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.182 2008/04/14 05:45:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.183 2008/05/14 22:02:09 mrness Exp $
+
+*squid-3.0.5 (14 May 2008)
+*squid-2.6.20 (14 May 2008)
+
+  14 May 2008; Alin Năstac <mrness@gentoo.org>
+  -files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch,
+  -files/squid-2.6.17-gentoo.patch, -files/squid-2.6.17-qos.patch,
+  +files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch,
+  +files/squid-2.6.20-gentoo.patch, +files/squid-2.6.20-qos.patch,
+  -files/squid-3.0.1-gentoo.patch, +files/squid-3.0.5-gentoo.patch,
+  -squid-2.6.17.ebuild, +squid-2.6.20.ebuild, -squid-3.0.1.ebuild,
+  +squid-3.0.5.ebuild:
+  Version bumps (#218968).
 
 *squid-3.0.4-r1 (14 Apr 2008)
 *squid-2.6.19-r1 (14 Apr 2008)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index d68f4589198d..0cbb474996bf 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX squid-2.6.17-ToS_Hit_ToS_Preserve.patch 7810 RMD160 970a50b5dd2efd658bef93b36ebbccdcd27c6632 SHA1 3b304b9fa331306e5276a90dcf3e471012f6aa4c SHA256 4bb7df6a5bbaf91c9878c652e467214eabe1712851b5168cb87ac064c7694c04
-AUX squid-2.6.17-gentoo.patch 11898 RMD160 39ef756fa4f6726e670ca82ce3a393acde2c57fb SHA1 96d860933c3a7d3086fc7a36be892fa71477921c SHA256 8bb7e156181aa885838045d93d2853daf49ebac9e96929c7d827c2c157b5925d
-AUX squid-2.6.17-qos.patch 10046 RMD160 769bfe700a58cec631d5617ceab4a4a96a78ad16 SHA1 5eac2a5d62665a7cd2e9a870cf63a27c0abab81a SHA256 e98147f5388d9c5fac55bbd7d746609d29d96fb78352ae9a673227a3c326104c
 AUX squid-2.6.18-ToS_Hit_ToS_Preserve.patch 7810 RMD160 511f7c2eae9cb035b89c61adaf1e1d196b106485 SHA1 6e6394a7f9e148f6624c11d361decd2b0e111adc SHA256 1f91a353485d7a5ea176545d61ad0ec2a641e6304493a20b94522870988ecaf5
 AUX squid-2.6.18-gentoo.patch 11898 RMD160 fa0e48eda17897f1f37ec7708c15c34f46fca4ae SHA1 50ea047e42f9e60cf6c73de8760d44d96c1ba9ef SHA256 d4f0fda900356f790fe2010941f833f4b3fa2f01895c40c9af566f69bc5aa2d0
 AUX squid-2.6.18-qos.patch 10046 RMD160 e05e7ed05e94164e317a11e9204fa31ca729fae1 SHA1 374aa846c157d3238f867f47393d4a1ff18741a3 SHA256 1f070459498c0765787b3f1227f4e1881893e94315be7d3480d92400aeb94ed9
@@ -11,30 +8,33 @@ AUX squid-2.6.19-ToS_Hit_ToS_Preserve.patch 7810 RMD160 c76b6d9c51773640252ffd90
 AUX squid-2.6.19-gentoo.patch 11898 RMD160 6e1eadfc216568f8a5f374febfc39253fb34e2a6 SHA1 33eb35aecd01f69d8c46536189f7b74aeb4e8aa4 SHA256 81bafaa2304fd0e80fcb7258a02af967576c4163090676b25c5c43021fb89c29
 AUX squid-2.6.19-qos.patch 10046 RMD160 899e9142137282b6861d44655874cbef3f0766c6 SHA1 54318f2fb76a066b82d52ac4d55d495f3ee35b06 SHA256 babd201b4e18b9b59ff05f02f7a2fcb66fc359106f669899dae2f8fb27df89bd
 AUX squid-2.6.19-tcp_outg-x_fwd_for.patch 1126 RMD160 2164f14884e51b4518447df2ba8328cf00ac0f4a SHA1 5edd464cc89bd12af2587fd4fd1032236250ef6f SHA256 9d00b91fae8cf1d574a739e45cef176a9581c12b0aaf51a0502b55e2a9decb70
-AUX squid-3.0.1-gentoo.patch 8934 RMD160 67177aa2318791b8b19b05a5dfb8a36124144178 SHA1 04ad3af94b1d1219e186eac76654343d20cdee71 SHA256 db85e799056743ec556036de384096b6f502f1e3e2a05eb9f3475f64f7f77307
+AUX squid-2.6.20-ToS_Hit_ToS_Preserve.patch 7810 RMD160 b8331b081e699c67931b8b96fbfee066596d5cc2 SHA1 21f1853e1d8931825950689bdcd5ad86f692f604 SHA256 1e5cd717ced7e75c468c1c9d555659105554b1c8da3bc18700831b59bd2acc88
+AUX squid-2.6.20-gentoo.patch 11898 RMD160 661dd41756c6fe579cde485bbf49a1c7d0958df4 SHA1 b82039c97a16e3ebe3bb5ad5c6d11c5df1867e2d SHA256 94dc58f6a9d588f7c19627807f6e0deb40be197c41d7f6ecdc31122b8ff98a12
+AUX squid-2.6.20-qos.patch 10046 RMD160 d45c12f01f9c71ef6dd026a2e84e364a82a4fe13 SHA1 6e082842a0e09cd016ec9fa67920c428eb978304 SHA256 f40f5cfefec401ec5567feac816c50d1b2250af6fc4cea550ff6cf814fa33c11
 AUX squid-3.0.4-gentoo.patch 8934 RMD160 3961e96f8bd04bf2fe422ee975f1afb98452183e SHA1 2d9cb25af596dff69de70a83639527566175e4fa SHA256 d50e02fbaa23159c752fb7accc42302850679904be4de301a7911ba19472fdba
+AUX squid-3.0.5-gentoo.patch 8934 RMD160 f319968e71fde615d005c1be3570f288dcff50a7 SHA1 975178133eff7d27c107e3649630e889ab11c60f SHA256 03fa8e17afa920b5a49df4b8380c0ee7719a5cc28245b0159882199384bce0dc
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
 AUX squid.initd 2171 RMD160 f0e96395e869526a7daf5072d3ed1b2ea8e1a2b9 SHA1 aaacc2b0a879a7225db17bc725c8c028d6d393e3 SHA256 a64c0aaae506be98bcc024b9d3b3a883b1b9be91b8a73960d3a7cff445b8217f
 AUX squid.initd-logrotate 2065 RMD160 34ad950dca48d37559f81e84b82f0e9dd9c96cb1 SHA1 1d086d251e9c57634809cc39bcb901a3c4d4e4dc SHA256 2c2693b3e2fa14416523343d2d7e7b2697243c4316b586b031c0f283510dd4ba
 AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8b3c43c0d327150069a65aa473302ae6c423ff SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
-DIST squid-2.6.STABLE17.tar.gz 1724676 RMD160 8fadcf6a78c0f8ce20426ed9a78837e19a0a9af6 SHA1 e5022a9318e6547d4c2409c59f457f92de620401 SHA256 01231f7eb0a28faff41f3f279b949f32602ae4fce41d26f6190e9812fe2a360c
 DIST squid-2.6.STABLE18.tar.gz 1725660 RMD160 62542c607b2ab3630ce82879b17509b412029479 SHA1 b819e934f07ff421a633c27432d7e289fad3568f SHA256 51a85f2dae50a793a1ed38191676cbf9ab2ecdc059304fbf6de041d36692d634
 DIST squid-2.6.STABLE19.tar.gz 1740046 RMD160 02af108b9c63d3585c4f1553e553683dcb743069 SHA1 92c88eaee8b22eb6c52bebb025eda6064a52a5c7 SHA256 8d82ae7a7afecdc72a473053a735c9f9baf55b0a40af2c94facc046d0f53d46d
-DIST squid-3.0.STABLE1.tar.gz 2406601 RMD160 241524529c75f875fb6c760d023076d2c9f82d7b SHA1 057dd85a28b7123035aa6f7ad36ec0d985088943 SHA256 6b92f259ec89ecccabaf081e47fdf402d37a3d5d0ff93dd1b586f634fcdfb891
+DIST squid-2.6.STABLE20.tar.gz 1738871 RMD160 080fee57b08a97abfde98a7bc716568301e2f696 SHA1 798fa77dc56fd0dbfadda341aa9099bc19ce6bec SHA256 b2655d8a09f24e650be8a9a1deb1d9eb64ce874f2813319743490f06b69413e6
 DIST squid-3.0.STABLE4.tar.gz 2417659 RMD160 2f8d2bc2dbde880938a8dbf9741e442e8c4f03e0 SHA1 afe3c57046ea7f62fbecd53e06c05c9e5b43a79c SHA256 046682c44d96fb6970a4fd41af8d7adb79a7e7fbe300b23553c891ce5e9b1011
-EBUILD squid-2.6.17.ebuild 5733 RMD160 0e82971b5cd81a8062374b242c9ae66747395ebb SHA1 cc0b1c1dc3229a8c9e21449d5b200fae0945f8c6 SHA256 368f9eafd65feaa2232893441767a506e3eefd178ecb51c0339920895914a4c3
+DIST squid-3.0.STABLE5.tar.gz 2418416 RMD160 e99adb0418eea01f982da50c0dba12d2ec7a257d SHA1 675a6865385957e83bd8456c5cc6e2b7ce651e6d SHA256 1bedad528bb89accafe46995837ce8b1fb467d1ad955d57f543165791c988f12
 EBUILD squid-2.6.18.ebuild 5736 RMD160 6124f6c388572e127513e40a38bfd7678a8c022d SHA1 36b6690af1488b08f44365a3039699cdc93d27e3 SHA256 5973cf5ef472c2f99451ea33fd9c227179ce03d52f76e8de2dfa785c9db08a80
 EBUILD squid-2.6.19-r1.ebuild 5549 RMD160 5446906be9923ec0393fb9ff37871b7ad092953b SHA1 2e0d8e636ae16d4108c24d94125b0306a39c9e46 SHA256 76a14b7a4e2672827c1094d5ad2555ca8638fbb0d44a4a1c05add65cb4ac61cf
-EBUILD squid-3.0.1.ebuild 5592 RMD160 f6d70636cc6850c920950e0e950a7289bb768742 SHA1 b216f62a1dd663ce035cdb5339b775d7e15f84cb SHA256 1bcee6f665a5be35e93e87f57abfd7f640cbab0a3af6e9fd127e3cec6fc60daf
+EBUILD squid-2.6.20.ebuild 5546 RMD160 0d9d85bd8993db7d08e71765f7f483fcc731f78f SHA1 5ad27c104e27153c1110272bad7796923157fdbc SHA256 83bd30c979eea380fa8c70c54014f9b625dee4d2bd37dec7bd105c71f2286efa
 EBUILD squid-3.0.4-r1.ebuild 5555 RMD160 14dbced2298c05b78a76a7f7a890823249225c7c SHA1 37d2a8fcd4d56009603b364f1b2a20c677352ed9 SHA256 cfef7eca7949f4fc82d657f7ddf7221e7866311df4f82b07863d8653784197af
-MISC ChangeLog 41945 RMD160 cde20b1224d18a1f66d85b8a67b23fabbc6cd636 SHA1 f97f5c8568df5716aa87f0cffea8f75626c2d439 SHA256 0f189bb365b98e78a2a5e8a25a60187268cbf0faa0d3c6681f736112cfd8374b
+EBUILD squid-3.0.5.ebuild 5552 RMD160 05caebd3f3ac001e0c6690e931273affe30159a7 SHA1 479fe9afdf584658c2996417518fb585640ac006 SHA256 849624ab607d822d3c68e39acc1ed5d05ed4b9078b17ed3de4ebf11dcbe0a4e7
+MISC ChangeLog 42469 RMD160 e5506ef3b90d6fb89c6a962e87305d1161c44d0a SHA1 278253cc5fe3c34252d8718731415b0648a2cae7 SHA256 52efb2aa601c079020e2bafb1e1ea8eae5658dd76b0c583ba5a5293cfbae3179
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIAu99+fWpoTWIA9ERAmwSAJ9WuThnAP5fL+vfp/Olh3o5nRoCUwCgiw/y
-zOyQtrBWGFcYVeLZNIira5o=
-=b0oz
+iEYEARECAAYFAkgrYXAACgkQ+fWpoTWIA9ERegCfRPh0vNWJdXHxRf5SZ96QvBG/
+6rMAniT1c4ScAxd3ZQ8L5U+gxsYMFJXA
+=dbpn
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch b/net-proxy/squid/files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch
index d2dc25581c15..50b6547a29c6 100644
--- a/net-proxy/squid/files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch
+++ b/net-proxy/squid/files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data.pre
---- squid-2.6.STABLE17.orig/src/cf.data.pre	2007-12-04 14:33:41.000000000 +0200
-+++ squid-2.6.STABLE17/src/cf.data.pre	2007-12-04 14:37:55.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.pre squid-2.6.STABLE20/src/cf.data.pre
+--- squid-2.6.STABLE20.orig/src/cf.data.pre	2008-05-15 00:48:45.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.pre	2008-05-15 00:49:24.000000000 +0300
 @@ -1181,6 +1181,64 @@
  	to off when using this directive in such configurations.
  DOC_END
@@ -66,9 +66,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  NAME: tcp_outgoing_address
  TYPE: acl_address
  DEFAULT: none
-diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/src/client_side.c
---- squid-2.6.STABLE17.orig/src/client_side.c	2007-12-04 14:33:41.000000000 +0200
-+++ squid-2.6.STABLE17/src/client_side.c	2007-12-04 14:37:55.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/client_side.c squid-2.6.STABLE20/src/client_side.c
+--- squid-2.6.STABLE20.orig/src/client_side.c	2008-05-15 00:48:45.000000000 +0300
++++ squid-2.6.STABLE20/src/client_side.c	2008-05-15 00:49:24.000000000 +0300
 @@ -2632,6 +2632,55 @@
  	return;
      }
@@ -125,9 +125,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/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.STABLE17.orig/src/http.c squid-2.6.STABLE17/src/http.c
---- squid-2.6.STABLE17.orig/src/http.c	2007-11-26 13:04:30.000000000 +0200
-+++ squid-2.6.STABLE17/src/http.c	2007-12-04 14:37:55.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/http.c squid-2.6.STABLE20/src/http.c
+--- squid-2.6.STABLE20.orig/src/http.c	2008-04-02 04:03:47.000000000 +0300
++++ squid-2.6.STABLE20/src/http.c	2008-05-15 00:49:24.000000000 +0300
 @@ -1393,6 +1393,53 @@
      peer *p = httpState->peer;
      CWCB *sendHeaderDone;
@@ -182,10 +182,10 @@ diff -Nru squid-2.6.STABLE17.orig/src/http.c squid-2.6.STABLE17/src/http.c
  
      debug(11, 5) ("httpSendRequest: FD %d: httpState %p.\n", fd, httpState);
  
-diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
---- squid-2.6.STABLE17.orig/src/structs.h	2007-09-06 00:28:34.000000000 +0300
-+++ squid-2.6.STABLE17/src/structs.h	2007-12-04 14:37:55.000000000 +0200
-@@ -669,6 +669,8 @@
+diff -Nru squid-2.6.STABLE20.orig/src/structs.h squid-2.6.STABLE20/src/structs.h
+--- squid-2.6.STABLE20.orig/src/structs.h	2008-04-21 05:56:24.000000000 +0300
++++ squid-2.6.STABLE20/src/structs.h	2008-05-15 00:49:24.000000000 +0300
+@@ -670,6 +670,8 @@
  	int relaxed_header_parser;
  	int accel_no_pmtu_disc;
  	int global_internal_static;
@@ -194,7 +194,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
  	int httpd_suppress_version_string;
  	int via;
  	int check_hostnames;
-@@ -793,6 +795,9 @@
+@@ -794,6 +796,9 @@
      int sleep_after_fork;	/* microseconds */
      time_t minimum_expiry_time;	/* seconds */
      external_acl *externalAclHelperList;
@@ -204,7 +204,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
      errormap *errorMapList;
  #if USE_SSL
      struct {
-@@ -1724,6 +1729,9 @@
+@@ -1727,6 +1732,9 @@
      const char *vary_encoding;
      StoreEntry *ims_entry;
      time_t refresh_timestamp;
diff --git a/net-proxy/squid/files/squid-2.6.17-gentoo.patch b/net-proxy/squid/files/squid-2.6.20-gentoo.patch
index 2c30896e3017..3738d1f33da6 100644
--- a/net-proxy/squid/files/squid-2.6.17-gentoo.patch
+++ b/net-proxy/squid/files/squid-2.6.20-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.STABLE17/helpers/basic_auth/MSNT/confload.c
---- squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 22:09:48.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/basic_auth/MSNT/confload.c	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.STABLE20/helpers/basic_auth/MSNT/confload.c
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 22:09:48.000000000 +0300
++++ squid-2.6.STABLE20/helpers/basic_auth/MSNT/confload.c	2008-05-15 00:48:08.000000000 +0300
 @@ -24,7 +24,7 @@
  
  /* Path to configuration file */
@@ -10,9 +10,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.S
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.6.STABLE17/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 21:44:28.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/basic_auth/MSNT/msntauth.conf.default	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.6.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 21:44:28.000000000 +0300
++++ squid-2.6.STABLE20/helpers/basic_auth/MSNT/msntauth.conf.default	2008-05-15 00:48:08.000000000 +0300
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -22,9 +22,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/MSNT/msntauth.conf.default
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -Nru squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE17/helpers/basic_auth/SMB/Makefile.am
---- squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 19:56:26.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/basic_auth/SMB/Makefile.am	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE20/helpers/basic_auth/SMB/Makefile.am
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/Makefile.am	2005-05-17 19:56:26.000000000 +0300
++++ squid-2.6.STABLE20/helpers/basic_auth/SMB/Makefile.am	2008-05-15 00:48:08.000000000 +0300
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -34,9 +34,9 @@ diff -Nru squid-2.6.STABLE17.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.STABLE17.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE17/helpers/basic_auth/SMB/smb_auth.sh
---- squid-2.6.STABLE17.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
-+++ squid-2.6.STABLE17/helpers/basic_auth/SMB/smb_auth.sh	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE20/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-2.6.STABLE20.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
++++ squid-2.6.STABLE20/helpers/basic_auth/SMB/smb_auth.sh	2008-05-15 00:48:08.000000000 +0300
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -55,9 +55,9 @@ diff -Nru squid-2.6.STABLE17.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.STABLE17.orig/helpers/external_acl/session/squid_session.8 squid-2.6.STABLE17/helpers/external_acl/session/squid_session.8
---- squid-2.6.STABLE17.orig/helpers/external_acl/session/squid_session.8	2007-01-06 19:28:35.000000000 +0200
-+++ squid-2.6.STABLE17/helpers/external_acl/session/squid_session.8	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/external_acl/session/squid_session.8 squid-2.6.STABLE20/helpers/external_acl/session/squid_session.8
+--- squid-2.6.STABLE20.orig/helpers/external_acl/session/squid_session.8	2007-01-06 19:28:35.000000000 +0200
++++ squid-2.6.STABLE20/helpers/external_acl/session/squid_session.8	2008-05-15 00:48:08.000000000 +0300
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -67,9 +67,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/session/squid_session.8 s
  .IP
  acl session external session
  .IP
-diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.6.STABLE17/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-2.6.STABLE17.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 18:07:24.000000000 +0300
-+++ squid-2.6.STABLE17/helpers/external_acl/unix_group/squid_unix_group.8	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.6.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-2.6.STABLE20.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-14 18:07:24.000000000 +0300
++++ squid-2.6.STABLE20/helpers/external_acl/unix_group/squid_unix_group.8	2008-05-15 00:48:08.000000000 +0300
 @@ -27,7 +27,7 @@
  This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
  matches users in group2 or group3
@@ -79,9 +79,9 @@ diff -Nru squid-2.6.STABLE17.orig/helpers/external_acl/unix_group/squid_unix_gro
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -Nru squid-2.6.STABLE17.orig/src/access_log.c squid-2.6.STABLE17/src/access_log.c
---- squid-2.6.STABLE17.orig/src/access_log.c	2007-06-03 03:40:32.000000000 +0300
-+++ squid-2.6.STABLE17/src/access_log.c	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/access_log.c squid-2.6.STABLE20/src/access_log.c
+--- squid-2.6.STABLE20.orig/src/access_log.c	2008-03-18 04:58:47.000000000 +0200
++++ squid-2.6.STABLE20/src/access_log.c	2008-05-15 00:48:08.000000000 +0300
 @@ -1225,7 +1225,7 @@
  	LogfileStatus = LOG_ENABLE;
      }
@@ -91,9 +91,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/access_log.c squid-2.6.STABLE17/src/access
      assert(NULL != headerslog);
  #endif
  #if FORW_VIA_DB
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data.pre
---- squid-2.6.STABLE17.orig/src/cf.data.pre	2007-11-26 13:03:45.000000000 +0200
-+++ squid-2.6.STABLE17/src/cf.data.pre	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.pre squid-2.6.STABLE20/src/cf.data.pre
+--- squid-2.6.STABLE20.orig/src/cf.data.pre	2008-04-21 05:56:24.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.pre	2008-05-15 00:48:08.000000000 +0300
 @@ -640,6 +640,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
@@ -123,7 +123,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3356,11 +3364,11 @@
+@@ -3357,11 +3365,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -137,7 +137,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  DOC_END
  
  NAME: mail_from
-@@ -3389,12 +3397,12 @@
+@@ -3390,12 +3398,12 @@
  
  NAME: cache_effective_user
  TYPE: string
@@ -152,7 +152,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  	cache_effective_group, Squid sets the GID to the effective
  	user's default group ID (taken from the password file) and
  	supplementary group list from the from groups membership of
-@@ -4031,12 +4039,12 @@
+@@ -4032,12 +4040,12 @@
  NAME: snmp_port
  TYPE: ushort
  LOC: Config.Port.snmp
@@ -168,7 +168,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  DOC_END
  
  NAME: snmp_access
-@@ -4107,12 +4115,12 @@
+@@ -4108,12 +4116,12 @@
  NAME: htcp_port
  IFDEF: USE_HTCP
  TYPE: ushort
@@ -184,7 +184,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  DOC_END
  
  NAME: log_icp_queries
-@@ -4964,6 +4972,9 @@
+@@ -4981,6 +4989,9 @@
  	If you disable this, it will appear as
  
  		X-Forwarded-For: unknown
@@ -194,9 +194,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  DOC_END
  
  NAME: cachemgr_passwd
-diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/src/client_side.c
---- squid-2.6.STABLE17.orig/src/client_side.c	2007-09-03 16:13:36.000000000 +0300
-+++ squid-2.6.STABLE17/src/client_side.c	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/client_side.c squid-2.6.STABLE20/src/client_side.c
+--- squid-2.6.STABLE20.orig/src/client_side.c	2007-09-03 16:13:36.000000000 +0300
++++ squid-2.6.STABLE20/src/client_side.c	2008-05-15 00:48:08.000000000 +0300
 @@ -4597,14 +4597,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 {
@@ -212,9 +212,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/client_side.c squid-2.6.STABLE17/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.STABLE17.orig/src/defines.h squid-2.6.STABLE17/src/defines.h
---- squid-2.6.STABLE17.orig/src/defines.h	2007-02-04 00:58:20.000000000 +0200
-+++ squid-2.6.STABLE17/src/defines.h	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/defines.h squid-2.6.STABLE20/src/defines.h
+--- squid-2.6.STABLE20.orig/src/defines.h	2007-02-04 00:58:20.000000000 +0200
++++ squid-2.6.STABLE20/src/defines.h	2008-05-15 00:48:08.000000000 +0300
 @@ -259,7 +259,7 @@
  
  /* were to look for errors if config path fails */
@@ -224,9 +224,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/defines.h squid-2.6.STABLE17/src/defines.h
  #endif
  
  /* gb_type operations */
-diff -Nru squid-2.6.STABLE17.orig/src/main.c squid-2.6.STABLE17/src/main.c
---- squid-2.6.STABLE17.orig/src/main.c	2007-11-26 12:47:23.000000000 +0200
-+++ squid-2.6.STABLE17/src/main.c	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/main.c squid-2.6.STABLE20/src/main.c
+--- squid-2.6.STABLE20.orig/src/main.c	2007-11-26 12:47:23.000000000 +0200
++++ squid-2.6.STABLE20/src/main.c	2008-05-15 00:48:08.000000000 +0300
 @@ -372,6 +372,22 @@
      asnFreeMemory();
  }
@@ -277,9 +277,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/main.c squid-2.6.STABLE17/src/main.c
  #endif
  	urlInitialize();
  	cachemgrInit();
-diff -Nru squid-2.6.STABLE17.orig/src/Makefile.am squid-2.6.STABLE17/src/Makefile.am
---- squid-2.6.STABLE17.orig/src/Makefile.am	2007-09-06 00:50:15.000000000 +0300
-+++ squid-2.6.STABLE17/src/Makefile.am	2007-12-04 14:29:27.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/Makefile.am squid-2.6.STABLE20/src/Makefile.am
+--- squid-2.6.STABLE20.orig/src/Makefile.am	2007-09-06 00:50:15.000000000 +0300
++++ squid-2.6.STABLE20/src/Makefile.am	2008-05-15 00:48:08.000000000 +0300
 @@ -325,12 +325,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
diff --git a/net-proxy/squid/files/squid-2.6.17-qos.patch b/net-proxy/squid/files/squid-2.6.20-qos.patch
index 7afe830db5d9..85569f5a3f51 100644
--- a/net-proxy/squid/files/squid-2.6.17-qos.patch
+++ b/net-proxy/squid/files/squid-2.6.20-qos.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-2.6.STABLE17.orig/src/cache_cf.c squid-2.6.STABLE17/src/cache_cf.c
---- squid-2.6.STABLE17.orig/src/cache_cf.c	2007-08-31 16:49:54.000000000 +0300
-+++ squid-2.6.STABLE17/src/cache_cf.c	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cache_cf.c squid-2.6.STABLE20/src/cache_cf.c
+--- squid-2.6.STABLE20.orig/src/cache_cf.c	2007-08-31 16:49:54.000000000 +0300
++++ squid-2.6.STABLE20/src/cache_cf.c	2008-05-15 00:50:05.000000000 +0300
 @@ -891,6 +891,65 @@
      }
  }
@@ -67,9 +67,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cache_cf.c squid-2.6.STABLE17/src/cache_cf
  #if DELAY_POOLS
  
  /* do nothing - free_delay_pool_count is the magic free function.
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.depend squid-2.6.STABLE17/src/cf.data.depend
---- squid-2.6.STABLE17.orig/src/cf.data.depend	2007-09-06 00:50:15.000000000 +0300
-+++ squid-2.6.STABLE17/src/cf.data.depend	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.depend squid-2.6.STABLE20/src/cf.data.depend
+--- squid-2.6.STABLE20.orig/src/cf.data.depend	2007-09-06 00:50:15.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.depend	2008-05-15 00:50:05.000000000 +0300
 @@ -5,6 +5,7 @@
  acl_address		acl
  acl_b_size_t		acl
@@ -78,9 +78,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.depend squid-2.6.STABLE17/src/cf.d
  address
  authparam
  b_int64_t
-diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data.pre
---- squid-2.6.STABLE17.orig/src/cf.data.pre	2007-12-04 14:38:45.000000000 +0200
-+++ squid-2.6.STABLE17/src/cf.data.pre	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/cf.data.pre squid-2.6.STABLE20/src/cf.data.pre
+--- squid-2.6.STABLE20.orig/src/cf.data.pre	2008-05-15 00:49:53.000000000 +0300
++++ squid-2.6.STABLE20/src/cf.data.pre	2008-05-15 00:50:05.000000000 +0300
 @@ -1239,6 +1239,27 @@
  	Default: 255 (TOS from server is not changed).
  DOC_END
@@ -109,9 +109,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/cf.data.pre squid-2.6.STABLE17/src/cf.data
  NAME: tcp_outgoing_address
  TYPE: acl_address
  DEFAULT: none
-diff -Nru squid-2.6.STABLE17.orig/src/comm.c squid-2.6.STABLE17/src/comm.c
---- squid-2.6.STABLE17.orig/src/comm.c	2007-04-17 12:39:56.000000000 +0300
-+++ squid-2.6.STABLE17/src/comm.c	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/comm.c squid-2.6.STABLE20/src/comm.c
+--- squid-2.6.STABLE20.orig/src/comm.c	2007-04-17 12:39:56.000000000 +0300
++++ squid-2.6.STABLE20/src/comm.c	2008-05-15 00:50:05.000000000 +0300
 @@ -162,7 +162,7 @@
      int flags,
      const char *note)
@@ -176,9 +176,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/comm.c squid-2.6.STABLE17/src/comm.c
      if (F->flags.close_on_exec)
  	commSetCloseOnExec(cs->fd);
      if (F->flags.nonblocking)
-diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
---- squid-2.6.STABLE17.orig/src/forward.c	2007-09-06 00:28:34.000000000 +0300
-+++ squid-2.6.STABLE17/src/forward.c	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/forward.c squid-2.6.STABLE20/src/forward.c
+--- squid-2.6.STABLE20.orig/src/forward.c	2008-04-02 04:16:29.000000000 +0300
++++ squid-2.6.STABLE20/src/forward.c	2008-05-15 00:50:05.000000000 +0300
 @@ -418,6 +418,17 @@
      return 0;
  }
@@ -197,7 +197,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
  struct in_addr
  getOutgoingAddr(request_t * request)
  {
-@@ -446,6 +457,20 @@
+@@ -456,6 +467,20 @@
      return aclMapTOS(Config.accessList.outgoing_tos, &ch);
  }
  
@@ -218,7 +218,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
  static void
  fwdConnectStart(void *data)
  {
-@@ -462,6 +487,7 @@
+@@ -472,6 +497,7 @@
      int ftimeout = Config.Timeout.forward - (squid_curtime - fwdState->start);
      struct in_addr outgoing;
      unsigned short tos;
@@ -226,7 +226,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
  #if LINUX_TPROXY
      struct in_tproxy itp;
  #endif
-@@ -547,15 +573,17 @@
+@@ -557,15 +583,17 @@
  #endif
      outgoing = getOutgoingAddr(fwdState->request);
      tos = getOutgoingTOS(fwdState->request);
@@ -246,9 +246,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/forward.c squid-2.6.STABLE17/src/forward.c
  	url);
      if (fd < 0) {
  	debug(50, 4) ("fwdConnectStart: %s\n", xstrerror());
-diff -Nru squid-2.6.STABLE17.orig/src/protos.h squid-2.6.STABLE17/src/protos.h
---- squid-2.6.STABLE17.orig/src/protos.h	2007-07-15 12:52:17.000000000 +0300
-+++ squid-2.6.STABLE17/src/protos.h	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/protos.h squid-2.6.STABLE20/src/protos.h
+--- squid-2.6.STABLE20.orig/src/protos.h	2007-07-15 12:52:17.000000000 +0300
++++ squid-2.6.STABLE20/src/protos.h	2008-05-15 00:50:05.000000000 +0300
 @@ -160,7 +160,7 @@
  extern void comm_init(void);
  extern int comm_listen(int sock);
@@ -266,9 +266,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/protos.h squid-2.6.STABLE17/src/protos.h
  
  extern void urnStart(request_t *, StoreEntry *);
  
-diff -Nru squid-2.6.STABLE17.orig/src/ssl.c squid-2.6.STABLE17/src/ssl.c
---- squid-2.6.STABLE17.orig/src/ssl.c	2007-02-03 23:53:38.000000000 +0200
-+++ squid-2.6.STABLE17/src/ssl.c	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/ssl.c squid-2.6.STABLE20/src/ssl.c
+--- squid-2.6.STABLE20.orig/src/ssl.c	2007-02-03 23:53:38.000000000 +0200
++++ squid-2.6.STABLE20/src/ssl.c	2008-05-15 00:50:05.000000000 +0300
 @@ -524,6 +524,7 @@
  	0,
  	COMM_NONBLOCKING,
@@ -277,9 +277,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/ssl.c squid-2.6.STABLE17/src/ssl.c
  	url);
      if (sock == COMM_ERROR) {
  	debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
-diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
---- squid-2.6.STABLE17.orig/src/structs.h	2007-12-04 14:38:45.000000000 +0200
-+++ squid-2.6.STABLE17/src/structs.h	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/structs.h squid-2.6.STABLE20/src/structs.h
+--- squid-2.6.STABLE20.orig/src/structs.h	2008-05-15 00:49:53.000000000 +0300
++++ squid-2.6.STABLE20/src/structs.h	2008-05-15 00:50:05.000000000 +0300
 @@ -296,6 +296,12 @@
      int tos;
  };
@@ -293,7 +293,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
  struct _aclCheck_t {
      const acl_access *access_list;
      struct in_addr src_addr;
-@@ -705,6 +711,7 @@
+@@ -706,6 +712,7 @@
  	acl_access *reply;
  	acl_address *outgoing_address;
  	acl_tos *outgoing_tos;
@@ -301,7 +301,7 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
  #if USE_HTCP
  	acl_access *htcp;
  	acl_access *htcp_clr;
-@@ -876,6 +883,7 @@
+@@ -877,6 +884,7 @@
      u_short remote_port;
      struct in_addr local_addr;
      unsigned char tos;
@@ -309,9 +309,9 @@ diff -Nru squid-2.6.STABLE17.orig/src/structs.h squid-2.6.STABLE17/src/structs.h
      char ipaddr[16];		/* dotted decimal address of peer */
      char desc[FD_DESC_SZ];
      struct {
-diff -Nru squid-2.6.STABLE17.orig/src/typedefs.h squid-2.6.STABLE17/src/typedefs.h
---- squid-2.6.STABLE17.orig/src/typedefs.h	2006-09-02 17:08:42.000000000 +0300
-+++ squid-2.6.STABLE17/src/typedefs.h	2007-12-04 14:38:58.000000000 +0200
+diff -Nru squid-2.6.STABLE20.orig/src/typedefs.h squid-2.6.STABLE20/src/typedefs.h
+--- squid-2.6.STABLE20.orig/src/typedefs.h	2006-09-02 17:08:42.000000000 +0300
++++ squid-2.6.STABLE20/src/typedefs.h	2008-05-15 00:50:05.000000000 +0300
 @@ -102,6 +102,7 @@
  typedef struct _acl_access acl_access;
  typedef struct _acl_address acl_address;
diff --git a/net-proxy/squid/files/squid-3.0.1-gentoo.patch b/net-proxy/squid/files/squid-3.0.5-gentoo.patch
index 35c7ac8320b1..e13422042960 100644
--- a/net-proxy/squid/files/squid-3.0.1-gentoo.patch
+++ b/net-proxy/squid/files/squid-3.0.5-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE1/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/confload.c	2002-06-26 22:09:48.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/basic_auth/MSNT/confload.c	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE5/helpers/basic_auth/MSNT/confload.c
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/confload.c	2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/MSNT/confload.c	2008-05-15 00:29:57.000000000 +0300
 @@ -24,7 +24,7 @@
  
  /* Path to configuration file */
@@ -10,9 +10,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.ST
  #endif
  #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
  
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE1/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2002-06-26 21:44:28.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/basic_auth/MSNT/msntauth.conf.default	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/MSNT/msntauth.conf.default	2008-05-15 00:29:57.000000000 +0300
 @@ -8,6 +8,6 @@
  server other_PDC	other_BDC	otherdomain
  
@@ -22,9 +22,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/MSNT/msntauth.conf.default s
 +#denyusers	/etc/squid/msntauth.denyusers
 +#allowusers	/etc/squid/msntauth.allowusers
  
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/Makefile.am	2003-01-23 02:35:40.000000000 +0200
-+++ squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE5/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/Makefile.am	2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/SMB/Makefile.am	2008-05-15 00:29:57.000000000 +0300
 @@ -14,7 +14,7 @@
  ## FIXME: autoconf should test for the samba path.
  
@@ -34,9 +34,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.ST
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  
  libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE1/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh	2001-01-08 01:36:46.000000000 +0200
-+++ squid-3.0.STABLE1/helpers/basic_auth/SMB/smb_auth.sh	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE5/helpers/basic_auth/SMB/smb_auth.sh
+--- squid-3.0.STABLE5.orig/helpers/basic_auth/SMB/smb_auth.sh	2008-04-29 06:43:27.000000000 +0300
++++ squid-3.0.STABLE5/helpers/basic_auth/SMB/smb_auth.sh	2008-05-15 00:29:57.000000000 +0300
 @@ -24,7 +24,7 @@
  read AUTHSHARE
  read AUTHFILE
@@ -55,9 +55,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.ST
  echo "Domain controller IP address: $dcip"
  [ -n "$dcip" ] || exit 1
  
-diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE1/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE1.orig/helpers/external_acl/session/squid_session.8	2007-06-25 14:31:46.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/external_acl/session/squid_session.8	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE5/helpers/external_acl/session/squid_session.8
+--- squid-3.0.STABLE5.orig/helpers/external_acl/session/squid_session.8	2008-04-29 06:43:28.000000000 +0300
++++ squid-3.0.STABLE5/helpers/external_acl/session/squid_session.8	2008-05-15 00:29:57.000000000 +0300
 @@ -35,7 +35,7 @@
  .P
  Configuration example using the default automatic mode
@@ -67,9 +67,9 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/session/squid_session.8 sq
  .IP
  acl session external session
  .IP
-diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE1/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE1.orig/helpers/external_acl/unix_group/squid_unix_group.8	2006-05-05 15:44:26.000000000 +0300
-+++ squid-3.0.STABLE1/helpers/external_acl/unix_group/squid_unix_group.8	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8
+--- squid-3.0.STABLE5.orig/helpers/external_acl/unix_group/squid_unix_group.8	2008-04-29 06:43:28.000000000 +0300
++++ squid-3.0.STABLE5/helpers/external_acl/unix_group/squid_unix_group.8	2008-05-15 00:29:57.000000000 +0300
 @@ -27,7 +27,7 @@
  This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
  matches users in group2 or group3
@@ -79,10 +79,10 @@ diff -Nru squid-3.0.STABLE1.orig/helpers/external_acl/unix_group/squid_unix_grou
  .IP
  acl usergroup1 external unix_group group1
  .IP
-diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.pre
---- squid-3.0.STABLE1.orig/src/cf.data.pre	2007-11-16 01:33:05.000000000 +0200
-+++ squid-3.0.STABLE1/src/cf.data.pre	2007-12-20 11:06:11.000000000 +0200
-@@ -622,6 +622,8 @@
+diff -Nru squid-3.0.STABLE5.orig/src/cf.data.pre squid-3.0.STABLE5/src/cf.data.pre
+--- squid-3.0.STABLE5.orig/src/cf.data.pre	2008-04-29 06:43:31.000000000 +0300
++++ squid-3.0.STABLE5/src/cf.data.pre	2008-05-15 00:29:57.000000000 +0300
+@@ -638,6 +638,8 @@
  acl Safe_ports port 488		# gss-http
  acl Safe_ports port 591		# filemaker
  acl Safe_ports port 777		# multiling http
@@ -91,7 +91,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
  acl CONNECT method CONNECT
  NOCOMMENT_END
  DOC_END
-@@ -655,6 +657,9 @@
+@@ -671,6 +673,9 @@
  # Only allow cachemgr access from localhost
  http_access allow manager localhost
  http_access deny manager
@@ -101,7 +101,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
  # Deny requests to unknown ports
  http_access deny !Safe_ports
  # Deny CONNECT to other than SSL ports
-@@ -672,6 +677,9 @@
+@@ -688,6 +693,9 @@
  # from where browsing should be allowed
  http_access allow localnet
  
@@ -111,7 +111,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
  # And finally deny all other access to this proxy
  http_access deny all
  NOCOMMENT_END
-@@ -3198,11 +3206,11 @@
+@@ -3216,11 +3224,11 @@
  
  NAME: cache_mgr
  TYPE: string
@@ -125,7 +125,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
  DOC_END
  
  NAME: mail_from
-@@ -5138,6 +5146,9 @@
+@@ -5156,6 +5164,9 @@
  	If you disable this, it will appear as
  
  		X-Forwarded-For: unknown
@@ -135,10 +135,10 @@ diff -Nru squid-3.0.STABLE1.orig/src/cf.data.pre squid-3.0.STABLE1/src/cf.data.p
  DOC_END
  
  NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE1.orig/src/debug.cc squid-3.0.STABLE1/src/debug.cc
---- squid-3.0.STABLE1.orig/src/debug.cc	2007-12-04 17:20:22.000000000 +0200
-+++ squid-3.0.STABLE1/src/debug.cc	2007-12-20 11:06:11.000000000 +0200
-@@ -466,7 +466,7 @@
+diff -Nru squid-3.0.STABLE5.orig/src/debug.cc squid-3.0.STABLE5/src/debug.cc
+--- squid-3.0.STABLE5.orig/src/debug.cc	2008-04-29 06:43:31.000000000 +0300
++++ squid-3.0.STABLE5/src/debug.cc	2008-05-15 00:29:57.000000000 +0300
+@@ -465,7 +465,7 @@
  #if HAVE_SYSLOG && defined(LOG_LOCAL4)
  
      if (opt_syslog_enable)
@@ -147,9 +147,9 @@ diff -Nru squid-3.0.STABLE1.orig/src/debug.cc squid-3.0.STABLE1/src/debug.cc
  
  #endif /* HAVE_SYSLOG */
  
-diff -Nru squid-3.0.STABLE1.orig/src/defines.h squid-3.0.STABLE1/src/defines.h
---- squid-3.0.STABLE1.orig/src/defines.h	2007-08-13 20:20:51.000000000 +0300
-+++ squid-3.0.STABLE1/src/defines.h	2007-12-20 11:06:11.000000000 +0200
+diff -Nru squid-3.0.STABLE5.orig/src/defines.h squid-3.0.STABLE5/src/defines.h
+--- squid-3.0.STABLE5.orig/src/defines.h	2008-04-29 06:43:31.000000000 +0300
++++ squid-3.0.STABLE5/src/defines.h	2008-05-15 00:29:57.000000000 +0300
 @@ -219,7 +219,7 @@
  
  /* were to look for errors if config path fails */
@@ -159,10 +159,10 @@ diff -Nru squid-3.0.STABLE1.orig/src/defines.h squid-3.0.STABLE1/src/defines.h
  #endif
  
  /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
---- squid-3.0.STABLE1.orig/src/main.cc	2007-12-02 10:23:56.000000000 +0200
-+++ squid-3.0.STABLE1/src/main.cc	2007-12-20 11:06:11.000000000 +0200
-@@ -1472,7 +1472,7 @@
+diff -Nru squid-3.0.STABLE5.orig/src/main.cc squid-3.0.STABLE5/src/main.cc
+--- squid-3.0.STABLE5.orig/src/main.cc	2008-04-29 06:43:32.000000000 +0300
++++ squid-3.0.STABLE5/src/main.cc	2008-05-15 00:29:57.000000000 +0300
+@@ -1480,7 +1480,7 @@
      if (*(argv[0]) == '(')
          return;
  
@@ -171,7 +171,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
  
      if ((pid = fork()) < 0)
          syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1516,7 +1516,7 @@
+@@ -1524,7 +1524,7 @@
  
          if ((pid = fork()) == 0) {
              /* child */
@@ -180,7 +180,7 @@ diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
              prog = xstrdup(argv[0]);
              argv[0] = xstrdup("(squid)");
              execvp(prog, argv);
-@@ -1524,7 +1524,7 @@
+@@ -1532,7 +1532,7 @@
          }
  
          /* parent */
@@ -189,10 +189,10 @@ diff -Nru squid-3.0.STABLE1.orig/src/main.cc squid-3.0.STABLE1/src/main.cc
  
          syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
  
-diff -Nru squid-3.0.STABLE1.orig/src/Makefile.am squid-3.0.STABLE1/src/Makefile.am
---- squid-3.0.STABLE1.orig/src/Makefile.am	2007-10-31 06:52:15.000000000 +0200
-+++ squid-3.0.STABLE1/src/Makefile.am	2007-12-20 11:06:11.000000000 +0200
-@@ -986,12 +986,12 @@
+diff -Nru squid-3.0.STABLE5.orig/src/Makefile.am squid-3.0.STABLE5/src/Makefile.am
+--- squid-3.0.STABLE5.orig/src/Makefile.am	2008-04-29 06:43:30.000000000 +0300
++++ squid-3.0.STABLE5/src/Makefile.am	2008-05-15 00:29:57.000000000 +0300
+@@ -988,12 +988,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
  DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/squid-2.6.17.ebuild b/net-proxy/squid/squid-2.6.20.ebuild
index aa10becc99b3..457cb2c4d84d 100644
--- a/net-proxy/squid/squid-2.6.17.ebuild
+++ b/net-proxy/squid/squid-2.6.20.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.17.ebuild,v 1.7 2007/12/06 02:32:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.20.ebuild,v 1.1 2008/05/14 22:02:09 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
+inherit eutils pam toolchain-funcs autotools linux-info
 
 #lame archive versioning scheme..
 S_PMV="${PV%%.*}"
@@ -20,15 +20,15 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate qos zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux"
 
 DEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.3.35 )
-	ssl? ( >=dev-libs/openssl-0.9.8d )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.22 )
+	ldap? ( net-nds/openldap )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sec-policy/selinux-squid )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
@@ -53,10 +53,6 @@ src_unpack() {
 
 	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
 }
 
diff --git a/net-proxy/squid/squid-3.0.1.ebuild b/net-proxy/squid/squid-3.0.5.ebuild
index 4a42d241ff27..3768681a0595 100644
--- a/net-proxy/squid/squid-3.0.1.ebuild
+++ b/net-proxy/squid/squid-3.0.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.1.ebuild,v 1.1 2007/12/20 10:07:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.5.ebuild,v 1.1 2008/05/14 22:02:09 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
+inherit eutils pam toolchain-funcs autotools linux-info
 
 # lame archive versioning scheme..
 S_PMV="${PV%%.*}"
@@ -27,9 +27,9 @@ IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \
 	elibc_uclibc kernel_linux"
 
 DEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.3.35 )
-	ssl? ( >=dev-libs/openssl-0.9.8d )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.22 )
+	ldap? ( net-nds/openldap )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sec-policy/selinux-squid )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4