Security bump

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 512 insertions, 15 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e65ba42f6bc2..0706e0822965 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.412 2013/05/25 21:54:15 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.413 2013/07/11 17:16:42 eras Exp $
+
+*squid-3.3.7 (11 Jul 2013)
+*squid-3.2.12 (11 Jul 2013)
+
+  11 Jul 2013; Eray Aslan <eras@gentoo.org> +squid-3.2.12.ebuild,
+  +squid-3.3.7.ebuild:
+  Security bump
 
 *squid-3.3.5 (25 May 2013)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 724ac197b9eb..6e456b55e22f 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -17,35 +17,39 @@ AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af9226822
 DIST squid-3.1.23.tar.gz 3489539 SHA256 4633e59925480cc2ea8078e4d78b17dea59a67a71c054b8faa47ba2c1e204401 SHA512 620554273a54be76331dd559446f750dfe838c80e2427cdcfce89ebdb0b70124acc6015fb6f4f1c78d0ecd0e0aaf46ca2cec29e1415525ef72e14d18343a5e72 WHIRLPOOL cb678a25abf69d73f7f5b5774c00374d14c831b09af86678f065dd8001aedc9f4ba5fa8a8d8d8c301ab449e10d25a54d476810e2d5c77583ed604b6173f41bcd
 DIST squid-3.2.10.tar.gz 4114308 SHA256 8def93d019c1f56d89180e2eb45d6e9a8272a7a8bc3cb7c3a7b6cc4aad535e36 SHA512 38da3e18822444f8aea3b864ec19d52101946f1b1f29638b5f726f771a456e3cccfcb90e5b85d6a10b3792814fb3b08cb3c3263584efacf2afd4a98bc3d7e31f WHIRLPOOL 3f8e29edd49f551279f9797fecc1f80b6630dba718d0c35d215d86e2362f5771264c97bece16d2a6e138c95206f891fab0929978e4768038ed9e2e8b05ed2fb8
 DIST squid-3.2.11.tar.gz 4114086 SHA256 24cb67042bd07ce3d750b269c929e2bd1d6e602aa630eea822ef33580f298a18 SHA512 504b291e2f8fe07ca540005086e8d8ab711b703b9a2d1ae0ff9db5a80e57ffef29af61960ad70d2ba1189d04374bd47ad8b55219db53a204a376633270c1c29a WHIRLPOOL 37bc83b3639d75581ddca3e6b2c50586caf3fac95ffb761c08edeaecf5fa3355b53e6a0cda7c7ec6f304ae3f8e9008bc6e5f63137721963e1115b8045b1e3ddd
+DIST squid-3.2.12.tar.gz 4114473 SHA256 78d825c959acf5fd25b5e7e5d9703f17c7252aa8c6271be136f9afd1d64e1fbf SHA512 52a6ada2b9ebcaa8f7d95eff382fe501650c072d41d367b3a17b290a39ef53b3954d90704aef563966bcef571a117fddd7702c452e042c437a978de25d23b3ea WHIRLPOOL 9d515c28b02a83191557d27e4ce24c8fa5fe58e147fe4eb0ad51fe44489a805427a28a7654d752c97e9ddc5c6e0b54a96623450882a6358e86d5106030000fc0
 DIST squid-3.2.9.tar.gz 4113390 SHA256 f8262cb033e93fa806188a3238cb485165cb3ddea0818e6667020f7e68cd3401 SHA512 6463fb2538a0f63abc82ec8acac52cbd0e9a1a1062fd4329ba7d0f07f0e1ba2678e439322bae378eba0a1e99356bd6854bfa266a6b87a12607157fe2f274ef0e WHIRLPOOL c72161e5cb6030c187d16e6864a3cf1ff8475958304fc74a1d9c708090f177b6fcb26a3bcf70ef635b8ffde5aadeb10549c47044e60ad358539e63ec0ba7429d
 DIST squid-3.3.3.tar.gz 4191938 SHA256 2505547a0ff5b24b9f3924a7e4ebcbfd4ce41a160b8d841331edf711c2912138 SHA512 ab87940b0ed3c95f36d8790b653be5c35de9213711e1c6ea57726ebb03f655d9d268279f67fa0fb6f10abf3a20b205294f4261c20fe044e303377d35dce95249 WHIRLPOOL f181ccbca08479baa73571079a36a4f347b36a84aacaa8e3ee481aa3f0d00cf71aed1c512c16a4b0a5158ebac6ffe112b45a95ff3dbf926800fe03b60688324c
 DIST squid-3.3.4.tar.gz 4196008 SHA256 fc87e9d228aea06d048316201d87bd60a8af244408f7153c64383c1f0f751eb9 SHA512 2844dc58c479d522d7bc5893a612b064f116279fc25327e866fcd76c4fc1977d0d5bf57f65b39f5e5f2b0c5b5a22d158c7a575d8a066d8542130385aa2eaa202 WHIRLPOOL d933b4b10cd4ead150770007bc951c737e2a9dc21e80c5483b05cd949b218f2f90dad1d6ee88d3525a65d146b94ddf91e887da139b91158f617e9134c7e94d7a
 DIST squid-3.3.5.tar.gz 4199886 SHA256 08ddbcae113a4b90665ad73bd0ef657951d4155f92fccf7740e467481f7565b7 SHA512 3aa64e0b3a2b3681d89b8f2dd554b79d6b03aa1d4c5ee07db65da15afc03ad7a59a03b7584e0a885a1c10bc8dc9e2ac0c2d6134bafeb8965b548804549ebcb1f WHIRLPOOL f60974c7b0f7108631cdfa094fe24ce1804f7a37a54151a280b89fd7ce6991bd6b5b83e6f45b57ef2ce9ad5d79e497c68ce4e5942a6635f01dc87cc53a49267d
+DIST squid-3.3.7.tar.gz 4201343 SHA256 4934141dc32e77a13e374f8c7d10ef52694252d336f7c1a63688520f2d3b55cd SHA512 a346034bb635dee9bda6dd6a54c997c3bba057bfd3a19dc363acce162bed976750dfbd80bdeb3996c556d7d4a3be2396e580da533690835a7c41ac9de061abd2 WHIRLPOOL 52ccd69320b17f406f374581716a31a558801a348e7f6de7e8a164c1f8060afcc1cc1c5c45376102fc894acc4a2f6e4b69000fcbdccdfd79b341c6c444530c77
 EBUILD squid-3.1.23.ebuild 6687 SHA256 a12452feaeadfe2501e168dce2552b244c31e96436a0278bd8b3b5fdde89f34a SHA512 754809af799a7ce243cacee7a7b38dc3e8b51920f1f90f54953529d7e51ef4ab046961bde57c82418bae09034c3f8d98d1405f18659b434338071844e245730e WHIRLPOOL a6f8f792332b0d1e1e366d93e7a87cd2371e5c97ac8b8bab3783a6b830c83e0aa19c6aa8db7da5300c02c6a64e3d07f53cd551fb849daa50f2e5cb5c5bbe5392
 EBUILD squid-3.2.10.ebuild 7823 SHA256 e0d806746973228904ef7f40ebd26041c77257756da70077f2ca5ca3a5b5c2b7 SHA512 051c9564ff9f6cc5b9a3920992f79b272821cc5419b4101ece25bcacb093f236e9d1010cece60ed368644a20d2720315d21b1f46ce1890943a60c5e34e9dae79 WHIRLPOOL 7e9942ba99271a121695594f4fcd58848962e90b3cd7b4af0bea6eed65a4f3d3f6fb8f26261a70a078ec19d3dde424b0474890b6bc8a8cfa28e7241d3837741d
 EBUILD squid-3.2.11.ebuild 7768 SHA256 5dc0933e76506063efa775dfd608371ca55c179121207d22187ad52b59165f0a SHA512 651021bea7c863bcfb406a0ba47a474a04134e994d4dca0a481db1dda904ace2848bf6b51ebd8e2e63f4f800b13d3f256b07707d0db1723c57ba3c1b04f2128c WHIRLPOOL 07d6b30e0d6f797f60a37138f78c952e1d7fb1d95ede2d24b7232b9d00f0ba00f9fa35e887ba3911b1ffffd1f49f616ff185963a5cddb9dae66159ae246dc186
+EBUILD squid-3.2.12.ebuild 7768 SHA256 700db7b07cf0dfa29b3be2249705dedd339154210e9b7bf6f398f575f723f1a2 SHA512 d104476b79e8cdfe761c9088f5388076af220d438a1acb00769bce5e0717934e8be379591b507d913def0cc514708db0ada9dbc6d1121c9f1985d9e72a49c221 WHIRLPOOL 6c2e5d3206408649253fb976c29aeaca51fef62d20ff97113ae92589495d610bad8cf375597a227ae61b0ca360f567c1799c19fc627177369999cbeddfba43e2
 EBUILD squid-3.2.9-r1.ebuild 7642 SHA256 be2ab045b3dec4fb923d2c44f2db0186c65a0c4a4f13aa69d986a7775402410f SHA512 64c15563e0579a0f405a050e85a4f21aae7286e27a63fe7dd92178973eee77d6e769693515a837b4c82431651f2c29141c015a62854a0b5e8008991f83f16a4c WHIRLPOOL b44e0bc644b697d6b404e5f0f9c3fdb3eaa325b39185ae55e588c5100835af7f7dac2453a9455bfcba0392d5aa49e6e2661554d08e4c9fc6ef4ca1ce753786bd
 EBUILD squid-3.2.9.ebuild 7580 SHA256 d1ed43ace291862d4e34a5b6098501176011611c4dd01f5acfcccb5cf64a1ff4 SHA512 566cf79574665a514fb0a599040cdc930595e7e8824972206694d80b370cd250225744956b8d4d3ebf6ababaa1739e8e5a5f86ec068655cce0fc0460a2613477 WHIRLPOOL 72849f8feac662dd746d65c0ed9218d4bcc4808ef966e94e4fe17b8f0fa44c60585530344750f886c9f3eda89cc363354f442f746947cedfa10a4ffc3239392c
 EBUILD squid-3.3.3-r1.ebuild 7814 SHA256 4a58e13b09f9b13342675cbf898ce06835d40357c0d18865d5ba8fd1aa5aa809 SHA512 2cd2acd611c5c479d0af5a46fee913a52a8cd1f3952433e78a8ac7e70a4b18e1640cfad376e0fb7102ca702e2399b061fc96a5f3ec3db73a9d4ca8bf9aeb5ba6 WHIRLPOOL ee73ae56cb444ca9d737a197b08db86bc59494e2feb9664412dd71f6d6ff2084625966838a9f658481f86aaecd1c855442a60de53341c80b097a50c5b92f4944
 EBUILD squid-3.3.3.ebuild 7589 SHA256 f955c6869c7bc46a85bef075ddf029fabb2b442a10b3999622e60e366a7647f9 SHA512 dfb17e6fab82e28ffca6cab5fce19fce08ca287705adc41083f3271488e2b3940d1c8bc08869a3f8e4f2a9914d693fb23a890dec97d465f31cec1d0838805149 WHIRLPOOL 69ae80af78f82997f1a7113124a50c95f4cceb21b2a854740bc162607755938f1128260837874fd18e5ef49600c72a4c9166039bd4287f4f2a9c79345db569bb
 EBUILD squid-3.3.4.ebuild 7761 SHA256 f913d0b57d16b430bd409f5c71ec7da501c85ed0222821d33d2553df92d7bdee SHA512 3f61218451671d48c8d616689b577e6a98359bd4d509e84fdd2052383186a8ead18c10a166b68d81ff9073afe82e2a6483e57e2e6edeceb4b78eeccb7dea611b WHIRLPOOL c2b36e5b7415a7528b7663e42bb3a3b522ff9981e1b47ab6d51eca1bae0551616a0673917799663be79ef46bed622a36c6473beed7792f026e3752311d15c0ae
 EBUILD squid-3.3.5.ebuild 7761 SHA256 3bb2484ab4ade2bccefd5850d72d21c820ffbba8099dfd35e8613e31df365f34 SHA512 942f58233ec2acb7862a07b56e50f2a637370abd75023efe803e0264e16e9a798e3655544eecd635b1e890e245a2f54bc92496310609d391d9f6545de1c8675a WHIRLPOOL 27f214e4aa2049d614db78eedeef0712a68bfbaf3de1e1cf4c1c43cf8c096e57fb350743400c92ac838c8e3dbea9c00981e3409226d041fa913a912ec0c06f59
-MISC ChangeLog 80849 SHA256 f6b71c546a34a14597d255847da7bb74cef5b844ef5d1c3a7a96b447312cd8b4 SHA512 521a7546171bc08e71e6e3703e4848c9a46d3a0c7b2bb5114b50f59b70a4ca178227eb494290a74fd17480d1a66c4136c1d1e40676e1e25aec6ea7197b8ebf70 WHIRLPOOL f7d2034d4ee15a4a2dfbb9a0ab1e0940053e2879f8de66fc4db45272e2991302ae61af449ac63f7e3aee1f21d9702746061ce3bd782db6e4781117dc5ff054c1
+EBUILD squid-3.3.7.ebuild 7761 SHA256 002dc7a47d627a013235d6c800ba0f84204bd677565a1196f01d45dc3121fb11 SHA512 e9e00e3d9850f13c1822e30b5f4e36c648a4faf6588c74c0f74b0e8382d1c6ffafcc4dc3902830ad1664b2ad625d04950ed6332ce2befaeea8c6fb620e1f4080 WHIRLPOOL 3639dfdf9c0495634b7b804571199721a040907576bf43741f9500d63b9064a0f57106c172773beb944ccb9d4798ca6c1ed7c905af892d3c584b304cc34fc8b4
+MISC ChangeLog 81011 SHA256 9f89905dc22acfdebf1d1233cba2a14c8ac7c10d8d386a332682dd998c8b89bd SHA512 e46c9db3a09f6795d13b4190a55c720c8508eea8101379e26e8da6903a33e451d3c6031a28ec6a5abd4713dba5e1cd2484ee2425fe01063796beeb606195a479 WHIRLPOOL 96f4195decd2e1c2e2ba3e59e4dbdb33be3067ca9cfb2404da0f8788a1794ac9962576fbdc6c720b619f763ce5d313fc023925a1af375e8f483f4125a426a4a1
 MISC metadata.xml 1386 SHA256 f1c035d3bfd09b92b127a8281b5d225b261c7a01c87d99e53a002d6316251089 SHA512 603b0c1803b86bf777777107a908db14c138911f92695d7572d448ddc5679c87031151161e1138db046f878421019f7778ef8fcda7218fb7392789124b96e95c WHIRLPOOL adf20b19ab0faf2c4219a16470db04ccb6f06cbbaf1a0b19631f2e01ade5374d9316b7015334b4d5722fb39b8328db61308888f4ad1a99983bf9dc0061f442d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRoTMXAAoJEHfx8XVYajsfl9kP/0dZSow9d/LUIvkLEcuyvKkp
-ZOiU8j/F2E9gj12wECCl8ORLqyutzaVt4Mf5AfX4qamCjhXaSMXiQ5cfTG9O+KhG
-p86FoMiEEksHcOrDNOa2RWgbfjpJnj6IhAOpWy2+oGnkIj0348ZvAJe8Z9A479NP
-BV39jVlhxGvOyg3AyQ5clYm9jwiTPeCi0mAzJKAxu6p8eb2BtFxjJNrBehobVJqU
-K0+OB7O+tW3iWCcpArfD5ysEuBfnD4h8LWnvG/2z0MUeDMKdVc5YTk++p9SAvT++
-V/F25O1OFg2rd6VneaeQ+bRaa2AENtpUI8k9ua5k13mLoXP29qTJwB9cLQbeHvvn
-rsTH8+job2MShlhw46F9FR28t/QMDfyxYlw38Gr0mJVgUXckHBZkon8FdX22irQI
-bP2vB30D4Uw56FkHMBMESeja27ewnLJ9vqxYOcg+QcCqsTlIWKLsWrar4G+pxfXu
-VBvEiTBgnGGdu9LZB+KWNa0h6O1Q/aQk8sn77ZO84d2Cv2/GhyF06RQFkvwL84Rx
-yNySrAaSAhkrJpsoxRHd1L5LhDtkDJjZsUxssQyZcE2Gs8xN6C7ErjTQvUVM3MxV
-GbFq+J+6Bo6egxbA4RNn88h++LU+n2wZrYgUBvANVpBrbnwAQeUcNoK7acL9O14a
-+5k2rEe4uqHugrP3CmL2
-=PZbG
+iQIcBAEBCAAGBQJR3uiDAAoJEHfx8XVYajsf278QALYC+0IlSWM/lAm/lP9leI7Z
+GW5OFkK0OAd9Zy9Ix7j3bpOWU43Pg8905+HdUW71RjMi2QBpB6KtJHgMlNuJCj93
+FuLoS02gshbvkDM2N9dUy3xNkQDe+LuWEJMNtlZa0Bg8C662BM02BN4STtUwJ7u9
+VCozTCd6kRHgb0owDZMAcvoU6hH9dODpCfCgsM4QToruH9+qbK0Laov9ySyDsirX
+n/RuSESfVUSjUwPXWlynq63Ia4HBnR42hSiTYmM4Y1cCTYir7mocyx0wxXaiXhN6
+OGNdtwsFvvU+h7FHa7kM5vQ403BtSa4/ME2eyx/KGh+jY0FtFWkbZt6EJHKYHGw3
+jjvgkpsdo7DWUcFONhTdugIbqzClpAnqGcnCTtMzozQIOM1fGXX1+GngJQKP8xPg
+203GBajh+seBuER4AHXByqvnueinG5M1BriCL5Xz0NEQsO4zwvAPly61qjL1DK5w
+isWDMJH63YzFU0PhTYK/1LmvzHzK3PO/gxSdlQM5d5kgPdeeABG61oIUUrYQiMAT
+6uJeOInTGr3mwASplG3ULM2FT8vI9Ff1DRWnv2mBWzMlRViBJFLtCSuhKMM02uce
+TnRY6zbiU58mP8mcdgDmNF++VJQ+FZRtgETwIFUho+kGm5EqtfXE1ktfZM89zFEr
+Mx/jjFvNAQxnGIqma4fk
+=8JGx
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.2.12.ebuild b/net-proxy/squid/squid-3.2.12.ebuild
new file mode 100644
index 000000000000..aa289f3066f5
--- /dev/null
+++ b/net-proxy/squid/squid-3.2.12.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.12.ebuild,v 1.1 2013/07/11 17:16:42 eras Exp $
+
+EAPI=5
+
+# Workaround to avoid failing make check until we have a proper fix
+WANT_AUTOMAKE="1.12"
+
+inherit eutils pam toolchain-funcs autotools linux-info user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:2 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	sys-devel/libtool
+	dev-lang/perl
+	sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		lib/libTrie/configure.ac || die
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		helpers/basic_auth/MSNT/README.html \
+		helpers/basic_auth/MSNT/confload.cc \
+		helpers/basic_auth/MSNT/msntauth.conf.default \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
+		helpers/basic_auth/MSNT/README.html || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	use kerberos && negotiate_modules="kerberos,wrapper"
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	# uclibc does not have aio support - needed for coss (#61175)
+	local storeio_modules="aufs,diskd,rock,ufs"
+	# not stable enough yet
+	#! use elibc_uclibc && storeio_modules+=",coss"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--enable-esi \
+		--with-large-files \
+		--disable-strict-error-checking \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		${transparent}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+	newdoc helpers/basic_auth/LDAP/README README.LDAP
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd-r3" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/net-proxy/squid/squid-3.3.7.ebuild b/net-proxy/squid/squid-3.3.7.ebuild
new file mode 100644
index 000000000000..bfdc4ecef928
--- /dev/null
+++ b/net-proxy/squid/squid-3.3.7.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.7.ebuild,v 1.1 2013/07/11 17:16:42 eras Exp $
+
+EAPI=5
+
+# Workaround to avoid failing make check until we have a proper fix
+WANT_AUTOMAKE="1.12"
+
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:2 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	sys-devel/libtool
+	dev-lang/perl
+	sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		lib/libTrie/configure.ac || die
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		helpers/basic_auth/MSNT/README.html \
+		helpers/basic_auth/MSNT/confload.cc \
+		helpers/basic_auth/MSNT/msntauth.conf.default \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
+		helpers/basic_auth/MSNT/README.html || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	use kerberos && negotiate_modules="kerberos,wrapper"
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	# uclibc does not have aio support - needed for coss (#61175)
+	local storeio_modules="aufs,diskd,rock,ufs"
+	# not stable enough yet
+	#! use elibc_uclibc && storeio_modules+=",coss"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--enable-esi \
+		--with-large-files \
+		--disable-strict-error-checking \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		${transparent}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+	newdoc helpers/basic_auth/LDAP/README README.LDAP
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd-r3" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
+		echo
+	fi
+}