Security bump - bug #461492

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

4 files changed, 501 insertions, 16 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 93e2fca06be1..43eb064c2fad 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.395 2013/03/09 19:07:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.396 2013/03/14 07:49:29 eras Exp $
+
+*squid-3.3.3 (14 Mar 2013)
+*squid-3.2.9 (14 Mar 2013)
+
+  14 Mar 2013; Eray Aslan <eras@gentoo.org> +squid-3.2.9.ebuild,
+  +squid-3.3.3.ebuild:
+  Security bump - bug #461492
 
   09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> squid-3.1.23.ebuild:
   Stable for sparc, wrt bug #452584
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 645015f631ae..474c404da426 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7
 AUX squid-3.2.1-gentoo.patch 4418 SHA256 41da185c1af04590525fc9144c14edd160522b878efc2e62e8a992a001ad38e0 SHA512 08ba6aac7de61aaae9a96c42801dbb8e414a2b8ec7bccd80afb1973f7c9949dacee4011e54d050c7ae46a06d2914ca8a42629af5707c6810b1547e3b66ccd5c0 WHIRLPOOL 2f8ba78840e46a3b8e780b653d8084f9c0e8b4d0793f4b06cb7faf9c6ae32b193de923b411c394278747ad9574cbf317f72f97467fbca386db4c4f1bd0f1ba50
@@ -20,32 +20,36 @@ DIST squid-3.2.5.tar.gz 4107649 SHA256 331a507fec11c89b5ccfabaf9eedd6c208eaa0a64
 DIST squid-3.2.6.tar.gz 4108394 SHA256 cd3a61fb6784a942ba8809919c7bbcd924dabc109485cb45f2ac2f0dce63429a SHA512 232af970a41b62eeaf50211ff9afeef5978f1d04a637a67859f55bde36aa89faf2e90aa267fde3c5aaa7092e8c7285d7a0591e42db9c4452ad4d6d44833fdb6c WHIRLPOOL fa72daa46a2c994936d0cf636f4facdceb01cef7d5c139929be0fd27b2bf598c25f942f5bb1248b98e28fcf7a23d5ce59c13f81c134acb6e361d54f92b851999
 DIST squid-3.2.7.tar.gz 4109865 SHA256 e3917271b5fa52c16cc6815ceb2513a01d2ec8190a79bde6c45b3e3900d7bc97 SHA512 efa0b1fbf48b6ccebfcd2a2a1350ab28a73c0ae7b25962bc5ec334c614529674ce641ff0b4c0fc70438856a7b351807e369f30188ea75b51914e97bb8310c921 WHIRLPOOL e5bfab3e40f60e1ec5a4d17ecaa121b003b73bc852888ad3f05a39a6031ed75e1906284dae5fe9c08d734286579a0ee6e8a2bf85460a4b30162e2043077fa8a9
 DIST squid-3.2.8.tar.gz 4112583 SHA256 5a1c5ae0e96f60e32bbb6ba6e5c106e2724bcf8fb6dc9726f3a7cfc180595d04 SHA512 cfb54a32cf8ff92700f303aecb335273094272a9e4c3db06a7bef1eeda062c3e56240c507e95cd4282ed03f9d534bc29a37f2e44210fe249527f938e349c7b5d WHIRLPOOL 6ef8a52123f068266f1e8b52fea236785feecabdbcf7cad7f21d557075a38f865e820595cb6d4a97e0759e467c508cc4e2589263fd87bdf96d46f1f9a260dc82
+DIST squid-3.2.9.tar.gz 4113390 SHA256 f8262cb033e93fa806188a3238cb485165cb3ddea0818e6667020f7e68cd3401 SHA512 6463fb2538a0f63abc82ec8acac52cbd0e9a1a1062fd4329ba7d0f07f0e1ba2678e439322bae378eba0a1e99356bd6854bfa266a6b87a12607157fe2f274ef0e WHIRLPOOL c72161e5cb6030c187d16e6864a3cf1ff8475958304fc74a1d9c708090f177b6fcb26a3bcf70ef635b8ffde5aadeb10549c47044e60ad358539e63ec0ba7429d
 DIST squid-3.3.1.tar.gz 4189100 SHA256 827608aead0aadc8f1f052347dd404fa0582a47a06a7df1f122bab08131962ed SHA512 4f34a99fea2847dd511f7bda8fc2ac3d92a7643f14f323871d4a6f4b8f08d404cd8afd64311cf46e04af95fb3f773c25f0488bf8b19d34598d32e473726c7104 WHIRLPOOL c1227543e58af890ae2aa70f60eea18f598d66bc6633f57208ec1371247aea65c5f93852b12f0e10205ec1582395e87737f079566c4d05673033fb9fd8c55bfc
 DIST squid-3.3.2.tar.gz 4190783 SHA256 6b7f8d12cd6120129c240dc3e35a696ad5183ae559d3bff06af2a72ad4410274 SHA512 9501a54b226b087a8eeace60b3389bee360f871b8b573231b991dc0691002d0e8430d48ada37b471cbd8f42bab400109c66ad7c51128c40af1063b2013272995 WHIRLPOOL 00fe47bc1b7b268e692b2b6d29ef093cae79132ddfe927e92e19bae70d5f5beff7f552d6945f357db6914669093ac4abcb673f27726496006d735802d72027bd
+DIST squid-3.3.3.tar.gz 4191938 SHA256 2505547a0ff5b24b9f3924a7e4ebcbfd4ce41a160b8d841331edf711c2912138 SHA512 ab87940b0ed3c95f36d8790b653be5c35de9213711e1c6ea57726ebb03f655d9d268279f67fa0fb6f10abf3a20b205294f4261c20fe044e303377d35dce95249 WHIRLPOOL f181ccbca08479baa73571079a36a4f347b36a84aacaa8e3ee481aa3f0d00cf71aed1c512c16a4b0a5158ebac6ffe112b45a95ff3dbf926800fe03b60688324c
 EBUILD squid-3.1.22.ebuild 6669 SHA256 b44a3b3acee466e2b15961eac8cbd5360d89ef3754b9650414e1bfd46128b126 SHA512 55b6d0efa256ac94736d4389bfe989611476673df63a2a757d4329028a347d68ca192918a256f8ceff7142006a58f56504817e6a17837fda5ddea8b96677fc6c WHIRLPOOL 293e9a6c16902fdce4b5b677a0ac58fb8c05c9380817d5e8fa91e65c19915adc3a1d6c05e1d162c7dc2b5d7a5227d05bd614b516d8cbada5249c0f151e50ec90
 EBUILD squid-3.1.23.ebuild 6687 SHA256 a12452feaeadfe2501e168dce2552b244c31e96436a0278bd8b3b5fdde89f34a SHA512 754809af799a7ce243cacee7a7b38dc3e8b51920f1f90f54953529d7e51ef4ab046961bde57c82418bae09034c3f8d98d1405f18659b434338071844e245730e WHIRLPOOL a6f8f792332b0d1e1e366d93e7a87cd2371e5c97ac8b8bab3783a6b830c83e0aa19c6aa8db7da5300c02c6a64e3d07f53cd551fb849daa50f2e5cb5c5bbe5392
 EBUILD squid-3.2.5.ebuild 7591 SHA256 c7d1c2eb230687c1ce60358493d54ebff7d3bf6823f6dca10750152722d87b14 SHA512 3d234258d0cc8444d9cc98b4982971fb191159357468cf6cc9bbbb8e60170ee03ac2ff24aed77779845fc9d0e4c6414eaa4693301aec8e5bbe1bb203c6570a08 WHIRLPOOL ea79284d910775d7b3af0ec088ac212a23e48d37ce69c230aedab3f1697f0b19296fddea4551b0820ab70ad57eb40c58a75fea4f7f79ff52067b8451ede8cde7
 EBUILD squid-3.2.6.ebuild 7572 SHA256 6e4b16298fba4ca3f089653d5507b5da2dcc4ca950392d626aa8544ecf1a62a9 SHA512 408d83c9d3ab26c5dd07a43fd1db0aaf453580986fceb06561a62cd206fcabe8729447a37aefcae8d1ac5780a89b0dc8dbf0f92824e7928e3b0aebbb573a82c2 WHIRLPOOL 0419a5fca8c6693a6c8f2db2f33bda510c59903b4dbaa03f5ba5323d503db9eeb5d59cdda87dfe27cc6cdab9b922c88d346c245ff74373ef6a0f35ee2a8fccd7
 EBUILD squid-3.2.7.ebuild 7667 SHA256 c5144a844138f7a9faac30b72dcd2006e342e87a118c46b75223defcb7459c53 SHA512 93dd44b05bc4b08a824fe79e75c33e1b2df33379ad234d5b2c50fadef160aa76cdf2fd2559a9b5bb3e280d43a2f3e6e9bd6c9f94e1ec786eb9891f1f0833f49b WHIRLPOOL b2bc239f4eeb5bf45b71dd55587ed198a88c5e920a002fffc124a671214a7d4fc7fae7d3c33a55e70ca3dba521bb550d095d3017aa6110dfc2e52ff3bcd324cb
 EBUILD squid-3.2.8.ebuild 7589 SHA256 8eabedd08291f8a72470fbd46fa3f4c8e3c939ac4cb244fd7b2d62f08aab869f SHA512 3ff62e1aadca9ac692c71e7fcbc5ad311c197f086c8278f9a6b742e14dc4f48d87a79e0fa7038b0d317e5cc286797eefe6eb6a5c6f4876dd6c2552d62a1c16fd WHIRLPOOL 8bd6c184eb7e6bc8676df377ef9159a34c49203280c1e3a8858cc6d0724b3c84a3f9f19141007aeae7a5045cb958451f4c639789cda9832884a6cc0d0e31bb10
+EBUILD squid-3.2.9.ebuild 7589 SHA256 5456412d8abacc0f14a15a6541c16454ffca8ca316abf69f2c41ddc904da9e4f SHA512 2aaa06fb669d0091c80e37c5dfc7fbe50bb90bbc467976f6e062ac6c07ef1a6eedecf959ee6abb106d5bfdd6f1e1faf3918a72460320ace6bc2ab1e80f4ccc9b WHIRLPOOL 5196e9261380c2421170856c0c6f0049457d6d30d4fce438a346701c665a1efb957457b34366468fd3a70cb81c39a013fd7492da204649fdbd52afbe7733cb26
 EBUILD squid-3.3.1.ebuild 7667 SHA256 3470dddb2122a4331ea81605dd528e7f27faebb2429737f52a3bb7ea9b900b97 SHA512 a1eaf397507d946fe6969e346d33aeb671188f53134c72b2ef39fa4708befb41bd443f5d1c2f101186fbab5d17fdf42183402e6c63432c61bc601132ffe54e8d WHIRLPOOL 3de1f8073edb5620a2fb1f5cf475ac4b22046891e8b3eb0f595b299de41b21749a03aa924b6dc138fd65f6c1691929a8b1c5e78f9cc8975db5bcc85e51c0cda5
 EBUILD squid-3.3.2.ebuild 7589 SHA256 bd5612be1424887a0d4426d2e11fa01463e2b6a2b2afbb10f81706e6c813d833 SHA512 6ab37b8a0c6e10815565a8cdec004bef391ed4736e80e9ed3ecf66b80d2af7a01ad19ee06731c403bdff06cc860c088e7bd61bfcc4e92856580fc78cd6699f1f WHIRLPOOL 136b700f1ec32fc6df0630ddb50fcd75173aa7d696eeb6039716a077e795eae4f5e70ec031237a137eb25d91726ac85a4fcafd13dfbad237c522e95506f018fd
-MISC ChangeLog 78593 SHA256 f5347b0ee29501c4cfaf991f5a42c8b9758cf9b4df484aba79300bce580901c5 SHA512 e37570de08e99a4c71d7e8d618158e841d99c3953fb5118deda244a15e82e515aacdbf0c29546b888682e812d8faaa324a465bf133cd9cf05e48680b6c052930 WHIRLPOOL 720c257eff33b7ea4ed7c5a1cc38685a078f6c1023da471046f456be0e2dc676664f5ef39b298537821353fb6dda227fb08b8ec734d36d85dcdee159a01e9481
+EBUILD squid-3.3.3.ebuild 7589 SHA256 f955c6869c7bc46a85bef075ddf029fabb2b442a10b3999622e60e366a7647f9 SHA512 dfb17e6fab82e28ffca6cab5fce19fce08ca287705adc41083f3271488e2b3940d1c8bc08869a3f8e4f2a9914d693fb23a890dec97d465f31cec1d0838805149 WHIRLPOOL 69ae80af78f82997f1a7113124a50c95f4cceb21b2a854740bc162607755938f1128260837874fd18e5ef49600c72a4c9166039bd4287f4f2a9c79345db569bb
+MISC ChangeLog 78768 SHA256 e3e627fb16fcea3352a7b9b2e785c95f747853859a6da5a07bf809611bc7df31 SHA512 fb0eca4bc167a8023b90688eeae38a4f4ede7335938ed8d57a9db532ea1ef7e82a0d2ff20a01ecd1284b896e693ca419b1e840b8a7143f3d727e0a6cd776ae5b WHIRLPOOL f630e54e0271b4daee4b8e2f26978111d616cd7f598a428fb11a24eb85d29948c913a464053090b40014b22013d4aa0ff0d90308ec6c412825e07b8009190e4d
 MISC metadata.xml 1386 SHA256 f1c035d3bfd09b92b127a8281b5d225b261c7a01c87d99e53a002d6316251089 SHA512 603b0c1803b86bf777777107a908db14c138911f92695d7572d448ddc5679c87031151161e1138db046f878421019f7778ef8fcda7218fb7392789124b96e95c WHIRLPOOL adf20b19ab0faf2c4219a16470db04ccb6f06cbbaf1a0b19631f2e01ade5374d9316b7015334b4d5722fb39b8328db61308888f4ad1a99983bf9dc0061f442d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRO4fzAAoJELp701BxlEWfvVUQAKWuvFLhT38cM1ltJQ45Gp8W
-hzF+ViswhSD/JiPIUWlHj3yfU2IwNBGVWrCsgCiA1gTccQ4orS53dOp+QAJ6c6tH
-SlBcpFfcQNJ1JG7dKG3X1KfnLVtraKkXR2tGbW2G9LsTq34qMoPRp7HYokVT+R1g
-kMLXPBsyZkpnrV6tmnmk0eB6woLLSlGJv2T+Nt0Q/Mb17UYla9AY61mTKleihbo8
-T3AW0kqHOt0R/2A1R6OyPdFYvdUjyQK51acQ6TuYmkO2m1bujkCZBNcrmFcN/UGP
-o4Q5t2qVN65TR8OV21wfH6WFX4zRturwM+mrbRHhXJ1h3uIKJ1GBzH8sUm3YfcMo
-XpOLXiwrHkblamPAMa7A0IGQrt54aU7y+RhMvZyvyNc73wOvHbMQucghN8/A03nJ
-pfkgYsK6Gk8qBQhTskuPIjMigGJdDChkw0EI/J/YWh3kO70ubqJLWpDlW/d0HH2c
-RBVddBHwuM17rGtJSTbAL/bFEuNEsnrqIgM9HVr9Il4mzX5fWyyTTWJE/zhdzDik
-IJH8Z+RUAIh/PM5M/xsD5AnNgWPAqDxNndZ/NGdbXUwM2/A/qt/7zo8SGYwndwvE
-qsCImMFcp346HFmSR+M0y4X8XghX8CdHA3G0gWrD1xeT7NRYi5c0Ub8sk7Scs8Wm
-w1O+UD2O1WpaAJGx1W1P
-=CcRW
+iQIcBAEBCAAGBQJRQYEUAAoJEHfx8XVYajsfUoQP/0nOsZhATAR0cvGYEZSeAqwN
+6YGET5r1GqM/Grx5AAXm5esow4l35NQXnkAUAKQCVI+uVdQxM5bWpegC5uv+4Ayv
+mPyg+m7SU1hXCpklsc/WrBKVx8N6FZNfSiHrHNC9Yx2yWd2ckkM6eZcwfquCHSde
+vIX0kx+LGr2lAd9IG4GW+GqZa+QvSxI4Tcrc6jr55Ls0tW6PDAta80CQXr1evVnE
+fcp9NthygLh4RibKGGtc+0FZxtvebdoJenpMD5zoToNRdPpytC+ARoOSZzfKMpUo
+ERU+P4bt2+jgsFXGByYdjISPFp+ZjLu/bG8EBbLeuMshs1TdN2QdqZlNFx0wHZVQ
+saljiwY3AWxh4Zrc6lIIQxMLmBQh5e8r3s+jqwDkfCvK9rhVBsb6U3c6HPM3GqL5
+a+/dKLqk8enZ5T3jt4X4nF7MZPYfxYDr1+Ag9/XSAgE4vbFPS5xnQVmGC3XqnHuk
+7CxoUJKaQyPiykkNfd33bZMQ3rHh41yef7PHdvToRnk0redfuArE4YMEvIKNVCwI
+zvCFujgE3Cyt5xj+md6jPIeZjD1GDPAAzdUa6DbA5LOnM9jQTWsAWJbp/GjCZHjh
+tJy0+EtxBT/ZeMs4rSOx7hq1gsYugtam9pdPBT6ryVgZ4j59Gw8h6H8at0dWuZga
+/8qvXt56F8AxwaylY1ky
+=gjZ4
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.2.9.ebuild b/net-proxy/squid/squid-3.2.9.ebuild
new file mode 100644
index 000000000000..6bfe74719e97
--- /dev/null
+++ b/net-proxy/squid/squid-3.2.9.ebuild
@@ -0,0 +1,237 @@
+# 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.9.ebuild,v 1.1 2013/03/14 07:49:29 eras Exp $
+
+EAPI=4
+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:/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.3.ebuild b/net-proxy/squid/squid-3.3.3.ebuild
new file mode 100644
index 000000000000..9526d4770b2d
--- /dev/null
+++ b/net-proxy/squid/squid-3.3.3.ebuild
@@ -0,0 +1,237 @@
+# 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.3.ebuild,v 1.1 2013/03/14 07:49:29 eras Exp $
+
+EAPI=5
+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.2.1-gentoo.patch"
+	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 3 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
+		echo
+	fi
+}