Version bump

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

3 files changed, 279 insertions, 15 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 12f519c23b5c..dcba98b757ad 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.496 2014/11/05 09:56:56 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.497 2014/11/11 09:55:06 eras Exp $
+
+*squid-3.5.0.2 (11 Nov 2014)
+
+  11 Nov 2014; Eray Aslan <eras@gentoo.org> +squid-3.5.0.2.ebuild:
+  Version bump
 
 *squid-3.4.9 (05 Nov 2014)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 60efdfcda06a..4b3306746c50 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -11,25 +11,27 @@ AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af9226822
 DIST squid-3.3.13.tar.xz 2187728 SHA256 55d5875709b93f447788526527496956c508832abd1f9c651346e461c9d63221 SHA512 be7ec0ff949f94a4521c6aba2cff87b495ca626c85df5a9650e587c5723f2e52de68e939d8dfed7e8279be7a987c13a773d4f94864308d98d2a67c462b3b2862 WHIRLPOOL faaa5626a97589e486650fa7ff0231487fae65cf7d2ae962f36c7857c97d481c1f82cfd3326bfd0b690543abc01e5581feeaaccd77a8c34ea762abd1ec401f36
 DIST squid-3.4.8.tar.xz 2159904 SHA256 9146017d0e4ad48fbc1d1b6c03d544227c8e7fc7720952b588b688e65beedc18 SHA512 bb965847469be73575ae26b8221b768aa36c9b4e43b0e0ce1722e4cc8c48b683402c06ef4abd655239bab497dfb07658977d32b0d005535ac3dc1aa03ec46689 WHIRLPOOL 505514fc9c286242d565e95778e13bf9647360760f3906bed403763d78759b69a15e587783dba5ecc7ab7ffa26479b904cc54123f5920ae7cf3e07a5800ebc68
 DIST squid-3.4.9.tar.xz 2160416 SHA256 0a0f13bc745437e78df14c31828d9324979b1f2f940b9ce8c9d5bbb7d5fcaa7c SHA512 d9bcb3132723244113a501de02d77430be011c4a0a4c6d96d71f9cc2667c992ccb17723bcc9a9b1e5dedaa4b07bd4d5a5bc491f581bb4fb0e3ecb067a0fd0e1f WHIRLPOOL 8c9942d7b8dd95d8f84378c86cc2c5c887a5bb34a140917e267e8506c2d3735a4d255db9152e5fcbee1fc940df7c5c931897ea59ae1cbe92ef701b2770e9ab84
+DIST squid-3.5.0.2.tar.xz 2282452 SHA256 cf2641212ba705e0953bb95fc01d29b8a63fb3af936a4e0636429b4c339b6c32 SHA512 d07103b021eb71b0f4e6292404fd8d18e8dd7e60e3d6245015345780359512b5c2be74510a80797451c22a4b56275de86aa4b27ceb32176779c1452e5b9efafc WHIRLPOOL c1c65926cd2c81fc4606924daab829d078c6c5e989a248fc24570a47aa9d12fd69df45bf9d246becd5a3637efd0c84b0713d96639ed3c9579894c58c47914812
 EBUILD squid-3.3.13-r1.ebuild 7924 SHA256 f3b379e0ed8bd70ae8e664271c694846b23a0dc85118fd0a6babd4ad4c98d262 SHA512 0485d995fd00598ade9c5e68b9c0597a0c588d51d4dd1f44f08ab1384dd4d31c001b2095b261db674ea78061ca3316a9b85115104855cc32acdb032035d598c8 WHIRLPOOL cecfc5f8b0e16b5069b0f678cec757c0e5f8119e0028158f367d884481555526dc716af950e12d1bef0eaff5510888616fdeac8aab8e546536325272c3f612e1
 EBUILD squid-3.4.8.ebuild 8032 SHA256 f4445fdfbc22f2f3564b4fd95ec08fa67276e1e3f5c5591f0b3b3d4fccf6d64d SHA512 40bdddb9a63e9e42ce6179900b4a7e5ee340f38995157a10a6447f1dbc06e6a5b039175f1e41dc9a716e1e23a308f664f340aaef359021615261e1e5a62ac25c WHIRLPOOL 0e75c05a8c08c44073ad8a65a33981a2b7621a53e7336a5ec4a69402fe146c4c8f6b890e3d948bbc6df22044a77aeaf4f2e2918acb80b15c1a915867df72a33b
 EBUILD squid-3.4.9.ebuild 8123 SHA256 64510d2db4a210a57bd178cba4ebc216efcc3bec3bd9502c9be192e16ea60aec SHA512 332f77818113bc26cd7887c5dc7a2c3ddcea4b3036e069942162a40ee81e57c0f28928647e09090fb20ea62176ecacf74865c230a840dbf50e68ba874eef2632 WHIRLPOOL 51d3865003125d44e4af95d6e20c5c937c0a3fca7c5728bcf132ea24b10e156ba2f94c798a1fd8c5c42174ec62a1cb7332db056fd5a0bde5207c50cc5ce8adb2
-MISC ChangeLog 91399 SHA256 7e99a4a5fae6d0e1101e7adbf4734925b051fd2f75d166112d0c000de24d292f SHA512 31aed21ef8a3b97bc8b7b14f46adf3bd86b1e382aa575f86d6b7498330f782e72cfe6412da09964d627de30be1f7d66d11de2eeddd3c4b4811f3ab1b99356b53 WHIRLPOOL a81e178f66094b9529dc8baccbf042412fa3285e84fcbfcbecabd1038f8d3b288384e2fe2a3af2edb25e4db4774eaf2a1ccadcb97b5bd6f95d8133ec83065e66
+EBUILD squid-3.5.0.2.ebuild 8162 SHA256 b3f187337e5b08ca2b7d7a38b4735121421e15ccd46177e5e6c1d9eae4c2fbbc SHA512 cd7f718ac533ecd0ac28cf9e6e21e1c8f739f7e78092a88f34d3ce94700b7bfeaa9d632d71ea29a167ffa05e25bcdde3efddec183d3d9367ba65a9be0bf1683f WHIRLPOOL 0b6e0fb329e54160f6c024a3fe1679e994e5894510d0827733d4f6bd8a703fe7f096b24c8acf14c8961aaeb722e9fae97b14eb9ec265963593e2f769aba42314
+MISC ChangeLog 91512 SHA256 b995ec8ff7c33e6a96682a6ddeffbd35e750e1ee286a049b93283935d73290cd SHA512 7e8f7003d2bf73cbe86ba89a64aeec2d0e5975b3cce2eac5f959399ce2f05d73d31ac8299f9fa5f82d52873c4e4779cf540b31eb200bebfcf4a8a034752aba8c WHIRLPOOL bbdfe356789fb89a6ec9869839df6168f59d10eaef919d6aefa4dd91e0ff0ffa73b06f79a9e94ac3d6ab2fd6fe59008d354e5defd0dfde4b480b893356e4f496
 MISC metadata.xml 1570 SHA256 7a084172a69649c4565af822f331e3085911a506e422ffc68b8a0082ee07ec6e SHA512 74ee493ede7181e22dd1d6a2889ddf3b4443ab677d3801b0c50b7c728c303f813e0a53dfc0931efbade78b98185401b15079e80e8742358a2a080d5a21f7b7b4 WHIRLPOOL d8239bc47c931b8a0e10ec4f16d91845482c35a029bb1d50914874150ec71b5f1a61def07f566ae4f6b10468426e8426ea8a319c30e41f985f5faf82ab1e6942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUWfR1AAoJEHfx8XVYajsfloUQAJDtEsebbm+IYyj1QvGmGolH
-DxPZpKwuDArz61vESiG2oh4yRP5Cu/BH7ZnVFZg1VywI5h1ZaIw9eDEVk3+XnTMY
-fviDNGhSpV5MlbKIeo5vHEpvdFk4hQhRa6W+ylbBwwX7W5IqgXrijUjEvfd8HQ6P
-AskibCa/oQMdI2HnYFgs3kg2DK2nbdbpOtp+6u6B6AU0NLNIMhd5AJ0LrB8Y1RTN
-Qd/XHfYLqgFEn/mqw5t84RtKa8zMeV3c2OFSuMFfhJ1m4tq4rq0MMvKBPML8x4Wh
-lZr+JLCJA7VA52j9Zw3Ot2q8VOdgIlaQ5W30eFoy1VRVgvc9sJIVS94+U7NTGMoO
-hczIQcBpfc14+CX8InYaFyge6NSRiLhrQ7WOv1PCyxbx9GCYOAJodZ74X9g8d0xO
-7JYBQhFxKyWjDOGs6j3NP9PTUJWXMYIC+OtK7XFodnhfY08U5RTAGJJ8swpDLUDx
-/n49zG9tK6Kp83xoIlWq26z9xJbzm+FEnphhrlzLzoqfBiZZr7z+MG6tiyL+Eg1j
-ozO2QQ1CQZHZRUL9iz0CQBagbTPs0YwkYFFVslHfSxgTFk250boYlitLyyPucEWT
-sjGceaaFk2L5oHfUIS3pyWvNyzoHfKucXmzuofO/UP8FlOpJ6w3ovIEjj6u/iLPA
-5EE74LS4xUQDoiCyIYnH
-=QFX2
+iQIcBAEBCAAGBQJUYd0FAAoJEHfx8XVYajsfcUkP/3EJ7iWG6ghCY1pvlqoBmlDU
+QFumqQ7Fyju8LnzE1srAajJdZeR1pKMramkglvqtIMzE9vCgb6AEHkavHYdtOf0b
+5+hBoYlYC4oTeMTSWn4yspkEYHTNJVzO1Q2xe/DLso2tu0ASDbAH8daFhsO9347w
+PKifnmNP82nWtLOd3MLqUQ58RkHoXCpVZt6VIkyPsHL8jVF9MlEqBi5F/Z15PB6y
+6dDhzY9yycp7V0U6zDX9wk40vuaK9X/crq8R6ksQzSNkhpJvyQM61vfucTGUeD2g
+c3HLkn3tWGSATQKdRQiOvT+7Ke7ncOW0eiuW4lnO3tNc8BPua/fKVi8h21H7uU/k
+zo/5W4CrX6DzPollgCTeJUwS+oxy9bdPuLWD2Q9+iEpE0512whmeS+gBSsOCHxKO
+UESDuX3aoldEv8cVwikV5a0A5V9YpOZWw5ttRq7dYUpjq0huOnqY13lVtHbJQBup
+31Guv+JWHkTUwmUxSCW9cQblntcG7sclKclcIRdV3i8JA6mNcKB+oiaw/zW/EGC3
+K92EUUHtUhH0nSg7ui4jUeqHziUy2xuPudhTNNWCXFJ/XG4qQv3jlHPLiDRBQKfq
+TAsdM0GRly2bHeUR+LK7A/95Knqc6j+adZuDv4v/IPlh886BLqFMNDv55paVD8yT
+Hqcz0JynbXCcghemYVRB
+=VvxB
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.5.0.2.ebuild b/net-proxy/squid/squid-3.5.0.2.ebuild
new file mode 100644
index 000000000000..7e318e67cf22
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.0.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.0.2.ebuild,v 1.1 2014/11/11 09:55:06 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 )
+	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
+	sys-devel/libtool"
+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_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:/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
+
+	# Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
+	#               aclocal-1.11: `configure.ac' or `configure.in' is required
+	MAKEOPTS="${MAKEOPTS} -j1" 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"
+	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 \
+		--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/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 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}