Add libcap dependency (#274668).

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

14 files changed, 96 insertions, 1254 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 2fd59fa3fa74..ac848c744cc2 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.256 2009/06/19 15:55:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.257 2009/06/23 19:45:10 mrness Exp $
+
+  23 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  files/squid-2-capability.patch, -files/squid-3.0.13-adapted-zph.patch,
+  -files/squid-3.0.13-gentoo.patch, -files/squid-3.0.13-heimdal.patch,
+  -files/squid-3.1.0.7_beta-gentoo.patch, files/squid-3-capability.patch,
+  squid-2.7.6-r1.ebuild, -squid-3.0.13.ebuild, squid-3.0.15.ebuild,
+  squid-3.0.16.ebuild, -squid-3.1.0.7_beta.ebuild,
+  squid-3.1.0.8_beta.ebuild:
+  Add libcap dependency (#274668).
 
   19 Jun 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.15.ebuild:
   alpha/arm/ia64/sparc stable wrt #274405
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index a153ec0de58f..2a2e87e9f94f 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,10 +1,10 @@
-AUX squid-2-capability.patch 500 RMD160 b5b7b84d292f03e639f9026ce403ef1ba4a16bd2 SHA1 a94ac183ada5f4367b5e40e47dc63ca8822c7620 SHA256 63b62b7b2a81a71c15f1112f008e2d986b8c22588d5902da537e6593a7dde0da
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX squid-2-capability.patch 968 RMD160 090e246d747426a77b0c5404187adbe789954990 SHA1 8263927da130d0f080f0163042adaa1f4cc1a29e SHA256 53d3738dfc8f8eaca16d1547983e216e54dfe790ae1e356974acb494545b5941
 AUX squid-2.7.6-gentoo.patch 13118 RMD160 5d51d90af5b85158507d231ce57aa544cc790c7d SHA1 52a95fc33a5eaecf57f95709747fb0a8b88a8c97 SHA256 5181fa5faccfeb328a0288bd711d31597ba414efcd807ac7a46630414ac0a9eb
 AUX squid-2.7.6-heimdal.patch 776 RMD160 2ced12e7682356ee2eb660d877437c3ddad6476e SHA1 3a693c2c975fe4c77ee729d8af8ef28097b11fb6 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25
-AUX squid-3-capability.patch 386 RMD160 10c1798316240ae568cab863a01d181d36b26b65 SHA1 ef27b2841352dfa0671de907c23ad989809c629a SHA256 8317311aaca4050b75d5e72dcd749493f4dfd09b95205bd21adeec9fc9477ff6
-AUX squid-3.0.13-adapted-zph.patch 6838 RMD160 5a8728e93498ce03fdcbc1926c63271d562b9671 SHA1 1f6453eb8d00e3ac84b4000aeb14cdf3da54f9d4 SHA256 13f4c3cd42ce662cf0e13fb4ca27b0e50562d22af69aabc373a1ff299c694a29
-AUX squid-3.0.13-gentoo.patch 13095 RMD160 5184e54faef48bf5ed8c93d92761e39be8885739 SHA1 f671c6aa4a051b9f454afc08769bafedc3c92f2e SHA256 2209444bdd0149404a77478f8d445cc7a0b4e012a25557dbf8a2e3659b0883d9
-AUX squid-3.0.13-heimdal.patch 780 RMD160 4cf5b9494a0537bdd0f886b46e7f0685d0e428be SHA1 71b99ceed606c3e41db9f0f78a8d993d8e35a407 SHA256 a51da87baf57bf251c0c401a29b296a89ffa391f5da6e821bbe15a309dd76537
+AUX squid-3-capability.patch 900 RMD160 12aea476ae7d339bca2e2a03037c117fa5dae6cd SHA1 80a217b307ed2463b589aa34767f0451b2e87b6f SHA256 482ab884396104996896add68a5e5a77034221c7033e89345d2fd34a85dd630d
 AUX squid-3.0.14-adapted-zph.patch 6838 RMD160 ec057b12e243301e734dc4296690919e08a33731 SHA1 d8d4c604ea5b0adba50f83f43ec17fff58ca7fdd SHA256 5bace554b163c67c4084fcfb4e3f5ecca8cf447f6f5a5992c790ccb191b35369
 AUX squid-3.0.14-cross-compile.patch 1234 RMD160 24c77750020a9ae61bb64f7e92215c183f28f156 SHA1 6dd2a77f9c2d1f17cc0420200a5b18485d105638 SHA256 32108a3856c219b0ce2af066333bd58b7a2932748474ec48d25cf4bc72f629f8
 AUX squid-3.0.14-gcc43.patch 901 RMD160 6ac1b123a79a205f5b2834c472ae02a8db325eb4 SHA1 d3f8b99b0db48a9411c001296dc9c7e3401fb32b SHA256 47caa6fb8d93353fcb63d0ec970dad46cf4863230b8afdb0992ca6d34fe051d2
@@ -19,7 +19,6 @@ AUX squid-3.0.15-heimdal.patch 780 RMD160 29d0867ff851083facaf641c297e823e687790
 AUX squid-3.0.16-adapted-zph.patch 6838 RMD160 8a3aeddf48efccae072c6a4515cb188562a5bb91 SHA1 cfc842049aa81adb388e78a3aa5b9efbf6d92642 SHA256 b85e78df0e5f8e51f7da6386e502cc82965e4375d4f1f4e04504d04ad488964a
 AUX squid-3.0.16-cross-compile.patch 1234 RMD160 d4420fe001d2aa42b321f1c6d52bec542a23b29f SHA1 fd1a82814c09f77ff1cba4b0abb87be07281c325 SHA256 3ce33f078f120ee30b66f957dcb1ba427360b974f3458db2fc4261458f1f1d15
 AUX squid-3.0.16-gentoo.patch 13095 RMD160 b0ca0fad05db493358f426eb014a13c46806af63 SHA1 392cb4aa66ab3bda1f564da5945322a9dfe78e48 SHA256 3d357bfe5b8ab8ac214fed250f669f5fa1c55e091300d98dc5dcec25e328049d
-AUX squid-3.1.0.7_beta-gentoo.patch 13196 RMD160 b9637d05f7ee6aa5b938ed9a4f83171a6ba62f10 SHA1 d3dc845247d7408e0d7e2aea9c2b60c5fa85abe4 SHA256 ea185f7571b3e45353c69f728e2b8244c35348809860f7bc76675b8a49948b0d
 AUX squid-3.1.0.8_beta-gentoo.patch 13065 RMD160 342d53821886dac30a795045bda97ff977579411 SHA1 c93f34184b5891c247ab3953a899e274e39aef80 SHA256 ff5129871179ebbb2e6adff43129fd20b534018005213f2daa3a0319a9421ab4
 AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
@@ -29,18 +28,21 @@ AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
 DIST squid-2.7.STABLE6.tar.gz 1786189 RMD160 ca59583e9d938c3184a306984f034553f768e942 SHA1 0f66afca85444f7d4f49a527470ef14741904db0 SHA256 0aeb0dd601822711cf8e131d82de8bc64e918adbcfea7e834c4529895759331a
 DIST squid-3.0.14-chunk-encoding.patch.gz 7342 RMD160 c4943c2223858b209a294903917e720a4f328ab5 SHA1 ae2e280e66f44bedce1a3b4e45a62615e8b64eae SHA256 a254c0a9d802daacd159512baab98a6f6c5a3b1d6876141f23b6395e79b5f3ac
-DIST squid-3.0.STABLE13.tar.gz 2454967 RMD160 8da76671013bf4100cbc4c2976e228f81323344e SHA1 6f0f1079a027c64a9f95b7b6c9bdd943af28a42e SHA256 8764fe16c8873bcc5c0c7e5f97b22e70dec186d1182ca4803ec94761bac750e1
 DIST squid-3.0.STABLE14.tar.gz 2456387 RMD160 eebdf3083e8018ded08861e72ee46cb32ba33ef6 SHA1 c073feeb3b94972523756f8f69cd1df09f3918a9 SHA256 9e5f8f5456e98d82dc4c5fcbcf50745a36b9860fc553cf2719f02d423e535712
 DIST squid-3.0.STABLE15.tar.gz 2441793 RMD160 35a8715928ba916a448df9331bfb0c99feb85523 SHA1 31c1eac13c8ca3d98ccbd8f4b04f1aeb26bde433 SHA256 cdf5453dbe62a9250f90fce2770322d6b0d0c50d0a365a018d17e00383d14544
 DIST squid-3.0.STABLE16.tar.gz 2449986 RMD160 d9e019ef5c2fb26f0a16a9bfbce5fe0269360ab1 SHA1 3d0ba0e509b7939b9023f1b25cc956e4ac3c0ba1 SHA256 a50c9d1d276f59a2754f13c27468445290930c000cb1457160bfe8898620b615
-DIST squid-3.1.0.7.tar.gz 3051051 RMD160 9522e64a78bc19a07cff79109da6b8d99f4fada6 SHA1 eff28b0c5600d07938882013021f1707f58162ae SHA256 57c4c7edfe2b87f2b62b5c53521429857d68289a2abeda30adbbe59fd5a748f7
 DIST squid-3.1.0.8.tar.gz 3187808 RMD160 96d407feadf19844b72b094ba15a001789d0be72 SHA1 79452bd38fa942c1f70bb42f733299d6c4090239 SHA256 2d0ce79d59853e4b1617c2942a1a47f7ddff649751d0dc2a47d74b012757af90
-EBUILD squid-2.7.6-r1.ebuild 5940 RMD160 5b91d674be3300c7bfed7d1b30df48a2f038396d SHA1 164412cead1a39412d488cce3736b8908d315e04 SHA256 5981bf0f065742f28bf6a1941779f5df7b8e53a3f2b83352d85c89afe70a61e2
-EBUILD squid-3.0.13.ebuild 6458 RMD160 d3ca104a621de1e4f435bf8ca74c50f130210710 SHA1 f2ee7dcd7269d5024b1e1c82ea4341336a7e9766 SHA256 0606094713ec67bbbdbd37592f28d5babde42a93c8be76e1d20487afe296bbc2
+EBUILD squid-2.7.6-r1.ebuild 6002 RMD160 28f2996fd27d161cb6f165e242492824255edb41 SHA1 32bce5d5cb492600ecf6c9006447e2c901864ae0 SHA256 58ba369d323c21e481df76306b17b9de607507a4cc3c53e493282d48375dfba5
 EBUILD squid-3.0.14-r2.ebuild 6592 RMD160 e8a8059445b73f15c22892446a8e3438ca6832b0 SHA1 a3be279eb3ee1bfd47cfb21d2a666530abd2b250 SHA256 812d4957678d17512fe418a9c16e2f7a84356e736ade7ba33871e793569b6c80
-EBUILD squid-3.0.15.ebuild 6563 RMD160 509dd37e84f6fe46301aa05b8b25f40203007b55 SHA1 105768071f7bd925a3852bdde292f7dcde753ddd SHA256 11816e07446fcad95cb45741b1f864d7d9b6292daa71c53d1c3775c58c6209b8
-EBUILD squid-3.0.16.ebuild 6345 RMD160 60d081b113dbbbeac167e902fab620d67b2701d4 SHA1 c65477023921acb8f242a6b2711f31a383162f2f SHA256 da0694055e70cf47fa21375eefbc3c16765cec1e6cb9ee9976c86e93e41e4134
-EBUILD squid-3.1.0.7_beta.ebuild 6717 RMD160 7113becd62ce2c77b79120cd3f69422adc690dd4 SHA1 d2fa3e4525d4a8617a16f3db76d47802edbbca2c SHA256 0199755988a9da9485c3ba464e85524b8d81c275aefba60906baad5c16aa435d
-EBUILD squid-3.1.0.8_beta.ebuild 6513 RMD160 e437b118c10fa86c06454d8b42ed86c7e617a705 SHA1 2f8989d5967d21fe4ad936da1b0f548c7dfe2992 SHA256 185e63f379b363088aac803be4cb3110b8e7efab7130eabf04868eae8f9a7da3
-MISC ChangeLog 55564 RMD160 928181bb9eb329f5d725d6c77ebe1270f356d46d SHA1 e562d9c89368942d26245fd78122958267103140 SHA256 ed61e0ca07a752cb23852fb6af6a9b803b5dfae8200d12606dc9435c7e5ef492
+EBUILD squid-3.0.15.ebuild 6624 RMD160 cef164e807c4c610512666cca65ec707bc727172 SHA1 13caf5ecb5149b96e1bb006406dad952356e3144 SHA256 919cc00f885ccf73d4d52951165e77aa9781fc4cea19032b46003e4528ddcf6e
+EBUILD squid-3.0.16.ebuild 6407 RMD160 45834e54bf4dbef2b39d0de0fa6e8fbc40f73749 SHA1 135c059df45346dc210f0813d863b6b775945840 SHA256 fec6884fd01a19ae25941a58171461ca5a90f3b25b1491809b2e056394984667
+EBUILD squid-3.1.0.8_beta.ebuild 6575 RMD160 a7a3c93cb7dd2a3912f3eedb43b94f02b27a43f1 SHA1 3cb75d17a6c17e9d269b73b10dbae7f94227101b SHA256 1a992602d63ae6353eb5eb773004657e6e3b9b1a4665e915f9eacb231a5565ca
+MISC ChangeLog 56013 RMD160 0f0c5bbd5b804bcf9acd7d76a411499a4abf5cfd SHA1 0b89ef83a3810c0ca86767509a92f152a2d673a3 SHA256 e7f78d1777c5192ca634dfe29be7a1f83a0b8b1e42df73daa0620a7ac4a3287d
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpBMNUACgkQts85UDFmaOVlmgCfR8KwF5GvmS1znDqxytI94RRZ
+hyUAn3HoMgtv1b4FEp+KJcU+wBjHvpxL
+=Lts+
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2-capability.patch b/net-proxy/squid/files/squid-2-capability.patch
index da55945d52ca..f4b1b9363be1 100644
--- a/net-proxy/squid/files/squid-2-capability.patch
+++ b/net-proxy/squid/files/squid-2-capability.patch
@@ -1,6 +1,29 @@
-diff -Nru squid-2.7.STABLE6.orig/src/tools.c squid-2.7.STABLE6/src/tools.c
---- squid-2.7.STABLE6.orig/src/tools.c	2008-10-06 23:27:17.000000000 +0200
-+++ squid-2.7.STABLE6/src/tools.c	2009-06-15 23:40:53.000000000 +0200
+--- configure.in	2009-02-04 01:44:06.000000000 +0100
++++ configure.in	2009-06-23 20:59:28.000000000 +0200
+@@ -1694,7 +1694,6 @@
+ 	db.h \
+ 	db_185.h \
+ 	aio.h \
+-	sys/capability.h \
+ ,,,[
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -1728,6 +1727,13 @@
+ #endif
+ ])
+ 
++dnl Check for libcap header
++AC_ARG_ENABLE(caps,
++[  --disable-caps  disable usage of Linux capabilities library to control privileges])
++if test "$enable_caps" = yes; then
++	AC_CHECK_HEADERS( sys/capability.h )
++fi
++
+ dnl Check for IP-Filter headers. These are a bit nasty..
+ AC_CHECK_HEADERS( \
+ 	ip_compat.h \
+--- src/tools.c	2008-10-06 23:27:17.000000000 +0200
++++ src/tools.c	2009-06-23 20:57:42.000000000 +0200
 @@ -42,11 +42,6 @@
  
  #ifdef _SQUID_LINUX_
diff --git a/net-proxy/squid/files/squid-3-capability.patch b/net-proxy/squid/files/squid-3-capability.patch
index b251ad745267..c5b56b15cee2 100644
--- a/net-proxy/squid/files/squid-3-capability.patch
+++ b/net-proxy/squid/files/squid-3-capability.patch
@@ -1,5 +1,26 @@
---- src/tools.cc	2009-05-06 13:11:42.000000000 +0200
-+++ src/tools.cc	2009-06-15 23:33:00.000000000 +0200
+--- configure.in	2009-04-11 10:35:42.000000000 +0200
++++ configure.in	2009-06-23 21:12:56.000000000 +0200
+@@ -1940,10 +1940,16 @@
+ 	inttypes.h \
+ 	grp.h \
+ 	db.h \
+-	db_185.h \
+-	sys/capability.h
++	db_185.h
+ )
+ 
++dnl Check for libcap header
++AC_ARG_ENABLE(caps,
++[  --disable-caps  disable usage of Linux capabilities library to control privileges])
++if test "$enable_caps" = yes; then
++	AC_CHECK_HEADERS( sys/capability.h )
++fi
++
+ AC_CHECK_HEADERS(
+ 	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
+--- src/tools.cc	2009-04-11 10:35:42.000000000 +0200
++++ src/tools.cc	2009-06-23 21:11:11.000000000 +0200
 @@ -42,11 +42,6 @@
  
  #ifdef _SQUID_LINUX_
diff --git a/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch b/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch
deleted file mode 100644
index 4f0395976237..000000000000
--- a/net-proxy/squid/files/squid-3.0.13-adapted-zph.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -Nru squid-3.0.STABLE13.orig/src/cf.data.pre squid-3.0.STABLE13/src/cf.data.pre
---- squid-3.0.STABLE13.orig/src/cf.data.pre	2009-02-16 23:20:51.000000000 +0000
-+++ squid-3.0.STABLE13/src/cf.data.pre	2009-02-16 23:21:13.000000000 +0000
-@@ -1133,6 +1133,60 @@
- 	making the request.
- DOC_END
- 
-+NAME: zph_tos_local
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_local
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark local hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_peer
-+TYPE: int
-+DEFAULT: 0
-+LOC: Config.zph_tos_peer
-+DOC_START
-+       Allows you to select a TOS/Diffserv value to mark peer hits. Read above
-+       (tcp_outgoing_tos) for details/requirements about TOS.
-+       Default: 0 (disabled).
-+DOC_END
-+
-+NAME: zph_tos_parent
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_tos_parent
-+DEFAULT: on
-+DOC_START
-+       Set this to off if you want only sibling hits to be marked.
-+       If set to on (default), parent hits are being marked too.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos
-+COMMENT: on|off
-+TYPE: onoff
-+LOC: Config.onoff.zph_preserve_miss_tos
-+DEFAULT: on
-+DOC_START
-+       If set to on (default), any HTTP response towards clients will
-+       have the TOS value of the response comming from the remote
-+       server masked with the value of zph_preserve_miss_tos_mask.
-+       For this to work correctly, you will need to patch your linux
-+       kernel with the TOS preserving ZPH patch.
-+DOC_END
-+
-+NAME: zph_preserve_miss_tos_mask
-+TYPE: int
-+DEFAULT: 255
-+LOC: Config.zph_preserve_miss_tos_mask
-+DOC_START
-+       Allows you to mask certain bits in the TOS received from the
-+       remote server, before copying the value to the TOS send towards
-+       clients.
-+       Default: 255 (TOS from server is not changed).
-+DOC_END
-+
- NAME: tcp_outgoing_address
- TYPE: acl_address
- DEFAULT: none
-diff -Nru squid-3.0.STABLE13.orig/src/client_side_reply.cc squid-3.0.STABLE13/src/client_side_reply.cc
---- squid-3.0.STABLE13.orig/src/client_side_reply.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/client_side_reply.cc	2009-02-16 23:21:13.000000000 +0000
-@@ -48,6 +48,7 @@
- #include "ESI.h"
- #endif
- #include "MemObject.h"
-+#include "fde.h"
- #include "ACLChecklist.h"
- #include "ACL.h"
- #if DELAY_POOLS
-@@ -1548,6 +1549,11 @@
-         /* guarantee nothing has been sent yet! */
-         assert(http->out.size == 0);
-         assert(http->out.offset == 0);
-+        if (Config.zph_tos_local)
-+      	{
-+			debugs(33, 1, "ZPH hit hier.code=" << http->request->hier.code <<" TOS="<<Config.zph_tos_local);
-+	    	comm_set_tos(http->getConn()->fd,Config.zph_tos_local);
-+      	}             
-         tempBuffer.offset = reqofs;
-         tempBuffer.length = getNextNode()->readBuffer.length;
-         tempBuffer.data = getNextNode()->readBuffer.data;
-@@ -1827,6 +1833,24 @@
-     char *buf = next()->readBuffer.data;
- 
-     char *body_buf = buf;
-+    
-+    if (reqofs==0 && !logTypeIsATcpHit(http->logType))
-+    {
-+		int tos = 0;
-+		if (Config.zph_tos_peer && 
-+    	 	 (http->request->hier.code==SIBLING_HIT ||
-+			 (Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT)))
-+		{
-+			tos = Config.zph_tos_peer;
-+			debugs(33, 1, "ZPH: Peer hit, TOS="<<tos<<" hier.code="<<http->request->hier.code);
-+		}
-+		else if (Config.onoff.zph_preserve_miss_tos && Config.zph_preserve_miss_tos_mask)
-+		{
-+			tos = fd_table[fd].upstreamTOS & Config.zph_preserve_miss_tos_mask;
-+			debugs(33, 1, "ZPH: Preserving TOS on miss, TOS="<<tos);
-+		}
-+		comm_set_tos(fd,tos);
-+    }     
- 
-     if (buf != result.data) {
-         /* we've got to copy some data */
-diff -Nru squid-3.0.STABLE13.orig/src/fde.h squid-3.0.STABLE13/src/fde.h
---- squid-3.0.STABLE13.orig/src/fde.h	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/fde.h	2009-02-16 23:21:13.000000000 +0000
-@@ -106,7 +106,7 @@
-         long handle;
-     } win32;
- #endif
--
-+    unsigned char upstreamTOS;			/* see FwdState::dispatch()  */
- };
- 
- #endif /* SQUID_FDE_H */
-diff -Nru squid-3.0.STABLE13.orig/src/forward.cc squid-3.0.STABLE13/src/forward.cc
---- squid-3.0.STABLE13.orig/src/forward.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/forward.cc	2009-02-16 23:21:13.000000000 +0000
-@@ -964,6 +964,52 @@
- 
-     netdbPingSite(request->host);
- 
-+    /* Retrieves remote server TOS value, and stores it as part of the
-+     * original client request FD object. It is later used to forward
-+     * remote server's TOS in the response to the client in case of a MISS.
-+     */
-+	fde * clientFde = &fd_table[client_fd];
-+	if (clientFde)
-+	{
-+		int tos = 1;
-+		int tos_len = sizeof(tos);
-+		clientFde->upstreamTOS = 0;
-+	    if (setsockopt(server_fd,SOL_IP,IP_RECVTOS,&tos,tos_len)==0)
-+	    {
-+	       unsigned char buf[512];
-+	       int len = 512;
-+	       if (getsockopt(server_fd,SOL_IP,IP_PKTOPTIONS,buf,(socklen_t*)&len) == 0)
-+	       {
-+	           /* Parse the PKTOPTIONS structure to locate the TOS data message
-+	            * prepared in the kernel by the ZPH incoming TCP TOS preserving
-+	            * patch.
-+	            */
-+	    	   unsigned char * p = buf;
-+	           while (p-buf < len)
-+	           {
-+	              struct cmsghdr *o = (struct cmsghdr*)p;
-+	              if (o->cmsg_len<=0)
-+	                 break;
-+	
-+	              if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS)
-+	              {
-+	            	  clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
-+	            	  break;
-+	              }
-+	              p += CMSG_LEN(o->cmsg_len);
-+	           }
-+	       }
-+	       else
-+	       {
-+	           debugs(33, 1, "ZPH: error in getsockopt(IP_PKTOPTIONS) on FD "<<server_fd<<" "<<xstrerror());
-+	       }
-+	    }
-+	    else
-+	    {
-+	    	debugs(33, 1, "ZPH: error in setsockopt(IP_RECVTOS) on FD "<<server_fd<<" "<<xstrerror());
-+	    }
-+	}    
-+
-     if (servers && (p = servers->_peer)) {
-         p->stats.fetches++;
-         request->peer_login = p->login;
-diff -Nru squid-3.0.STABLE13.orig/src/structs.h squid-3.0.STABLE13/src/structs.h
---- squid-3.0.STABLE13.orig/src/structs.h	2009-02-03 01:36:23.000000000 +0000
-+++ squid-3.0.STABLE13/src/structs.h	2009-02-16 23:21:13.000000000 +0000
-@@ -553,6 +553,8 @@
-         int emailErrData;
-         int httpd_suppress_version_string;
-         int global_internal_static;
-+        int zph_tos_parent;
-+        int zph_preserve_miss_tos;
-         int debug_override_X;
-         int WIN32_IpAddrChangeMonitor;
-     }
-@@ -721,6 +723,9 @@
-     int sleep_after_fork;	/* microseconds */
-     time_t minimum_expiry_time;	/* seconds */
-     external_acl *externalAclHelperList;
-+    int zph_tos_local;
-+    int zph_tos_peer;
-+    int zph_preserve_miss_tos_mask;
- #if USE_SSL
- 
-     struct
diff --git a/net-proxy/squid/files/squid-3.0.13-gentoo.patch b/net-proxy/squid/files/squid-3.0.13-gentoo.patch
deleted file mode 100644
index c6ee8420f543..000000000000
--- a/net-proxy/squid/files/squid-3.0.13-gentoo.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -Nru squid-3.0.STABLE13.orig/acinclude.m4 squid-3.0.STABLE13/acinclude.m4
---- squid-3.0.STABLE13.orig/acinclude.m4	2009-02-03 01:36:11.000000000 +0000
-+++ squid-3.0.STABLE13/acinclude.m4	2009-03-06 22:34:34.000000000 +0000
-@@ -73,7 +73,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.0.STABLE13.orig/configure.in squid-3.0.STABLE13/configure.in
---- squid-3.0.STABLE13.orig/configure.in	2009-02-03 01:36:23.000000000 +0000
-+++ squid-3.0.STABLE13/configure.in	2009-03-06 22:33:50.000000000 +0000
-@@ -16,9 +16,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
- 
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
--        LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl         LDFLAGS="-g"
-+dnl fi
- 
- dnl Check for GNU cc
- AC_PROG_CC
-@@ -178,13 +178,13 @@
- dnl TODO: check if the problem will be present in any other newer MinGW release.
-     case "$host_os" in
-     mingw|mingw32)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- 	;;
-     *)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
- 	;;
-     esac
--    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-     SQUID_CFLAGS=
-     SQUID_CXXFLAGS=
-diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/confload.c squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c
---- squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/confload.c	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/confload.c	2009-03-06 22:33:50.000000000 +0000
-@@ -27,7 +27,7 @@
- 
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
- 
-diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.0.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default	2009-03-06 22:33:50.000000000 +0000
-@@ -8,6 +8,6 @@
- server other_PDC	other_BDC	otherdomain
- 
- # Denied and allowed users. Comment these if not needed.
--#denyusers	/usr/local/squid/etc/msntauth.denyusers
--#allowusers	/usr/local/squid/etc/msntauth.allowusers
-+#denyusers	/etc/squid/msntauth.denyusers
-+#allowusers	/etc/squid/msntauth.allowusers
- 
-diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am
---- squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/SMB/Makefile.am	2009-03-06 22:33:50.000000000 +0000
-@@ -14,7 +14,7 @@
- ## FIXME: autoconf should test for the samba path.
- 
- SMB_AUTH_HELPER	= smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.0.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/basic_auth/SMB/smb_auth.sh	2009-03-06 22:33:50.000000000 +0000
-@@ -24,7 +24,7 @@
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
- 
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@
-   addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
- 
-diff -Nru squid-3.0.STABLE13.orig/helpers/external_acl/session/squid_session.8 squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8
---- squid-3.0.STABLE13.orig/helpers/external_acl/session/squid_session.8	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/external_acl/session/squid_session.8	2009-03-06 22:33:50.000000000 +0000
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-3.0.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.0.STABLE13.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/external_acl/unix_group/squid_unix_group.8	2009-03-06 22:33:50.000000000 +0000
-@@ -27,7 +27,7 @@
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/do.sh
---- squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/do.sh	2009-03-06 22:33:50.000000000 +0000
-@@ -7,7 +7,7 @@
- #
- CC=gcc
- #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2"
--CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
-+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2"
- if [ "$1" = "HEIMDAL" ]; then
-   DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__"
-   INCLUDE="-I/usr/include/heimdal -Ispnegohelp"
-diff -Nru squid-3.0.STABLE13.orig/lib/libTrie/acinclude.m4 squid-3.0.STABLE13/lib/libTrie/acinclude.m4
---- squid-3.0.STABLE13.orig/lib/libTrie/acinclude.m4	2009-02-03 01:36:20.000000000 +0000
-+++ squid-3.0.STABLE13/lib/libTrie/acinclude.m4	2009-03-06 22:34:13.000000000 +0000
-@@ -9,7 +9,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.0.STABLE13.orig/lib/libTrie/configure.in squid-3.0.STABLE13/lib/libTrie/configure.in
---- squid-3.0.STABLE13.orig/lib/libTrie/configure.in	2009-02-03 01:36:20.000000000 +0000
-+++ squid-3.0.STABLE13/lib/libTrie/configure.in	2009-03-06 22:33:50.000000000 +0000
-@@ -58,8 +58,8 @@
- 
- dnl set useful flags
- if test "$GCC" = "yes"; then
--   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
--   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
-+   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-    TRIE_CFLAGS=
-    TRIE_CXXFLAGS=
-diff -Nru squid-3.0.STABLE13.orig/src/cf.data.pre squid-3.0.STABLE13/src/cf.data.pre
---- squid-3.0.STABLE13.orig/src/cf.data.pre	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/cf.data.pre	2009-03-06 22:33:50.000000000 +0000
-@@ -652,6 +652,8 @@
- acl Safe_ports port 488		# gss-http
- acl Safe_ports port 591		# filemaker
- acl Safe_ports port 777		# multiling http
-+acl Safe_ports port 901		# SWAT
-+acl purge method PURGE
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -685,6 +687,9 @@
- # Only allow cachemgr access from localhost
- http_access allow manager localhost
- http_access deny manager
-+# Only allow purge requests from localhost
-+http_access allow purge localhost
-+http_access deny purge
- # Deny requests to unknown ports
- http_access deny !Safe_ports
- # Deny CONNECT to other than SSL ports
-@@ -702,6 +707,9 @@
- # from where browsing should be allowed
- http_access allow localnet
- 
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -3263,11 +3271,11 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster."
-+	mail if the cache dies.  The default is "root".
- DOC_END
- 
- NAME: mail_from
-@@ -5217,6 +5225,9 @@
- 	If you disable this, it will appear as
- 
- 		X-Forwarded-For: unknown
-+NOCOMMENT_START
-+forwarded_for off
-+NOCOMMENT_END
- DOC_END
- 
- NAME: cachemgr_passwd
-diff -Nru squid-3.0.STABLE13.orig/src/debug.cc squid-3.0.STABLE13/src/debug.cc
---- squid-3.0.STABLE13.orig/src/debug.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/debug.cc	2009-03-06 22:33:50.000000000 +0000
-@@ -465,7 +465,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (opt_syslog_enable)
--        openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+        openlog(appname, LOG_PID | LOG_NDELAY, syslog_facility);
- 
- #endif /* HAVE_SYSLOG */
- 
-diff -Nru squid-3.0.STABLE13.orig/src/defines.h squid-3.0.STABLE13/src/defines.h
---- squid-3.0.STABLE13.orig/src/defines.h	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/defines.h	2009-03-06 22:33:50.000000000 +0000
-@@ -218,7 +218,7 @@
- 
- /* were to look for errors if config path fails */
- #ifndef DEFAULT_SQUID_ERROR_DIR
--#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors"
-+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English"
- #endif
- 
- /* handy to determine the #elements in a static array */
-diff -Nru squid-3.0.STABLE13.orig/src/main.cc squid-3.0.STABLE13/src/main.cc
---- squid-3.0.STABLE13.orig/src/main.cc	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/main.cc	2009-03-06 22:33:50.000000000 +0000
-@@ -1485,7 +1485,7 @@
-     if (*(argv[0]) == '(')
-         return;
- 
--    openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-     if ((pid = fork()) < 0)
-         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1529,7 +1529,7 @@
- 
-         if ((pid = fork()) == 0) {
-             /* child */
--            openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+            openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-             prog = xstrdup(argv[0]);
-             argv[0] = xstrdup("(squid)");
-             execvp(prog, argv);
-@@ -1537,7 +1537,7 @@
-         }
- 
-         /* parent */
--        openlog(appname, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(appname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-         syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
- 
-diff -Nru squid-3.0.STABLE13.orig/src/Makefile.am squid-3.0.STABLE13/src/Makefile.am
---- squid-3.0.STABLE13.orig/src/Makefile.am	2009-02-03 01:36:22.000000000 +0000
-+++ squid-3.0.STABLE13/src/Makefile.am	2009-03-06 22:33:50.000000000 +0000
-@@ -991,12 +991,12 @@
- DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
--DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
-+DEFAULT_LOG_PREFIX	= $(localstatedir)/log/squid
- DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
--DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-+DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
-+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
- DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/net-proxy/squid/files/squid-3.0.13-heimdal.patch b/net-proxy/squid/files/squid-3.0.13-heimdal.patch
deleted file mode 100644
index 04cb2671b80a..000000000000
--- a/net-proxy/squid/files/squid-3.0.13-heimdal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nru squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
---- squid-3.0.STABLE13.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-03 01:36:16.000000000 +0000
-+++ squid-3.0.STABLE13/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-16 23:22:02.000000000 +0000
-@@ -18,10 +18,10 @@
- #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
- 
- # HEIMDAL
--#KERBINC = -DHEIMDAL -I/usr/include/heimdal
--#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
-+KERBINC = -DHEIMDAL -I/usr/include/heimdal
-+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
- 
- # MIT
--KERBINC = 
--KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
-+#KERBINC = 
-+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
- 
diff --git a/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
deleted file mode 100644
index 79eea0969888..000000000000
--- a/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-diff -Nru squid-3.1.0.7.orig/acinclude.m4 squid-3.1.0.7/acinclude.m4
---- squid-3.1.0.7.orig/acinclude.m4	2009-04-08 10:50:50.000000000 +0000
-+++ squid-3.1.0.7/acinclude.m4	2009-04-26 10:58:36.000000000 +0000
-@@ -73,7 +73,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.1.0.7.orig/configure.in squid-3.1.0.7/configure.in
---- squid-3.1.0.7.orig/configure.in	2009-04-08 10:51:47.000000000 +0000
-+++ squid-3.1.0.7/configure.in	2009-04-26 10:58:36.000000000 +0000
-@@ -16,9 +16,9 @@
- PRESET_LDFLAGS="$LDFLAGS"
- 
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
--        LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl         LDFLAGS="-g"
-+dnl fi
- 
- dnl Check for GNU cc
- AC_PROG_CC
-@@ -243,13 +243,13 @@
- dnl TODO: check if the problem will be present in any other newer MinGW release.
-     case "$host_os" in
-     mingw|mingw32)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- 	;;
-     *)
--        SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-+        SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
- 	;;
-     esac
--    SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+    SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-     SQUID_CFLAGS=
-     SQUID_CXXFLAGS=
-diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/confload.c	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c	2009-04-26 10:58:36.000000000 +0000
-@@ -27,7 +27,7 @@
- 
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE   SYSCONFDIR "/msntauth.conf"
- 
-diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default	2009-04-26 10:58:36.000000000 +0000
-@@ -8,6 +8,6 @@
- server other_PDC	other_BDC	otherdomain
- 
- # Denied and allowed users. Comment these if not needed.
--#denyusers	/usr/local/squid/etc/msntauth.denyusers
--#allowusers	/usr/local/squid/etc/msntauth.allowusers
-+#denyusers	/etc/squid/msntauth.denyusers
-+#allowusers	/etc/squid/msntauth.allowusers
- 
-diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.7.orig/helpers/basic_auth/SMB/Makefile.am	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am	2009-04-26 10:58:36.000000000 +0000
-@@ -14,7 +14,7 @@
- ## FIXME: autoconf should test for the samba path.
- 
- SMB_AUTH_HELPER	= smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -Nru squid-3.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh	2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh	2009-04-26 10:58:36.000000000 +0000
-@@ -24,7 +24,7 @@
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
- 
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@
-   addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
- 
-diff -Nru squid-3.1.0.7.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.7/helpers/external_acl/session/squid_session.8
---- squid-3.1.0.7.orig/helpers/external_acl/session/squid_session.8	2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/external_acl/session/squid_session.8	2009-04-26 10:58:36.000000000 +0000
-@@ -35,7 +35,7 @@
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff -Nru squid-3.1.0.7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.0.7.orig/helpers/external_acl/unix_group/squid_unix_group.8	2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8	2009-04-26 10:58:36.000000000 +0000
-@@ -27,7 +27,7 @@
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff -Nru squid-3.1.0.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-04-26 10:58:36.000000000 +0000
-@@ -17,6 +17,7 @@
- 
- AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
- AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
-+AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([squid_kerb_auth.c])
- 
- AC_PROG_CC
-@@ -531,7 +532,7 @@
- dnl set variable for use in automakefile(s)
- AM_CONDITIONAL(HAVE_SPNEGO, test x"$ac_cv_have_spnego" = x"yes" )
- 
--MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
-+MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow"
- for ac_cv_my_cflag in $MY_CFLAGS; do
- echo "int main()
-   {
-diff -Nru squid-3.1.0.7.orig/lib/libTrie/acinclude.m4 squid-3.1.0.7/lib/libTrie/acinclude.m4
---- squid-3.1.0.7.orig/lib/libTrie/acinclude.m4	2009-04-08 10:50:58.000000000 +0000
-+++ squid-3.1.0.7/lib/libTrie/acinclude.m4	2009-04-26 10:58:36.000000000 +0000
-@@ -9,7 +9,7 @@
-   AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-   AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-     ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
--${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null
- res=$?
- rm -f conftest.*
- echo yes
-diff -Nru squid-3.1.0.7.orig/lib/libTrie/configure.in squid-3.1.0.7/lib/libTrie/configure.in
---- squid-3.1.0.7.orig/lib/libTrie/configure.in	2009-04-08 10:50:58.000000000 +0000
-+++ squid-3.1.0.7/lib/libTrie/configure.in	2009-04-26 10:58:36.000000000 +0000
-@@ -58,8 +58,8 @@
- 
- dnl set useful flags
- if test "$GCC" = "yes"; then
--   TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
--   TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-+   TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations"
-+   TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings"
- else
-    TRIE_CFLAGS=
-    TRIE_CXXFLAGS=
-diff -Nru squid-3.1.0.7.orig/src/cf.data.pre squid-3.1.0.7/src/cf.data.pre
---- squid-3.1.0.7.orig/src/cf.data.pre	2009-04-08 10:51:03.000000000 +0000
-+++ squid-3.1.0.7/src/cf.data.pre	2009-04-26 10:58:36.000000000 +0000
-@@ -684,6 +684,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
-@@ -803,6 +805,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
-@@ -820,6 +825,9 @@
- # from where browsing should be allowed
- http_access allow localnet
- 
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -3614,11 +3622,11 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster."
-+	mail if the cache dies.  The default is "root".
- DOC_END
- 
- NAME: mail_from
-@@ -5736,7 +5744,7 @@
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
- 	If set to "on", Squid will append your client's IP address
-diff -Nru squid-3.1.0.7.orig/src/debug.cc squid-3.1.0.7/src/debug.cc
---- squid-3.1.0.7.orig/src/debug.cc	2009-04-08 10:51:03.000000000 +0000
-+++ squid-3.1.0.7/src/debug.cc	2009-04-26 10:58:36.000000000 +0000
-@@ -438,7 +438,7 @@
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (opt_syslog_enable)
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
- 
- #endif /* HAVE_SYSLOG */
- 
-diff -Nru squid-3.1.0.7.orig/src/main.cc squid-3.1.0.7/src/main.cc
---- squid-3.1.0.7.orig/src/main.cc	2009-04-08 10:51:05.000000000 +0000
-+++ squid-3.1.0.7/src/main.cc	2009-04-26 10:58:36.000000000 +0000
-@@ -1514,7 +1514,7 @@
-     if (*(argv[0]) == '(')
-         return;
- 
--    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-     if ((pid = fork()) < 0)
-         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1558,7 +1558,7 @@
- 
-         if ((pid = fork()) == 0) {
-             /* child */
--            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+            openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-             prog = xstrdup(argv[0]);
-             argv[0] = xstrdup("(squid)");
-             execvp(prog, argv);
-@@ -1566,7 +1566,7 @@
-         }
- 
-         /* parent */
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- 
-         syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
- 
-diff -Nru squid-3.1.0.7.orig/src/Makefile.am squid-3.1.0.7/src/Makefile.am
---- squid-3.1.0.7.orig/src/Makefile.am	2009-04-08 10:51:02.000000000 +0000
-+++ squid-3.1.0.7/src/Makefile.am	2009-04-26 10:59:13.000000000 +0000
-@@ -638,7 +638,6 @@
- 
- sysconf_DATA = \
- 	squid.conf.default \
--	squid.conf.documented \
- 	mime.conf.default
- 
- data_DATA = \
-@@ -712,9 +711,9 @@
- 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_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-+DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
-+DEFAULT_NETDB_FILE      = $(localstatedir)/run/netdb.state
-+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
- DEFAULT_PINGER		= $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD		= $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD		= $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -750,7 +749,7 @@
- 	true
- 
- squid.conf.default: squid.conf.documented
--	$(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default
-+	cp squid.conf.documented squid.conf.default
- 
- cf_parser.h: cf.data cf_gen$(EXEEXT)
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
-@@ -804,8 +803,6 @@
- 	fi
- 	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
- 	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
--	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
--	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
- 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
- 
- uninstall-local:
diff --git a/net-proxy/squid/squid-2.7.6-r1.ebuild b/net-proxy/squid/squid-2.7.6-r1.ebuild
index 39a7d9e14176..6af1067b75a1 100644
--- a/net-proxy/squid/squid-2.7.6-r1.ebuild
+++ b/net-proxy/squid/squid-2.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.7 2009/06/15 23:42:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.6-r1.ebuild,v 1.8 2009/06/23 19:45:10 mrness Exp $
 
 EAPI="2"
 
@@ -20,13 +20,14 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
+IUSE="caps pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux epoll"
 
-DEPEND="pam? ( virtual/pam )
+DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
 	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
@@ -130,6 +131,7 @@ src_configure() {
 		--enable-carp \
 		--enable-follow-x-forwarded-for \
 		--with-maxfd=8192 \
+		$(use_enable caps) \
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		${myconf} || die "econf failed"
diff --git a/net-proxy/squid/squid-3.0.13.ebuild b/net-proxy/squid/squid-3.0.13.ebuild
deleted file mode 100644
index 8a40aa1d73e5..000000000000
--- a/net-proxy/squid/squid-3.0.13.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.13.ebuild,v 1.8 2009/04/25 18:09:47 armin76 Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils pam toolchain-funcs autotools linux-info
-
-# lame archive versioning scheme..
-S_PMV="${PV%%.*}"
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-
-RESTRICT="test" # check if test works in next bump
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
-	mysql postgres sqlite \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux epoll"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
-		eerror "coss store IO has been disabled by upstream due to stability issues!"
-		eerror "If you want to install this version, switch the store type to something else"
-		eerror "before attempting to install this version again."
-
-		die "/etc/squid/squid.conf: cache_dir use a disabled store type"
-	fi
-
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-
-	cd "${S}" || die "source dir not found"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
-	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
-
-	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}"
-	use radius && basic_modules="squid_radius_auth,${basic_modules}"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules="DB,${basic_modules}"
-	fi
-
-	local ext_helpers="ip_user,session,unix_group"
-	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local ntlm_helpers="fakeauth"
-	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
-
-	local negotiate_helpers=
-	use kerberos && local negotiate_helpers="squid_kerb_auth"
-
-	local myconf=""
-
-	# coss support has been disabled
-	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
-	myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter
-			$(use_enable epoll)"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} $(use_enable kqueue)"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--datadir=/usr/share/squid \
-		--with-default-user=squid \
-		--enable-auth="basic,digest,negotiate,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
-		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-large-files \
-		--with-filedescriptors=8192 \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		${myconf} || die "econf failed"
-
-	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_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-	if use zero-penalty-hit; then
-		echo
-		ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
-		ewarn "with the patch that can be found on http://zph.bratcheda.org site."
-	fi
-}
diff --git a/net-proxy/squid/squid-3.0.15.ebuild b/net-proxy/squid/squid-3.0.15.ebuild
index e6e07de62ad2..2caeeef3069a 100644
--- a/net-proxy/squid/squid-3.0.15.ebuild
+++ b/net-proxy/squid/squid-3.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.15.ebuild,v 1.5 2009/06/19 15:55:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.15.ebuild,v 1.6 2009/06/23 19:45:10 mrness Exp $
 
 EAPI="2"
 
@@ -22,13 +22,14 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+IUSE="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux epoll"
 
-DEPEND="pam? ( virtual/pam )
+DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
 	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
@@ -132,6 +133,7 @@ src_configure() {
 		--enable-arp-acl \
 		--with-large-files \
 		--with-filedescriptors=8192 \
+		$(use_enable caps) \
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		$(use_enable icap-client) \
diff --git a/net-proxy/squid/squid-3.0.16.ebuild b/net-proxy/squid/squid-3.0.16.ebuild
index e7e62baf01c5..2ae63fe1be60 100644
--- a/net-proxy/squid/squid-3.0.16.ebuild
+++ b/net-proxy/squid/squid-3.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.16.ebuild,v 1.1 2009/06/15 23:42:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.16.ebuild,v 1.2 2009/06/23 19:45:10 mrness Exp $
 
 EAPI="2"
 
@@ -21,13 +21,14 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+IUSE="caps pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux epoll"
 
-DEPEND="pam? ( virtual/pam )
+DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
 	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
@@ -128,6 +129,7 @@ src_configure() {
 		--enable-arp-acl \
 		--with-large-files \
 		--with-filedescriptors=8192 \
+		$(use_enable caps) \
 		$(use_enable snmp) \
 		$(use_enable ssl) \
 		$(use_enable icap-client) \
diff --git a/net-proxy/squid/squid-3.1.0.7_beta.ebuild b/net-proxy/squid/squid-3.1.0.7_beta.ebuild
deleted file mode 100644
index 4ba1ddedb470..000000000000
--- a/net-proxy/squid/squid-3.1.0.7_beta.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.7_beta.ebuild,v 1.2 2009/06/15 23:42:37 mrness Exp $
-
-EAPI="2"
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-
-inherit eutils pam toolchain-funcs autotools linux-info
-
-RESTRICT="test" # check if test works in next bump
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P/_beta}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
-	mysql postgres sqlite \
-	zero-penalty-hit \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux epoll"
-
-DEPEND="pam? ( virtual/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
-	ssl? ( dev-libs/openssl )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	samba? ( net-fs/samba )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-S="${WORKDIR}/${P/_beta}"
-
-pkg_setup() {
-	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
-		eerror "coss store IO has been disabled by upstream due to stability issues!"
-		eerror "If you want to install this version, switch the store type to something else"
-		eerror "before attempting to install this version again."
-
-		die "/etc/squid/squid.conf: cache_dir use a disabled store type"
-	fi
-
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3-capability.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# recursive eautoreconf breaks lib/libLtdl/libtool script and elibtoolize breaks linking
-	local dir
-	for dir in lib/libTrie helpers/negotiate_auth/squid_kerb_auth ""; do
-		cd "${S}"/${dir}
-		einfo "Running autotools in '$(pwd)' ..."
-		[ "${dir##*/}" = squid_kerb_auth ] && eaclocal # missing AM_MAINTAINER_MODE
-		eautoconf
-		eautomake
-	done
-}
-
-src_configure() {
-	local myconf=""
-
-	local basic_modules="getpwnam,NCSA,MSNT"
-	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-	use radius && basic_modules="squid_radius_auth,${basic_modules}"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules="DB,${basic_modules}"
-	fi
-
-	local 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_lm,${ntlm_helpers}"
-
-	local negotiate_helpers=
-	if use kerberos; then
-		negotiate_helpers="squid_kerb_auth"
-		has_version app-crypt/mit-krb5 \
-			&& myconf="--enable-mit --disable-heimdal" \
-			|| myconf="--disable-mit --enable-heimdal"
-	fi
-
-	# coss support has been disabled
-	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
-	myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter
-			$(use_enable epoll)"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} $(use_enable kqueue)"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-auth="basic,digest,negotiate,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
-		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-arp-acl \
-		--with-large-files \
-		--with-filedescriptors=8192 \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		$(use_enable icap-client) \
-		$(use_enable zero-penalty-hit zph-qos) \
-		${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/ncsa_auth
-	fowners root:squid /usr/libexec/squid/pam_auth
-	fperms 4750 /usr/libexec/squid/ncsa_auth
-	fperms 4750 /usr/libexec/squid/pam_auth
-
-	# some cleanups
-	rm -f "${D}"/usr/bin/Run*
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-	if use zero-penalty-hit; then
-		echo
-		ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel"
-		ewarn "with the patch that can be found on http://zph.bratcheda.org site."
-	fi
-}
diff --git a/net-proxy/squid/squid-3.1.0.8_beta.ebuild b/net-proxy/squid/squid-3.1.0.8_beta.ebuild
index 570f2d7a7511..bebff9baf1e8 100644
--- a/net-proxy/squid/squid-3.1.0.8_beta.ebuild
+++ b/net-proxy/squid/squid-3.1.0.8_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.8_beta.ebuild,v 1.1 2009/06/17 23:21:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.8_beta.ebuild,v 1.2 2009/06/23 19:45:10 mrness Exp $
 
 EAPI="2"
 
@@ -15,13 +15,14 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P/_beta}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \
 	mysql postgres sqlite \
 	zero-penalty-hit \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux epoll"
 
-COMMON_DEPEND="pam? ( virtual/pam )
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
 	kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
 	ssl? ( dev-libs/openssl )
@@ -131,6 +132,7 @@ src_configure() {
 		--enable-arp-acl \
 		--with-large-files \
 		--with-filedescriptors=8192 \
+		$(use_enable caps) \
 		$(use_enable ipv6) \
 		$(use_enable snmp) \
 		$(use_enable ssl) \