Version bump

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

3 files changed, 277 insertions, 15 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 2b0efe690b78..c164cad314b1 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.485 2014/10/03 05:19:56 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.486 2014/10/03 05:21:27 eras Exp $
+
+*squid-3.4.8 (03 Oct 2014)
+
+  03 Oct 2014; Eray Aslan <eras@gentoo.org> +squid-3.4.8.ebuild:
+  Version bump
 
   03 Oct 2014; Eray Aslan <eras@gentoo.org> squid-3.3.13-r1.ebuild,
   squid-3.3.13.ebuild, squid-3.4.7-r1.ebuild:
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 5582e23cc31e..59679fa1d38a 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -11,25 +11,27 @@ AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320
 AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
 DIST squid-3.3.13.tar.xz 2187728 SHA256 55d5875709b93f447788526527496956c508832abd1f9c651346e461c9d63221 SHA512 be7ec0ff949f94a4521c6aba2cff87b495ca626c85df5a9650e587c5723f2e52de68e939d8dfed7e8279be7a987c13a773d4f94864308d98d2a67c462b3b2862 WHIRLPOOL faaa5626a97589e486650fa7ff0231487fae65cf7d2ae962f36c7857c97d481c1f82cfd3326bfd0b690543abc01e5581feeaaccd77a8c34ea762abd1ec401f36
 DIST squid-3.4.7.tar.xz 2158672 SHA256 cc40a3cccdcdfc11269ea969e658d99e3ef2202999b78aa01a647a6bc71759ee SHA512 494b5a63d738915038f24b33864998ad4573928f6277637a22c9cf8cd8bf4dc1d5a9501bcae8ac14c5816a0d25c795feca3080b23e74d1cd13bb0674f7114eba WHIRLPOOL e713e77433302c096a37623bb1ee9a69e3d804e98235e4d3151a3bae84b73d519f6784e59cb5b82398038b39f553846d172e39158ba2689054cea9c760c57ed2
+DIST squid-3.4.8.tar.xz 2159904 SHA256 9146017d0e4ad48fbc1d1b6c03d544227c8e7fc7720952b588b688e65beedc18 SHA512 bb965847469be73575ae26b8221b768aa36c9b4e43b0e0ce1722e4cc8c48b683402c06ef4abd655239bab497dfb07658977d32b0d005535ac3dc1aa03ec46689 WHIRLPOOL 505514fc9c286242d565e95778e13bf9647360760f3906bed403763d78759b69a15e587783dba5ecc7ab7ffa26479b904cc54123f5920ae7cf3e07a5800ebc68
 EBUILD squid-3.3.13-r1.ebuild 7928 SHA256 bbaa2f47238ce852119f94100627354b3d63e1f3ffb5c0ce2ec00f1af9129796 SHA512 43708f7dbd3e3e951642829faf1be52c01e6c4cdef0c0e977e615052cb93ab3789d9e9a2cbd164da63e61fdd3d8860796224bfb8032fe74cb6313382308c9f0a WHIRLPOOL ed193d7ce4552e4f29d1eaf7dabcd10d64593920d34f223f4d71dd5f89990ae4a285311b1a40e071cc2cef567cd83db275710c51e9f373e54e286e2b39a75eeb
 EBUILD squid-3.3.13.ebuild 7875 SHA256 371f2007d145202ccd268f71cd0f655ab433e279da319dd6eb56b32939705809 SHA512 c2a0da0dcac45a582f1c74b36acb84c4b588ec987e1a4d8d1dd0f837ec9a622bfbf0c612e2a40bd8e97789bceafc1a02f1e4f21f16e1a8323c114046eaec4d49 WHIRLPOOL 6f7a21cc8bd3ff439835cedac117aa4427288a3837d50d4a8731497214529c3269e8bfb1395fcf4df01b0015a62b65b67e6f56926b792c9f5b409b9394882f56
 EBUILD squid-3.4.7-r1.ebuild 8080 SHA256 0563278fe4d158eabaea7f0034f5b1c2cd8a2e0a4d0875126d367fa2f9f46403 SHA512 b4c5f253de251a8f25e3f511371b046d49174d621b631620464fccfa8482815d86c652352d3884578d4fa72420e88ae2ae3d0769e9f83fd09928a22613391916 WHIRLPOOL c902b5c69531077cdf8cdc92dc42b38664c28efcdfa0dc07c209f3b3c78c46e657fa3dfa6424be17c91faa9fa99ef1872ce1cd34fbca0e81bbc7d35dd4b442f2
-MISC ChangeLog 90127 SHA256 df159d271130946d83ed3e2c69caf48783e219fe23434a1088847f6992eb882f SHA512 172ffc73654f35ec52a37227b845bbf62276b9bbed3c1efaa4f24c107d1c2b7dee3a98c7dd8c0b95c96e442a3fc46b69098a7f2147a9b04d7b435af706003e22 WHIRLPOOL ab3b227c9296f949bdd4a66d1fb0fcaccec7b7b9a26f80609d84a8fdb8406fbd452903a65598fc759d224506d0f1263f6a1c8a1229404daf7292a914f7301290
+EBUILD squid-3.4.8.ebuild 8031 SHA256 45446abd4f82eccb3cbdf242dc7e2bd615b0da6ce43905f83527180211b98414 SHA512 4eff84f3e7f015e22476cc8df1d12ffbcdbfa4a69790bb530403239f64f4671bb2887865f93748826054ccd749969e7c7b535f24e980209e073b1f263e96c0f7 WHIRLPOOL 3e2a6bba7a7a5e63557ff5badc4df1d089cda66e3117b43d66f320aca4ec6bb9bd466e9a045a832072b5ddf8d7b9c1b0dcb9bcd1e96ec98968ee67c01b43c3c7
+MISC ChangeLog 90236 SHA256 3cc0b283d87c5cdc64604aae40b111ee31b3c100170dcafdc5c618e03c3bb586 SHA512 075d037f20260b9273cdea7e52f6e09c0622f11eb71b4b037d958e438728fc235da026dab0958cbb626928281ac0e9ef59a0b4fc8465dc80badd18e1b6139662 WHIRLPOOL 4abcd737ff0e04b12a626d14c77e840d1bd0bf3be405d9ca13f1be8dd5eb4e24acf615b4a598b0fbcc3eabd8f3f55369b3bdc0eb79376d2c6e6f7a527aa8caa5
 MISC metadata.xml 1570 SHA256 7a084172a69649c4565af822f331e3085911a506e422ffc68b8a0082ee07ec6e SHA512 74ee493ede7181e22dd1d6a2889ddf3b4443ab677d3801b0c50b7c728c303f813e0a53dfc0931efbade78b98185401b15079e80e8742358a2a080d5a21f7b7b4 WHIRLPOOL d8239bc47c931b8a0e10ec4f16d91845482c35a029bb1d50914874150ec71b5f1a61def07f566ae4f6b10468426e8426ea8a319c30e41f985f5faf82ab1e6942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJULjIGAAoJEHfx8XVYajsfTlIP/1/wjFm1IsaB9tNiJMHHusRB
-qKJAUgFEiYVyMRjfUPC2cAQFccrucSTVVkV2I4jwIf10w16IDlWQ1OJ8nGdMQ8io
-3M8XT5ZsN8QdPjpmEZNPBKF2KW7+ToRPaQ9rP4CwZoo5vg+VuspjbTrSNnH2X3EA
-kBOxgNki9SiWYp+ATKcHhDUlG3r+LI5cBUEN5ee3XzIRQ/5O6LVFFDqzK0t2HqTp
-xV7aK0Tjure51pIRpiraTbP+CDiXvr4NB9n0RyIp3QkukTNVy95ENe8DvYkYFqb5
-XePMfh6pBAs+WGeBVxysSEVVngX4pZDnttIyloh5qggpeGgdKf7paDYSHrBLrjHm
-lR69PQQRfqrCRIhLrujhf6gAVSSsfTZEuEFNmTMhU56kEwYAQfrvFj8H3ynxOt+p
-xhR7cneYNtXmtzhYT8IqwDT4UwrraipPqJudvID+jlvt+nUx3EslRI6EKJBw2CbW
-+/O+yM97u1fNKbFu5ont48EZqLKn6nhjEc0OGAjaDN9bzmHZ/tL+szCWVNGxbPI0
-0vBjZ/C2TQzuMsDpXr1/Wg0/0fVwHnEn+jy0imujERoEjQCThxgS5cHkPd4td07x
-c2VbTA2u/P72D4ZcIgp0ZYSLPH4vAAzdwCi1GFW413kPO8X5+pmbHHOQaOHB0oxN
-d+0O4z1TPymutzXm/6Xu
-=5hIu
+iQIcBAEBCAAGBQJULjJmAAoJEHfx8XVYajsfdLMQAIEO9T6ngO/x03wO0SgZmZpU
+axYwA4mlMW5DQaJpp298IOGC+0c9oa91bW1RfTjyHTR1kjhK2yWL4b+fpd9kTGag
+bEwWnl1d3g4MtIzFLusc14oTIk9v+1pL1SLOMBZS219VSvdXR+yy6B9AZEGfHoTw
+iYwxakoHBRPVCD96X1H/2llsVsk/FbU4uJZpQeN+MwPwzdNlpUFX5ipyYbxNrnav
+LVOuvUdgPLH4IvdLCTohQgcL5TYAPakV+vjwVQa1WMR21cF8OCaU0kHn1ASJRRV6
+/KLaQGhEaT9FWBPmQJ7aFbFPK89iEVMk6epBlArC/PxZmHyc2/t0cUmm51+1oHCc
+pDCCze/9csr7blGDyKp7/80mmeY/TSaJgiDq9ZAzUrC7xqMn9IXDZT3B/DgYrkOz
+4ygBBtrMxvLD5hAhalG55Y/f2VWd3G8Wd54uWcEvJCbFLeQFMvkQMhUkDXeV/DKB
+VJt8lYqdpBbeKSWNNx2nD4U+6o8TJOypSJr2XRdVxRpfYtDlgAdJmlJwmB6KxkLk
+Y+Ktjgilo3x8L6xL7/OCZgM8yuXNAA2a5iZGYN+viHzHQLkKE9t3WroZVXQaL2m+
+UwRaYYUWAbRxeESrLUk8MOHt4P9dYILxMgGySK0sxrUOn2C7UkgfJpO+4rUVxgWU
+IKSYbxjXDM3h/pTVbVQN
+=egIJ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.4.8.ebuild b/net-proxy/squid/squid-3.4.8.ebuild
new file mode 100644
index 000000000000..f0d45cf742b6
--- /dev/null
+++ b/net-proxy/squid/squid-3.4.8.ebuild
@@ -0,0 +1,255 @@
+# 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.4.8.ebuild,v 1.1 2014/10/03 05:21:27 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.4/${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 icap-client 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 )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:0.2 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	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}
+	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 )
+	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
+
+	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 myconf
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		myconf="--with-krb5-config=yes"
+	else
+		negotiate_modules="none"
+		myconf="--with-krb5-config=no"
+	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"
+
+	# uclibc does not have aio support - needed for coss (#61175)
+	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_enable ssl) \
+		$(use_with ssl nettle) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(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 4 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
+		echo
+	fi
+}