Security bump - bug #548228

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

4 files changed, 528 insertions, 16 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index ecd8a23021ad..598a17bd82b0 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.523 2015/04/24 10:15:11 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.524 2015/05/01 20:55:55 eras Exp $
+
+*squid-3.5.4 (01 May 2015)
+*squid-3.4.13 (01 May 2015)
+
+  01 May 2015; Eray Aslan <eras@gentoo.org> +squid-3.4.13.ebuild,
+  +squid-3.5.4.ebuild:
+  Security bump - bug #548228
 
   24 Apr 2015; Eray Aslan <eras@gentoo.org> squid-3.4.11-r1.ebuild,
   squid-3.4.12.ebuild, squid-3.5.3.ebuild:
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 7efd4f865a77..81bebe9f32d5 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -11,28 +11,32 @@ AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
 DIST squid-3.4.11.tar.xz 2162148 SHA256 b4ede14221d043bbde94655aee195b090fe33a9a0a3d4ed83a9b41fcd46cac1d SHA512 e485e195f6ef95d7d2f5d327d9e229d9b3b678b035595853bc5d9a56a0494536239fa591bd56213014e08f9584e56d3511b0429e9fe9076d6e64a8b09867be69 WHIRLPOOL 5a3b1829eeda2b507971346bab3af142f19c650185940af82a238787b7265ab5e51535e815e1f87f0800071ca3053d8a0195da0ef02d27361e83951c4631ea63
 DIST squid-3.4.12.tar.xz 2162096 SHA256 a3f4f18fa17e81a8d8e1a2ec059cdbe3211a90ccd1717c3d9e092c0afdde2864 SHA512 7745e1a8ba7f458eae9b9017c16a13c3e724d54be48fc592fda9715d047db6f13a7b59dd9b6bd80e2f450373f30f7307a34d7d3cb3ff192a10abd8eb30da8b0a WHIRLPOOL 43d0db0137cfa35f91a4e1233c3a16e095742035b98331d983b047d5c6c45b5c36cb96def15764bc6c5c6eda892307387475953a94d5dd9fbfb10af4d86b06e0
+DIST squid-3.4.13.tar.xz 2163996 SHA256 8f786ea2f4e6bd349ae65626459699f1ce4980acd4fc6148ad68518b4457650c SHA512 1a7fb5da1979b392c2ee63b99ffad7ce6617f1a2ba72570906eddefeee0fdced0888401ce8e15c9599f142dadac0296347b00140cd0c67f7917bdd94bfcce452 WHIRLPOOL 01d10f8cc7cd948a78ccccbbbec01b5edfdfe44446dda24df0b1403e70697a7e7426d0d87198e1c9bfcfb66e59306b03b096e254baa1c6c55a6cfe1c8b6fd30a
 DIST squid-3.5.3.tar.xz 2283580 SHA256 73ec65a08384a3ec93ccc17e89ef7a06ba221816551946f2f051cc736c2981c0 SHA512 aeafe302e81c78ae4cf9ca49133855559a2908d053aa5ce5e7ce6fc9a9e0188d824422c38f16e0b29182ac8103221d7f3aba765fd5160007a077be1be5343739 WHIRLPOOL a954c15872dd5b7efd260116358835f5f1f6c2e84374486efd1bfbc0f3c85515803dced352a4181d34084d02f65e58906cef00b4c58d17386d9697c56177c7a6
+DIST squid-3.5.4.tar.xz 2289772 SHA256 dce615d08e349caf3975fc5d51ce4c3c69b9995fb83f51dc5d55ae873d8bf6a4 SHA512 7eea6ed9b3bb2fd55b23970393a837f0361be1018832d60e07d03ffcece1acc7e1be5469fdd9b4be07a030573a0e09a137b78169efb18269a8de1df37dbac3d3 WHIRLPOOL bf57c690e7960d45f0a7edbc26d19363ac98b4bc95e3afee0d7b221c322c64fc807b078f47c6797f5cedb19946664130b0bfc8f20e5ecaeb0f82d6bd0c1cadb8
 EBUILD squid-3.4.11-r1.ebuild 7957 SHA256 a638a494b0223723b071a8525b8f9abfe67dfa69ea28e839ee8dcc09924cd4c9 SHA512 92fbf528ee43e134f48ed1f17845074b3aeff23d20fd8b90b5ffef3ce598fc6c3f40eb6051d8f8883f142abf88d35835f96da5c3d4310d1ab6c1a0abd310a7a1 WHIRLPOOL 6f70dbeb6459b79f9548acf3933f533f7e7e4bd4127a37c808ee0b2bd6ac761c4e56e96cb161987a4f36f25d1224cd34f27588922cbf7ff5b800715073d4ae46
 EBUILD squid-3.4.12.ebuild 7916 SHA256 16c6f4dc2b4faf668baf5536b73acdb5432d692b88f83dab10cb7ced5ffd494e SHA512 a11a407872682aa93ca87ded33cc146996c812e1056a722bd7ebf558829e57703096c4e0b1dc7acc369745acc7df76115580413f94ced83f013914d9d3fb7854 WHIRLPOOL 25c6a98d409b3d547f24a5d22dec71fbcf42888ce6d2db483d2c29e30ef8b97e87b3b2ba6fb4d482ced13d7c7ad5073264f3ffffdebc924f6e2ba9dc39544001
+EBUILD squid-3.4.13.ebuild 7922 SHA256 60f68576c70f80d6a4a15ae10e8c06f4b840cee70139a51b1b45b642b20bfb4d SHA512 a3f1460ac6c3bcf0d6a9847d2861d86146dae6f29844414263ecec2bdcb8e004ba6e1f80f5c30815b80dbf468724472679cfe77157d6b918a7751cf415bb20d4 WHIRLPOOL 588a55776ec84558b6e96db29cbbdb1d0ace7df065860d6db8cfedaff84a961f598876887fd4b08c6dd72cd89f4995bf002f0abf82787e6268843991df4d5699
 EBUILD squid-3.5.3.ebuild 7651 SHA256 84594280e4e4f2c561dd2516ce94416454e72518c37999c53214de22e9fa9df3 SHA512 e5aafa3f0c4a0d52f0fe986dc19b1d2615a121842f80bdb90cdec2f0b46c4b8f19c9cc9da809abc78d866a616f2f46652668a8e83d61d46d5d31abaec42cf353 WHIRLPOOL bd2dd1af4b155e8fc9501b539d092997f13b34d222910405a9f1cac0cca4fe634d1b0e1519d651a7f704c8118ccb7310fd4f6ccf422b65432a362eea84fc8655
-MISC ChangeLog 95160 SHA256 d0eaa101cbf114350de50896b28e090a9173ee4b5d26ffe39d745be33a723bb1 SHA512 e6e46552adf09c46e8c705cc33297e02a26e53a28e9a97c0863960dc9bd135c7db07a3e91d17e27387e367d61db198370eb7bb766b505eca5d6356ecf186fd0c WHIRLPOOL b993f0ddfa4aee0b650e1b6131c41aa94f2a12b4ffcbe5197090a750b78ba92f3133e6bd0c41b7f994b21ae37cf848d77e8a8b2094ce738b551ee077e73b74c3
+EBUILD squid-3.5.4.ebuild 7607 SHA256 2edac6f69f89fa4f48fa08adad49729d2629762c84acfd3e63db3b052825276b SHA512 9618997988d37353b90f148e27e7e1f656d5d4e21f891ac5e1ad73a413bf1e2bd5ea2dd624264ce7a07ba743ad53bf37ad07aa57f8595158efb2648650a282e5 WHIRLPOOL 986685240261a9c6d2dfbc5ec500d1348f9cd65c508b0a1aba628a7cb68c8691e1b470e5954693f3cea5a7d966e107eab5e6b448352efdd7f7f09fcd93b9b6c6
+MISC ChangeLog 95336 SHA256 c6839cc7ffed1c92a58eda97344d5ce490ee9b845c7f076af3ddb00ff894764d SHA512 ac4dea07ea032f6bdb10bbc02580613e0699ec369e00cab028a95aca3342098240ae7534e4f61f8b84888c06e180cc8d502601425210434ff9a93b8d9d4f96f8 WHIRLPOOL 6434887bb868b054cca8e7283f7f58c955179b4cd579bbd5e12491d5e4f9411a63e9b051ac8728a7b89234181248d2ee7e4462c11d7c78725843a0634f56dc50
 MISC metadata.xml 1545 SHA256 72b1cd3b3476500f50f936459a522eca2fabcad046cc2647662bf18b75d57edf SHA512 20c78e621a6a58697108ae3e0a543a3ead301ccb50ba54266fa9775ef66fc24590ccc7a24d20883af656b8a295fac26527c65d236d4d46ae0e0df0c2d15c993d WHIRLPOOL 90a2470ab97b9d56e0b73410741194f30b1bed09f99ab71940ded398d3796ff8d87250ccfe419c544b2e85cebd8706d0c4beed926870f290694074c34317be90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVOhgNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVQ+jGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
-N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsftdUP/RjIzNfppOC3g9OyLj/EXuPB
-YsAoHo2+CdmcIy8l/Bj1UxdC1QU7CnL210LyVAh3ZXj+d5VMJrIjJtj1Qqf6wMig
-if58w/6bNfVBqzNfQ75sMxoH/cz6fv+oP4AcLcgU0HBmCpT89ILwmIJijCJjr2Cv
-DnQyNA6dJcPpW5z700k2w6EwrbLGO0wb3quivGyCuCYth17vJGS2IbORYHaF80HI
-FQnYDeuUUNOT+cxzs+9N1RrbM3FlFGD8FyeE7xHzKlc0rb0/NifsdxBJ/TqpzisG
-tCsCcXX9RxYYuAhEeOdgrawgEVI0bWbp6njVd9DVDFbnth2J7C8wSBm6cMVas+jr
-luEocE0XOi9U73VwQ6saRsiv/QHKby8lU0FV7mK2UKU/NdGXAoz3d6LCigrnDwvO
-/gqOGFVfdidULeJWoGVFgT25GIn7peb1Nlq2B2MaeKknTXmnSS3cA3h4viUExm9d
-+PSyl1cUOrEvpdlK/wz12jhlw7ETHTJyOonTFHksYLPGsRnqH5nXPdXG6WxZfSKj
-6C7FwoWMmW04dzUI32yQIOOwC0O5tFP3/1OMFny3Vc/5YAAZp6sITBLwstxLaQAW
-4RkPiqS0e5mn7TgqKvq4Tokyj+DWmUG/wr9JR/zy41kHjJq3WTGdQEpj9ep+FsL7
-h303wOiS41PKrTK+fPKM
-=ASIF
+N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsf1d0P/jydoDwfaGSjkTaTKYBgZZqB
+VMcA3WgSRzXh5esjr+BS/n7BDMQCJNAfsCgrzopJa44UuGPHoMOW75d3qVmhrEOD
+4JoSh/bITC8hFjhPQSKiFTwMRThTycw98YU0kCLlWUzFlJXOh+DVCwwBs5irS5h3
+jI1L4VigtgZDv+N7EnlHR/MeyDXd8gwvpjUoN+gDTjKlpQxDiPT8vR1B59CKdj6n
+T7V14riGq75Jti1RsTuyOjY3nItdJSX1GpH94Lhc5T78Y9tsM5GwJi34NAU2Eb7J
+GsbGA3eEqdptTTMGwSvvxf8oHufnQjeAz+SR42gvoj1xvfClRAg7Z6S6DSryMyou
+EhmhAWsSayJcnvmHvIJjlp15jDAivn7hqArfJTyfOBNzKUiVPp6at3AdQgK1uaSq
+vzgzVOQu3yvbZLLYeERtjO8wRwolDqLCFUfdYAeQrk7bsqdQhBsRlaYXQjG8woPU
+bOub2ulhHAff43XoHj0bLCzIxI/LDcBZ9L9/lWBxHEd8gT/0dess+PX1rdeZhqZk
+Ig/i7TRfDjNYGvTo8+19ncnFDYNl1lHiLcLHBkmbOC04N994NBFc5tfLEBopbihX
+Wr7JU1m86BVatJtX4JJOnz055pflvlT3qVB250YcfpSD8KLo4K+wk4lTHaAlt/VB
+EZsLX8hBF3VX7QhIVBit
+=C9kl
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.4.13.ebuild b/net-proxy/squid/squid-3.4.13.ebuild
new file mode 100644
index 000000000000..147cfc2734f5
--- /dev/null
+++ b/net-proxy/squid/squid-3.4.13.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.13.ebuild,v 1.1 2015/05/01 20:55:55 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.4/${P}.tar.xz"
+
+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 esi icap-client ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	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:* dev-libs/nettle )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:0.2 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	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_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.4-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 || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	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 myconf
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		myconf="--with-krb5-config=yes"
+	else
+		negotiate_modules="none"
+		myconf="--with-krb5-config=no"
+	fi
+
+	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"
+
+	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 \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_with ssl nettle) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+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
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	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
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /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 4 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/net-proxy/squid/squid-3.5.4.ebuild b/net-proxy/squid/squid-3.5.4.ebuild
new file mode 100644
index 000000000000..2423df86d677
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.4.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.1 2015/05/01 20:55:55 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.5/${P}.tar.xz"
+
+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 esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	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:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4:*
+	dev-lang/perl
+	dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	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_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid
+	enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		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/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 || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="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"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	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"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	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-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 \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+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
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	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
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /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 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}