Version bump

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

3 files changed, 265 insertions, 5 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 66fbf8886dc8..2dd564d2edf9 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.437 2013/10/20 20:23:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.438 2013/11/11 16:52:18 eras Exp $
+
+*squid-3.3.10 (11 Nov 2013)
+
+  11 Nov 2013; Eray Aslan <eras@gentoo.org> +squid-3.3.10.ebuild:
+  Version bump
 
   20 Oct 2013; Markus Meier <maekke@gentoo.org> squid-3.3.8.ebuild:
   arm stable, bug #486848
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index bd4cfb2cc257..8c25f37c4f91 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -15,18 +15,30 @@ AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
 DIST squid-3.1.23.tar.gz 3489539 SHA256 4633e59925480cc2ea8078e4d78b17dea59a67a71c054b8faa47ba2c1e204401 SHA512 620554273a54be76331dd559446f750dfe838c80e2427cdcfce89ebdb0b70124acc6015fb6f4f1c78d0ecd0e0aaf46ca2cec29e1415525ef72e14d18343a5e72 WHIRLPOOL cb678a25abf69d73f7f5b5774c00374d14c831b09af86678f065dd8001aedc9f4ba5fa8a8d8d8c301ab449e10d25a54d476810e2d5c77583ed604b6173f41bcd
 DIST squid-3.2.13.tar.gz 4115069 SHA256 b6686c12104b6874750d5341fd5b481ab8782111a6776c38460a2aa17247d1a9 SHA512 85adfc6fe73b59b11d86abeeb60dd45995c93fe2457d9f0b827364f519a381b2b843d6fd801bb3f8e2fce216d9e6dcf3c45ce7bcac87a4c1b78ad17fc3856eb8 WHIRLPOOL 33347b075a9a6ba783d5caad2f5b77e395b98bcd751b626c3d2a4ac16909d8637226821e1ee8c6ea336451274bde3d5fc4c8c8f14ec085d79e497a9378e2cbf8
+DIST squid-3.3.10.tar.gz 4229574 SHA256 3b53319e127cbe59b4e3e0c4fdb450bc147f68b832500a4044e59726dbcfa2e3 SHA512 20dfc3a1c16180f203185f868f77029388452b6708f606b74c7f120c7cc17cca1d6bf86a6229dcb50afe3a520978f8550ca270513d9a7180e96e5389e0f23fc6 WHIRLPOOL dda9f772a6c785931bce6dac5193d958c08b1b22dda95205d391feb239688cfbd575aaecf1117fa39db52b968e33df6f2742c39f8a3dca397e84b132fe12d383
 DIST squid-3.3.8.tar.gz 4201652 SHA256 70d12505f2d91a64c05792406e12f2e6bd3082976bb7b6b49c4d982479d8c7d0 SHA512 6a4c95cffc23af44c985d0e897f3f1c66dbe3c282836e7e3724065b132dc59c6c512fd3914893be6a934f2b1fb72ba9a12bc3a1f953624760153616d5818f55f WHIRLPOOL 61c6b5e52138104634dd2ea602f251f10f7925c0ccba1823037d7a064141372d7a064f73d77747e1789b8e875819ca5939384d6a1c266889d07b7e0ee47170df
 DIST squid-3.3.9.tar.gz 4226863 SHA256 0bbb10739bcd8d3ede982246990445ff9b84348b9c5a38021c5afbfd28d9b413 SHA512 26c91d20804bf35fe36f4efdb790ef7b589383e75e6e4656d5fee6b05dc1a48b7491b4ce4d3bc8acf7f4caab8c395a43eaa84f88cd41a1d2efad529504f2ddd4 WHIRLPOOL 2f4eeee0c8376fe0bb422deda81a33470b84e871385d34129b9801fb4a5111687694c7947a4b36cdbb0dd831d69f9be966cc36bc7d60a1f52b2025c3ccd8bbeb
 EBUILD squid-3.1.23.ebuild 6687 SHA256 a12452feaeadfe2501e168dce2552b244c31e96436a0278bd8b3b5fdde89f34a SHA512 754809af799a7ce243cacee7a7b38dc3e8b51920f1f90f54953529d7e51ef4ab046961bde57c82418bae09034c3f8d98d1405f18659b434338071844e245730e WHIRLPOOL a6f8f792332b0d1e1e366d93e7a87cd2371e5c97ac8b8bab3783a6b830c83e0aa19c6aa8db7da5300c02c6a64e3d07f53cd551fb849daa50f2e5cb5c5bbe5392
 EBUILD squid-3.2.13.ebuild 7764 SHA256 4ce9ebe60eabc55946bf888a379b6c557514085f81ede1d3c7384fd63543a43f SHA512 d3e26f09d0044fca92e4ce54bba4066b21b95bf83148b9670799cb6844ddf29130677ab50c225217ea3070d6e1c2f38756030ac5bc2e593da1bb5d9d2f14da40 WHIRLPOOL 5ea4a7657a5d46dfbf8c369c5a61cac83dca4d907e7f8d31a7e91ed9026c20a4abe8ecbe8b6e14bc8861ebe784e4aff00e4a84be288a71a7231acfc3313c346e
+EBUILD squid-3.3.10.ebuild 7842 SHA256 47f5fc2966042271b817fbc288f7477b98d13464d390c3cd0f5239e33ac6f848 SHA512 8b390afdbd16ca8f967c1fd1ada2d135ef23f26a62069a07667b95d6c0f73b47434dd4206a4de7dc9936e9b59c346f9342ef5c2f8ddf0dc7ae1fd7964e25022e WHIRLPOOL 03bbebaf11bba3a4642b679f5d6cc8845a5ad9630e5f73812aed65a8137a0d2506635a59161fc2c48144c5a28e907facbfce24eb5377acb30eba59c345684f10
 EBUILD squid-3.3.8.ebuild 7931 SHA256 c4be29de29b35f8df3baf5c7c9defec26907be126c6755a7bc32fdc81aadf4cc SHA512 04058d6961748c499d25026c0d99e4d0c45f83a3f2859376192bd6d1cba1227546646d1b290c2d7e1685a10b6ffb3e41f800e64e821bd121e30f846114cb9075 WHIRLPOOL 3b8a8be69c46f8e3638ad52a0246bf21cc045d20ed3a645dd253171fdf1cc1f3b705a6e34e241a926769d591eb0bbf08bd4d2e062fb2f681347d500fbbba2931
 EBUILD squid-3.3.9.ebuild 7841 SHA256 35049459d13d4af470b492718061460c73ad7707cae10e7823558d7000fcf91b SHA512 fdd03568c223b4c9eec4aabc9369b941aecbbe976e463cfd993c3867cd7f9b6bafae99dd1a5294940aa975956ce47b3a95b90c1065f067504c4e8124f9658a04 WHIRLPOOL 4cc164363a11bac592ed95dab2f6f25515575ffea5c7f0cf126926c5389390bea6c0072c94d508ed2df8bd8e0e9e283c5bda0ae2adc5b22e5ff012c02806c464
-MISC ChangeLog 83952 SHA256 fdbb7ebbf35c5e472a8a078ba4c7c2973467d05990b3a3eb369907ceb2a8e1aa SHA512 83ef6453b1b695aef49e02207a372cfbd7af06cb51b830ef48877a4281e6931f5de50ee0eae999bb8aa6ee7950b29161923bcfdb22401aae478fdc6b51275279 WHIRLPOOL 9452e542d8b5c575f8b12a735bb78aa07d1a1e43145937042f352e7b65b7a375c234002f1648b017c8da448a595a822b9b510087964ee493714369666cade993
+MISC ChangeLog 84061 SHA256 9bb9a3d0c835ae4879b0248eecf23d9748c6c130ef9477eb5bc816a3bd4c83b5 SHA512 cae4ba5d456a4dbbe9e982d6e586ed0e070b331be50141ff939d80390a3888d1e77cbf7af1c80981deb95b9d1100ab4d1d2f8cc5c43f45108d0a8d47874cde62 WHIRLPOOL 5a94ab40264feced0239947a936119ff680ab2e4c270b2b0e1230eed083c3e2647bb3f554a1d3223c219251f1187d99c0585df7c10052998d36be241ecf9591c
 MISC metadata.xml 1386 SHA256 f1c035d3bfd09b92b127a8281b5d225b261c7a01c87d99e53a002d6316251089 SHA512 603b0c1803b86bf777777107a908db14c138911f92695d7572d448ddc5679c87031151161e1138db046f878421019f7778ef8fcda7218fb7392789124b96e95c WHIRLPOOL adf20b19ab0faf2c4219a16470db04ccb6f06cbbaf1a0b19631f2e01ade5374d9316b7015334b4d5722fb39b8328db61308888f4ad1a99983bf9dc0061f442d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJkPTEACgkQkKaRLQcq0GJMfwCgjJQJxj6hYd7bCKSEiCDPd7pZ
-2SIAoK9F8V4lyZ90baJey6nwgxtQMAA2
-=1h5u
+iQIcBAEBCAAGBQJSgQtPAAoJEHfx8XVYajsfjMgP/i+5nM6eedtGnJ0TYqOkeMzZ
+Sr+csQze02heqS7c8eApuHfmRIdD38oXkSht/+nHwiGrrVJtY0tkSVoNrRd26VQa
+rwImpxFPNafka/jHsFljUmH1S/a/wd+JWk3fzQ2QpkrpWmdIMV1q4SlM7eQQbA6F
+R2fKOqUMgE4xvCpKtbQrHlACQM/ccr8Styaf7JU7XziH6R+8LST+vGBaGiGIJmZ6
+K73tGQpIlB4YMbs6kGEH+bXpimtF/uOR3BeFcrj4qfKn1rJhdot4I5IINyhh7pJc
+XhkEqijiuLJCefdIEbbsHXzD9mzeQqb2Vu6lEXpr1tg+Up2M+FrtWQYMbxdpp6iU
+utr86ZX+RsuTHApvJTTg4kM9namDdC1/fV1NgTda3WCppf8glDYSmP5e0mtLTr60
+BLCXNgykv2Vmcp6cBolYLJmyMxdG6uun6O+8OFp9F3a6/ygIq2qtF7CcrGk+11Z9
+E83DoLY1yQvtPX3gYy1mwnOyMnWl6tAXS7DAf1A3fJz+1Xo15FEoqv6Twd/1mcqU
+GSVBcOn8IzadR31TsCTrwF2gvjU8a64VK5CwvXlyFpVr4fa2RZipG7unAwG9baQD
+cb92fdmbMytyT22ehcl6ROl4C//cVDTUrH9yKB8EStDs+icnZCJ+cyCYBCRq0Gn8
+m3Zw6Mr0pZlv+kEXD0Ru
+=MT3b
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.3.10.ebuild b/net-proxy/squid/squid-3.3.10.ebuild
new file mode 100644
index 000000000000..84ce7e8ac63d
--- /dev/null
+++ b/net-proxy/squid/squid-3.3.10.ebuild
@@ -0,0 +1,243 @@
+# 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.10.ebuild,v 1.1 2013/11/11 16:52:18 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.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:0.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 )
+	!<=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:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		lib/libTrie/configure.ac || die
+	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
+
+	# 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"
+	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
+
+	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 \
+		--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
+}