Version bump

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

3 files changed, 261 insertions, 15 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index f50484b95671..990790edd82c 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # 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.374 2013/02/09 21:38:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.375 2013/02/13 16:40:17 eras Exp $
+
+*squid-3.3.1 (13 Feb 2013)
+
+  13 Feb 2013; Eray Aslan <eras@gentoo.org> +squid-3.3.1.ebuild:
+  Version bump
 
 *squid-3.2.7 (09 Feb 2013)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f6a073aa6cb9..c46379ee4a84 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -19,27 +19,29 @@ DIST squid-3.1.23.tar.gz 3489539 SHA256 4633e59925480cc2ea8078e4d78b17dea59a67a7
 DIST squid-3.2.5.tar.gz 4107649 SHA256 331a507fec11c89b5ccfabaf9eedd6c208eaa0a64b0aba4c2477f68443b35b69 SHA512 0107b38d49423f354d2bea7cedd3f8114d56ac72175a1235d72b58f9b1735c0acfad76fae131cdb8b912e407e761d445ba8b8ddea088387baed470913c13ccc2 WHIRLPOOL c45202e9b9342f74f864c362b8af7dc2cd720ec8eacd424ef8e7e48ebdc32ebe6b30b6534c277256bc86cd51e073f824bf8395290f05b2451aafb307c1cf2147
 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.3.1.tar.gz 4189100 SHA256 827608aead0aadc8f1f052347dd404fa0582a47a06a7df1f122bab08131962ed SHA512 4f34a99fea2847dd511f7bda8fc2ac3d92a7643f14f323871d4a6f4b8f08d404cd8afd64311cf46e04af95fb3f773c25f0488bf8b19d34598d32e473726c7104 WHIRLPOOL c1227543e58af890ae2aa70f60eea18f598d66bc6633f57208ec1371247aea65c5f93852b12f0e10205ec1582395e87737f079566c4d05673033fb9fd8c55bfc
 EBUILD squid-3.1.22.ebuild 6638 SHA256 c0a1e6cc8939550d85f44c56f70cb3ff0bf74797a8bb3111441ab275f28e0ff9 SHA512 312f1ad13015ffdbdfbc6062806585b001215bb7905d233d0ae0146f2289750b0585ea13b7331b96082c3cb1e6b67833ed5ad899192c87c16e88cd9351bc5fb4 WHIRLPOOL dc5ad35e6bedd6fe147f0e2857739762a3d0ab578a43556ab04ee05c9fcdaa8b92c2e86e10975e33123ef8ec1e49472a1ca38853106bfe4e9b52fdaffd0e1895
 EBUILD squid-3.1.23.ebuild 6666 SHA256 60befed3dad86ee936abb17d4edce3f31497588e8d4055702c7d0922bb0afed4 SHA512 d5cb02a6b702057b3b0f1ce37cbc3609b8bc11947b957784b56770755eb4c01e732edf25cb18f493ee8ede8a611826d2daa44eb3695f8de66b730d2db4b53fe1 WHIRLPOOL 415dc2c4c04623ef4672403c6add2c3fc0101c83efd41fea44d2680654b6cdfa5e8b26b3fef67d1e62a6cfbc1b22c64b08e5622a2fec3a3bf73f946eef58e2fa
 EBUILD squid-3.2.5.ebuild 7561 SHA256 677e9d155456005e2c9ce45f916201a65a65e9ae4e3909949e118c178521c1b6 SHA512 88f01b615b90712d8d344ca8c603f1ebd7a2d434f62165e96339f4b138cc6426f0acd1002a1d082d74b572f051afd52a8d037e790a7a1bdf906491f201b42af3 WHIRLPOOL 68e0772473f2e4c101aafd238bc48cfdaa517b410be2f6a5fd37f0e517d2f1f67d397a8da20531f4a7b79bde65d66178098d78a8a9a374e02fd035841d3d8a8b
 EBUILD squid-3.2.6.ebuild 7551 SHA256 1aa220960b7bd18b9c10407430c87eae10bae54c693744f6dcc0b3fa1bbfabf8 SHA512 9efac1ddab610a9bb4b134212f3ca07009debf58b32da29a884372bcb53221fcafa2e8e85403d0434022e2a3f315f6a40d74d0be2561af94302203ed6384d15c WHIRLPOOL a721f67dcc77630056bb92ec654a6878b807af33e4039d3718f9f47a18eea9ac47f6495c3ef4b73ff1eaa0f1d4af225e6e48660436b7d9a103462121471f3fec
 EBUILD squid-3.2.7.ebuild 7637 SHA256 e6c01c5d39e32efa1dce48f2622a5ae545f631b2020add187e842763fc3193a8 SHA512 9e264bbaa62d1ccbf49daf208f69a74acf80f976e26399603d16c7da7d251c3cd76efe5763be8c4b200b4e812aec15cdd49e0f0ab62e7b172cdcca7d85e1210f WHIRLPOOL 2ba514669b7f60f12c4ccebc03aec27dbd7abf84afcf68754afdd1c662085d491ee4bf5f094e451d1d5bd406504f6d9d1756ab0f96aa7ab210fccaa3ccf73805
-MISC ChangeLog 76160 SHA256 1bf0d6683058def4d288e9282d1e2d85d288062338e9be8fc32ee869aa583614 SHA512 e95f118a6c394acb3dcbd1cc94f53b2c37e6b44b905e8a253f23e5e75b7dfa1770da821111514a3a4d021d59a37b1c9886c92f7c75aac747672e20b9ac2fb457 WHIRLPOOL a6b3300cb0f72f3e12d0520526ffc78735f0e3757ad2d32ca47e79b25c28839902b3f98ce71340c05f9995e8914979329123046368cfd294da174e85c5306865
+EBUILD squid-3.3.1.ebuild 7637 SHA256 64a81181ba6d0be134702f6d370f31e45e6bd54025770520a5ba04909107f4f3 SHA512 5ecce82fa1f93261175aaef9428d61e2af58804b2c20d9eb7495f99ef8df3fdba55a533db9608cb5430a2852fc83e4830d5be11c7c5e6085b760c97b96e35b0b WHIRLPOOL bebb99e18dc8e6807927b600347d38a234de35b3237b57dea3e663ba9ffa1a9b347f17d45e664a7660dc5a8dca38239ad4803a3113806ecc42479108b65e4bf8
+MISC ChangeLog 76269 SHA256 392100280ceea227c58f882f8b558fb52927e5ef00e82f2e4255408f14b0c192 SHA512 6962deed0d02aaf49f3cb47459765d7614635a8dd98d9d820d86eef10f65a867d57c3dade224035532604cb30d56344243b653c074510bd7eca4b59ac49c03de WHIRLPOOL 80783109c32630ce0ea6a3e66734434f0c1a3f237d6f55b4154952ca403d8025e3b37177a797f4eda70478782642280bac524a5174a8bb889e847605b48757e9
 MISC metadata.xml 1335 SHA256 07a1e3761c3f3f2c3524057a7321fef17742203c3ede39066e89da593e4c6265 SHA512 1876ea4e243a6a95e748cd471823191713fa5dad5fc64343e35d7cf345e504e2ab56109b9b8a1f4c0740c03770026773c825abd5a9635eea74e35aa67bcf55d3 WHIRLPOOL c0b2399f9c8f78a28753d27520c4d64e3c8aa8894e66f12162e0197e85cd9a81949e5e5868b2461ddb1d757b52a97674105820fd6e84fa4946d410e00effd965
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFsHgAAoJEHfx8XVYajsf+pEP/39f6gaMe6JX9bYBu0Ay/Dor
-JjcThnbKtFAuCpUqJcw2D7kCFowV0lvvJb3msyzOmn64Gr4VHcVlLBS9TpAkIp9F
-+LnsP9kitKwfgV3NA7BkDX+etxIAcldS/h8Qv+QRJY+CoHzjyeXiQlY+h/ldtAQg
-URAn7Urb7XEFOH2HX1ItgT2NfMBSRr3Lc+ZmxC3HPBs/Bfpn/Ocgnb6XtDfYysSw
-XIPD+zwHUhBlpdvWGfE00AX03WT5B5HLxIlqMf/VuzWcVEOlkR+7rgwDsDDjuRmX
-F5cKPpsun4Sa+cRN7B5Fz/CPPF1zXN5AuAy1RWWtiOLG9Mi6pxOmeQpEC3+FGdKQ
-xU74bAXER+WS+WQxs02Jdf2pw/JXdp3O8HaZVYVPI1h6orNt6xL1arSMPYgUAyMJ
-LjsCpRWCRlaYyX+m0E1Yg8ffD2SviCh4QgZZJbi87XSrg6DDKJEzpiufFbhmWsDT
-BITZZpM8BWJd1Kmls3rZEXwHRYTMDuxX21eak1DyhbO3LZORU0fWxk156kA49pPw
-q/zvHjjy2gT22dWyCfErXDSzfocMDw4g0bE6lmvA1k1in/akYOMaANkZhnYBiJX4
-RAI4DVQyNXPYP5IwDThQ8LCLbFIqTSRn+TiDLOxy19NTqVGotKewk7F5VkT+1Ibz
-/IQg2mVsgQfnPBUanEv9
-=nPRl
+iQIcBAEBCAAGBQJRG8HyAAoJEHfx8XVYajsfGGsP/j1W3w6T1Z/pjxu+SHiV+Now
+yXInGNRNus52GUI1BiAqHKBhVUv6/+I5H5HEkzxlEdvriU/q01JgKbiJwQsaJ6Vd
+6uMaK3K1DMkxPuKgittBImdPpHoTUKz9tQ58Dx+/4IxAuqZLplWYOJt3L+6E0KAS
+E2g6VRMm31cFBiYnXRP27TjPUBJIJWw5rg0ZPFJUsL2m/Ww9qwuOiMfsOe9hK0gX
+j5KT6ZLvh11lUmK/52l5hahGLZfunulTYUGEmWrZ7GlADUHh3QGpRXPcktG7QBex
+6lLWTmkMHf3ud+S/GZqknaTX3BIJF6cdMJH2hyXvr3fz/hnB62sKWPTPo3lkeGNJ
+LPMrPV9sqqk19Rg3E2lEyun1Evf4hCJpw+DtL9mCMYH0bu4SPZ/PehaFp9v/72Bw
+s9blFzvNCtDX7xSG2JQfylIGDXGDZwbtPEFwnu+xxIZG+cYZdpMq6c8tlEyYGMau
+d/d07dul4BA1Vs9/Dngf+FoakYZengVFoJLNNiHd79l1BpM//COwBXdhJ9J9vNlf
+PgLaXEV/QuDU5ZaC+Yjfaf+176Raj8/UttZyHgEsRXSlDurbE7DBChuaENDMm5ot
+wEwgp79Auj+x9s479HComHSO5hv7wa4m/PN7gKzT2agqC7O5bkvcSWWcyTxXmeU6
+HzunrWAM0XsqhXjSYAKX
+=ksJa
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.3.1.ebuild b/net-proxy/squid/squid-3.3.1.ebuild
new file mode 100644
index 000000000000..525ae2d3af24
--- /dev/null
+++ b/net-proxy/squid/squid-3.3.1.ebuild
@@ -0,0 +1,239 @@
+# 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.1.ebuild,v 1.1 2013/02/13 16:40:17 eras Exp $
+
+EAPI=5
+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.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 )"
+
+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
+	# /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
+}