Version bump - bug #439142

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

3 files changed, 258 insertions, 5 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e19f07764c85..52fc8ad9886c 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.355 2012/10/14 20:08:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.356 2012/10/23 06:55:06 eras Exp $
+
+*squid-3.2.3 (23 Oct 2012)
+
+  23 Oct 2012; Eray Aslan <eras@gentoo.org> +squid-3.2.3.ebuild:
+  Version bump - bug #439142
 
   14 Oct 2012; Markus Meier <maekke@gentoo.org> squid-3.2.2.ebuild:
   add ~arm, bug #432974
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index e2ca05c5efa1..56e0f3cb3b69 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -21,6 +21,7 @@ DIST squid-3.1.20.tar.gz 3489463 SHA256 a0d52fa5d04a5382d63627ff622cea23f5f39a8f
 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
 DIST squid-3.2.2.tar.gz 4102323 SHA256 36828bb92f5f7cb4343b5d4ceebb654c6a1a1479e75a3514fa1a509495987916 SHA512 abc4307317bf2f25b933200d89a6ed610dc42e1179be48065e4501be53650358136e28967687d52fee39ec192ca569ec8b1bd4b67cd0725736c0440cb557b7b4 WHIRLPOOL 65591204208be238a6e9e830d26831a7aed6599f67f792b06aff43493ef14e2fbe9aff98d16923b023d46bef74ebe3070bc92234a68f1c63841cf611291dd6eb
+DIST squid-3.2.3.tar.gz 4103625 SHA256 ef9ccdaa67c07a18277cb6b621d5f4103944f2d6cef9d5ea0affaae69d821700 SHA512 59ec2f64512b0f3e2c4ff9a940712baee929c6f36730860e299685cd88e05fbbf0f7edb3be1f1207994cd5717a0a473c1e545c1720b2afefe9404d33936f0d15 WHIRLPOOL 133af88e2cbc42798f3e72c1d77329b824b4bdc8e09b76e9df607486d0bc4ba60c4e7b24c5842fd00230785de88f6bf47838645ad49fa5e0220add347fea1d6a
 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
 EBUILD squid-3.1.16.ebuild 6633 SHA256 1cefbd112bb9dce241558ae87523ce3f9ee94435a1e8137bed6d65bac43fd439 SHA512 6e1296f9369f4f2e41fa24e5848ddfd2f00ecddacf4053538b269ecd0a18511467656bac55a6ee68ac651a1249b3051e4c1570ae6c6ad87001630ce3fe2b2dca WHIRLPOOL fd5b95801510cc605e76f1d0bb95f6cf345c3d4d8e3d19708d1ceee6f7fcfdbf4d2180994dcd22fd5139ea213d0697c4f2e408e981fe04577869c5c417ab146b
@@ -31,12 +32,23 @@ EBUILD squid-3.1.21.ebuild 6641 SHA256 494236982f99275d67fd1e1241bd1dc42dfd90d65
 EBUILD squid-3.2.1-r1.ebuild 7539 SHA256 c60b2a3c9e484d3fa7396149035f034ba75dd54881b9725cd7fec02036c2055f SHA512 5c7ae91e33719ce863f8d7ef105b6480c40e728ac86cc189493765e991da3319ae83da6172cb5684e6b0aa5e91c9da9a0ffe67ecad2797ed30026638788847b0 WHIRLPOOL 8c6ca3126d25ab3bfc8c7921fdd4fc4d040742f8114a8ed574e52d44bdb44ca3ed998b8ce0782e145c31c82a286aa394539c50220ff451b997d782aaed254864
 EBUILD squid-3.2.1.ebuild 7633 SHA256 e9feee56fb5075f7418e07112cdfa6c8a2122817dfb6974566e61cdf6512dcb0 SHA512 3998b35a6f4b481dea00e2b994ada0f865b24ae9b1005220f0accafed1f42ec46b834e7a0dc18dbd5ccf5bde093eca892880ef82b5a8a0200434dd8bc5c6d5d9 WHIRLPOOL 4efb6d6025fe4d4e8a72a480e0955f6e5f96af0e1edfc82eacd804e752af2f5a02da62a6acf398be1b59783dc3f7a4a2a6cc3963c21b39a59766701667b6c6ec
 EBUILD squid-3.2.2.ebuild 7543 SHA256 9f114785930aa4435c1ed13eeeebeecae588bc93236f229a2debf7a0c0cd2cef SHA512 6550e6326ad6f8775315489073d3f43c513744b2438b7f53a7d5f63f4906f00297467dcc52c2bfa3b2846f1ca9048d26ee5b5024d0a279be2310a7fe301a87c8 WHIRLPOOL a19028b19101480ce8ecd4f166da0925b73eac81d135dcc412ab08be5a57bbef407461aea21a68f3c8cbf5fed0f6b0bc00110aeae7874e2b4bfed94c466ad8cb
-MISC ChangeLog 73285 SHA256 05fef3bb9e0974368a1a47742f5ce38b737816f4d42d27081d2b0aa85ee05c78 SHA512 a6c23866a1b479ea0e685bfbc2886d199dc730f61d991790263012ee6a49ce86c3c3d71f41c833effa7a22f8f6673c979cd7a8ba3db5e0526f0b7f0e07914ec2 WHIRLPOOL 034094b0f2fac2582bc0d580a1e77a6086369c5170f8c42e07b9436682b17816ec8e7fed0dcb9c76376d7c0e1895c5fb98c5526a6ece5f160a60ca69fdacba38
+EBUILD squid-3.2.3.ebuild 7541 SHA256 129ea233e291a3e6b3e780a2513a64c875461f7727ce3a3f8647f15b8d4064e7 SHA512 8bef993b6f582aa4e995fe17bc8c098052089f28a478183fdfde56c258095c1dd80efe2fa1c32ec53d1fcb6414207d736a84c72435b01806ffb0be0af5ab6269 WHIRLPOOL e356e7c26b69c2368285b8debc15ba34066f0a16c7a307752fed8da5859743082852ce7a60d89f19424d7b8771f3ca2bddcfc3de92217e39ff7892f755fa61a9
+MISC ChangeLog 73406 SHA256 42035931ffc8e1868bf202430c5b4316f8d11a1afa02e40975b983641b1ef6cc SHA512 c3656db0d675586a6c7052445fc5db573053aeb3564f4ca5d8c3a71a91eeb40e4195266ad655080c5c7b6fed263c9db6caa5dedf1766f788c39a6250a6cf8563 WHIRLPOOL 12a933500d59e43d07eedc6a5cdabd432b0dde5019d9daf4e47ad4716df58a338a9edfc7b986b0b5044bae1048b2e080411ec6229b8c908b432db71fa6d63d93
 MISC metadata.xml 1335 SHA256 07a1e3761c3f3f2c3524057a7321fef17742203c3ede39066e89da593e4c6265 SHA512 1876ea4e243a6a95e748cd471823191713fa5dad5fc64343e35d7cf345e504e2ab56109b9b8a1f4c0740c03770026773c825abd5a9635eea74e35aa67bcf55d3 WHIRLPOOL c0b2399f9c8f78a28753d27520c4d64e3c8aa8894e66f12162e0197e85cd9a81949e5e5868b2461ddb1d757b52a97674105820fd6e84fa4946d410e00effd965
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB7HJ4ACgkQkKaRLQcq0GLisgCbBfwgDzIMpqdLkhf624hjZMcO
-iA0AnjpMGX5OTLGrsgQ7e0FNBPeXbQJO
-=dV7J
+iQIcBAEBCAAGBQJQhj9WAAoJEHfx8XVYajsf+cIP/3ECj1ljkufmKylzL4A2R77n
+pU9RHpiibvlq8q3rNWztrz+q6pUOWranQOb6DGgJohubn4SurmQmq7nlC5/w8qoS
+IcrnYZGlaII6F4D2hDhgt5YodsbX28nExJDdIbwf9U8Q+0gQ0eG2vKoZ6nDtyQQz
+jgoLhQvW1BLEnrPPfPjux6Z3xuIoqhr1rr7aqLnabJEoEFUxDXs6Njz5BWwGTLRQ
+wUwJ1q1oDyE+cZWxy5yPy+LPZbR8J8jfgx4ztePmX61n1D1o618sse3+qH+K9L4J
+oqrUf6j/GRsedRLxFYjqoDRuZu3Ph6C0se0+AoiDJ337sjroHeMaSZbzDTOIxdLZ
+mfPwgBtvw5CzEqSTZKY3vP1YweW/i7uUbJiWeCOYRP+Iov+/6vAqM7sghQUO5DZV
+W0dQunOZMiVrH9D342bdTnrPi6zUQ/mg74QqpMcIqDnssyfyuIif2QD+pJs8QeqP
+OPZi4Zn2zgq5U7U0anwuP2BUC4IKcrUyxfp3xDOtzD6nFOxkdXiAEFrdVU/gzgWl
+GSAEmvVR0khFvviAfRtEMs0JJjtVlwW0dqtBzO3dw/lNZp6YReVLfyiL//F3mezV
+35wkocvCiQ6LYYlAQ+VwC1+qc8nGBecsIFBDAFZtHV2VBQ1/8LfNwIyE29DY2Ks1
+v3Vry46uBH/plNhTY0SO
+=2Mzk
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.2.3.ebuild b/net-proxy/squid/squid-3.2.3.ebuild
new file mode 100644
index 000000000000..851c95d78eda
--- /dev/null
+++ b/net-proxy/squid/squid-3.2.3.ebuild
@@ -0,0 +1,236 @@
+# 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.2.3.ebuild,v 1.1 2012/10/23 06:55:06 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="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~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"
+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 )
+			qos? ( caps )"
+
+pkg_pretend() {
+	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.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
+	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=/var/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 \
+		--with-filedescriptors=8192 \
+		--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" 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
+
+	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
+}