Version bump

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

3 files changed, 230 insertions, 15 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 32ade564fb80..e1d42febc1d0 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.350 2012/09/03 18:14:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.351 2012/09/25 09:19:35 eras Exp $
+
+*squid-3.1.21 (25 Sep 2012)
+
+  25 Sep 2012; Eray Aslan <eras@gentoo.org> +squid-3.1.21.ebuild:
+  Version bump
 
   03 Sep 2012; Eray Aslan <eras@gentoo.org> squid-3.1.15.ebuild,
   squid-3.1.16.ebuild, squid-3.1.18.ebuild, squid-3.1.19.ebuild,
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 9f3cf1569b83..b9859dc5b80c 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -18,6 +18,7 @@ DIST squid-3.1.16.tar.gz 3399527 SHA256 87fb621b2dc51b753ecfedc3b2d537b6cbfa8f29
 DIST squid-3.1.18.tar.gz 3401300 SHA256 6a7122514d58c3077f2b43c928864be10753d8e2c8439133dacc9eba6c45e00d
 DIST squid-3.1.19.tar.gz 3403110 SHA256 1a2ebfd832364ada4793532dcc59fb79588ee3819cb80b77d8f53858f0166e34
 DIST squid-3.1.20.tar.gz 3489463 SHA256 a0d52fa5d04a5382d63627ff622cea23f5f39a8f8a931f9ff10e4219fff44198 SHA512 2d4fb73dc612f907f32642cb0136d26f266f522aff66b8e005082d94c4cece4408cf636d40c6e8f5dda77074173c586657815c61c24ea976bf29fc0105242b9d WHIRLPOOL 387662bc6622777dcd6b4dbce4a2a04f88667aaea6e2949065f8eaf6c2d5f385a628ef168024f5ec7ff08f0515451eb12d530ce93c3a01e70f790de2b602d0ca
+DIST squid-3.1.21.tar.gz 3488540 SHA256 04ad5693bc3a018d63cb4e4ac4822020def77d50ec40581e5c298fa14525acf4 SHA512 e6ec25b07be94a867f8cb729d015935bec84f1e8762612b165ea57e6fb7998b7a9a7976d7f76f814190802aece28021177a24ad0c5f18beba99fef6a34ebf0a7 WHIRLPOOL 46670e177e2f0fcd5a4c20948332ba8a5547026151335df19154dcddeff127d8b880563ac10c3b33ab1f151f2d826be0cb4ad58f7a68b0bb9c3a96450a57dcf9
 DIST squid-3.2.1.tar.gz 4100448 SHA256 793ba5f04f3d3797b624fe061f8be9ededdc9f68cd39c1b58df78861ed4382f7 SHA512 2b0b80670634908cd5e93c68e9c50bcf5e773f26cd2197cccaaba74dfab6c40e9965b7691315406d2d90d318495df63e038436b5f6d4cc97f6f36655c765a2bb WHIRLPOOL 720598de6a2e963a42db31ef352836b2ff647815c85a3087f477419fe8f7ad2d3237ef806fd84dc1f68a8763ccf97af62f1161938f5205b334e96e96ca09446b
 EBUILD squid-2.7.9.ebuild 6178 SHA256 b263b7b8758187f71207a7adde5175f87bf56706c2b0132ef3fe095899a7b67f SHA512 8b466764141b57bd046398d5febcf58479d1936a928c764f091ff9f26e898d9995095be4326e57f062b770502beec6c992757cd2e1acb104699fc6e6c541d52d WHIRLPOOL 2438fd4885210d56217eed4b5bf125997c74bcffb8348a2073ef3bdbe9461e427dce6f3dbda299b13a2c5fca455ea76b2711b1139ed3bf8f98d533cfda269f32
 EBUILD squid-3.1.15.ebuild 6625 SHA256 13cd8ba2f2546a244fef02df7d3f21bf35fd8857f06b90e63a72167c5cf156b4 SHA512 2973ab2d5314ec6d7af223f4c3d5da22116aee3ccbf4285561f43b7604e1ddb2e84c1b169bd626a1c50903fc42b038b6434dd4ccbc59ca1508d443d82735c16c WHIRLPOOL 941d18c74451eff543ae6b9cc2eff0ec2dc14c3166f402ed34332fa312b2731ad25210079d552efc02c582a64535d4eeff2c8e17cfda984f706c5efb581f0b22
@@ -25,23 +26,24 @@ EBUILD squid-3.1.16.ebuild 6633 SHA256 1cefbd112bb9dce241558ae87523ce3f9ee94435a
 EBUILD squid-3.1.18.ebuild 6684 SHA256 20fa8d1c19647244b85e6d1f4d7a78a970684f46e0714f82b5dc46c27c76f956 SHA512 36dc31b60c03912e24b7c621adbc0e77b492c58dd9300bbde27f1decb09c0fc6023f2d3a5d0f0f790e8f6368b45d9c091438aba6fb1e3422df18cb964b44f699 WHIRLPOOL 3551f0a9baa94cb6d3ded673b3caf2c11766d4c80572671b1eaeb852dd001f1483c0295aeed6a4b11566a30d7cdd00e9083077e5150ea3b68d28e2fba96fd289
 EBUILD squid-3.1.19.ebuild 6664 SHA256 d2883e0731b2bd5209a6a4c6a7d2aa6cf61e74854522570f3699ac01822d77ff SHA512 1fef889008957653726e502ab711ddd03016bcf8cf5ed69db2785bc412db6378bd0603a7428fee4a62f2513132430c3b4ff6e800d07c563b7eaff97a404eab42 WHIRLPOOL d5d6966d7d869ae560222ec7c44b33c0a5af98ef4dc3bb585d4a4431ef99d1b8e4e883023768cdf44985dc129dcecb22d294def99cbc3d3fdb988c13c56830d9
 EBUILD squid-3.1.20.ebuild 6641 SHA256 64c6674cee87de0055dd27cf48c345cfb3e5e5dfa05148079569b66db312f268 SHA512 942b5598a0c94e6db9cd5f1da17e697df3eddaf7d916139cee107f0ddaf75cd12dd23b2fab521402fa7ebda8c8f4ef4a98ffef0021d1e994256d054650c467b2 WHIRLPOOL d45da9d5e1e1631df21a389773bfb527fb9b14a055a87fa3af12b4af8d3120ad52174abda866a42e0e188365be3f2caa10cd846791fcebd126ab0656b9ea564c
+EBUILD squid-3.1.21.ebuild 6641 SHA256 494236982f99275d67fd1e1241bd1dc42dfd90d65b4888f09af09bc7d3553399 SHA512 d1838d8fac7799310219966ef0515d8b477dcf7ac611bffcb3cc68593cf33350f45bc725dd33f33b4d37834da06ea0dff1d8bd2304315e8b96b8768d0406dc43 WHIRLPOOL 1668506f0fac06c1e03ba1771a7ded3322c430be5dc000be06e950ae5b32dbd9ca722e18c3cfb40749d0109f0528081615b9ac784fd2eef68155f7f0d128a070
 EBUILD squid-3.2.1.ebuild 7633 SHA256 e9feee56fb5075f7418e07112cdfa6c8a2122817dfb6974566e61cdf6512dcb0 SHA512 3998b35a6f4b481dea00e2b994ada0f865b24ae9b1005220f0accafed1f42ec46b834e7a0dc18dbd5ccf5bde093eca892880ef82b5a8a0200434dd8bc5c6d5d9 WHIRLPOOL 4efb6d6025fe4d4e8a72a480e0955f6e5f96af0e1edfc82eacd804e752af2f5a02da62a6acf398be1b59783dc3f7a4a2a6cc3963c21b39a59766701667b6c6ec
-MISC ChangeLog 72822 SHA256 b5ec5afe1e70d1d7fbb7a485c874c9fbacccb1f2e9837499ceeea7f1a2c1164e SHA512 595be54b6881fce63773f61d742ce01ea90fb88efb293b8c5d5c9bd15be4ed7eb8f4b777204a8b8aeccdc46072126a7d2776391344417aad47eb767e356c135c WHIRLPOOL 0c0eb3cfbf9ddbd383a0d507fd50afc58cbad50d0a3c003a774755557f62d7eebbb8b55861669430cf86d683c8dca2cef960b267b6822cd8714b9a08a04e7a08
+MISC ChangeLog 72933 SHA256 5a05060a1a30e85c5952aacaa0515f8818ae1887dae665bc963b268ce6b1386b SHA512 b56cf656cd00da2960e5e094d06bfa7b283f6b87ce2ecfa4f74603abb1c115fea4d00fb6bd45867a60df1de6a461c71b01b45827a55600600befd94b39ff91dc WHIRLPOOL 96e1e0810dcf7edd878a6f7a0564aad21585523ba1cfb1d2b2b9747f2afd4afeffa143f6ea8e880c307b1a9bcefbe40c03aeafe760844cb99083bdbf1fb889be
 MISC metadata.xml 1335 SHA256 07a1e3761c3f3f2c3524057a7321fef17742203c3ede39066e89da593e4c6265 SHA512 1876ea4e243a6a95e748cd471823191713fa5dad5fc64343e35d7cf345e504e2ab56109b9b8a1f4c0740c03770026773c825abd5a9635eea74e35aa67bcf55d3 WHIRLPOOL c0b2399f9c8f78a28753d27520c4d64e3c8aa8894e66f12162e0197e85cd9a81949e5e5868b2461ddb1d757b52a97674105820fd6e84fa4946d410e00effd965
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQRPOXAAoJEHfx8XVYajsf7q4P/0UjCz8mgZT/Ll0BsKfnIXCf
-Byf72t0FPk3yK848PXCRqDul5sgU7eB4yz1HssbISGBjxMpE3o7lo9zRjydscPny
-RpwUJZXpU6PYZ76/OO+wKwoJUNIzcS8sGCxfx0mZ+VaCCuKCRwREt6qekTPyC7an
-0S1/7GkaMh0v/1svffrrxt8o4TZgZegg1dVL4Xi8MjiSs70A08bI9CwKevxiNjys
-m6yPPHSKkDbDEJk8XBH7E+Z3zls9ljETTUKwLZBxsZg8JkenrpJjo5E7VPCJlOzq
-D4dffPVT7EMKCQInq228QmcoXNwM1APdnQyohcOiOzg+9AN60U4YkwBA0Dg8D6rj
-TAW11SkdrkRl2Xi40aN7ApnjgVZdFz4jyBO8kRyYkaTrmBmoiOkwJWe4J9+RtMf9
-TZDdGEMjLYaQGkgUEK5K3axG468MZ9RiCrmv+Mve4dt3QHEBrAzq1TIJ6JlVlCU4
-l58buElDz48wsyt8xhtwD/qo4moj4t3LCYFuNjo9gOIk4NAkSYG9D5k31Pg1Wl2S
-MN3TPOIjYAOlVBVVwDI9JBSHkRW6NE9qT5rcVh8odgjDBbBE2JIpXshXu4NQuC3H
-3a6Sxn33QaqNO7I5LWisMQVOcYnupNP7lztV102KkTdKMbi96tM6u3N6car1xzHP
-joBbiOgx6efduOsxZjx6
-=DvYF
+iQIcBAEBCAAGBQJQYXc2AAoJEHfx8XVYajsftG8QAIzkYCkt0fIybHcwsnQ0RkHL
+iMUkjLIh0l0datE5XYgDH5E+yTYO52ieqp4hz0fBDF2RViqz//GV+ibydlrqKVG5
+pzzfw+HOgvNATcmU/NvKujhqRXQUw2aUDustTTFtyTFJJ6YsseC+yyiqP2eIJhBA
+iVq2UqUFfGWalUopk6vpLSpXs5b6GLuheWL4JJzFCcLgFFHYOi6uD/LyUgXQ2oit
+d+IprwnGDzuxR69iRkADEWoh1khmgjoPrEMdUQBVYSFIpNnhtOOY3K0/wx3N2z1V
+pl6OT1K0XJkZHCpdBgnx7ZP6jhxBHGEaNwouGS0xZcC69/ObfWBc+swCHvPhrN0G
+LanKqwTSlTPTyGWZFUcqCI8h/8f5Mr+uWt3brHS6GttJiEUSm5b8cWlq/lAQ8Rtq
+8LiikjftM+NIN/RM1R0ksRYnv0Vw3VTxtWfl5ipP3z0zyXEwhmdiKU7WJuST8VpK
+EGUDwGqLmEuZ6E7u06COb38BZ9EySfiGIVkceQ+HFNB+Kwg3qxntyrIpSgBa/aiC
+86S/cH+4etsaljwVxx+9NoDqKLQST17rUJY3ccekJ0DHRggedJuzai9mhZfLKaLC
+qqoGYkB2vy/XPYaDp+RDikPWw/7gVIR2E5YehvAh1m+ppE8yGySQXjZtlXPvhpD8
+PcFjli1i8sld+sU+DmOr
+=YIFz
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.1.21.ebuild b/net-proxy/squid/squid-3.1.21.ebuild
new file mode 100644
index 000000000000..6f1ba55916ed
--- /dev/null
+++ b/net-proxy/squid/squid-3.1.21.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.21.ebuild,v 1.1 2012/09/25 09:19:35 eras Exp $
+
+EAPI=4
+inherit eutils pam toolchain-funcs autotools linux-info user
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.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 \
+	mysql postgres sqlite \
+	zero-penalty-hit \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux +epoll tproxy"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:0 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl"
+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 )"
+
+REQUIRED_USE="tproxy? ( caps )"
+
+pkg_pretend() {
+	if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
+		eerror "coss store IO has been disabled by upstream due to stability issues!"
+		eerror "If you want to install this version, switch the store type to something else"
+		eerror "before attempting to install this version again."
+
+		die "/etc/squid/squid.conf: cache_dir uses a disabled store type"
+	fi
+
+	if use tproxy; then
+		echo
+		elog "Checking kernel configuration for full Tproxy4 support"
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+		echo
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.1.15-gentoo.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	local basic_modules="getpwnam,NCSA,MSNT"
+	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	use sasl && basic_modules="SASL,${basic_modules}"
+	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
+	use radius && basic_modules="squid_radius_auth,${basic_modules}"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules="DB,${basic_modules}"
+	fi
+
+	local digest_modules="password"
+	use ldap && digest_modules="ldap,${digest_modules}"
+
+	local ext_helpers="ip_user,session,unix_group"
+	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local ntlm_helpers="fakeauth"
+	use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
+
+	local negotiate_helpers=
+	if use kerberos; then
+		negotiate_helpers="squid_kerb_auth"
+		if has_version app-crypt/mit-krb5; then
+			myconf="--enable-mit=${EPREFIX}/usr --disable-heimdal"
+		elif has_version app-crypt/heimdal; then
+			myconf="--disable-mit --enable-heimdal=${EPREFIX}/usr"
+		fi
+	else
+		myconf="--disable-mit --disable-heimdal"
+	fi
+
+	# coss support has been disabled
+	# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
+	myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter \
+			$(use_enable tproxy linux-tproxy) \
+			$(use_enable epoll)"
+	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		myconf="${myconf} $(use_enable kqueue)"
+		if use pf-transparent; then
+			myconf="${myconf} --enable-pf-transparent"
+		elif use ipf-transparent; then
+			myconf="${myconf} --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/var/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-auth="basic,digest,negotiate,ntlm" \
+		--enable-removal-policies="lru,heap" \
+		--enable-digest-auth-helpers="${digest_modules}" \
+		--enable-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-ntlm-auth-helpers="${ntlm_helpers}" \
+		--enable-negotiate-auth-helpers="${negotiate_helpers}" \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-large-files \
+		--with-filedescriptors=8192 \
+		--disable-strict-error-checking \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		$(use_enable zero-penalty-hit zph-qos) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	fperms 4750 /usr/libexec/squid/ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/pam_auth
+		fperms 4750 /usr/libexec/squid/pam_auth
+	fi
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
+		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
+	newdoc helpers/basic_auth/SMB/README README.auth_smb
+	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
+	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
+	doman helpers/basic_auth/LDAP/*.8
+	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	rm -rf "${D}"/var
+	diropts -m0755 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid
+}
+
+pkg_postinst() {
+	echo
+	elog "Squid authentication helpers have been installed suid root."
+	elog "This allows shadow based authentication (see bug #52977 for more)."
+	echo
+	elog "Be careful what type of cache_dir you select!"
+	elog "   'diskd' is optimized for high levels of traffic, but it might seem slow"
+	elog "when there isn't sufficient traffic to keep squid reasonably busy."
+	elog "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
+}