Add current upstream patches (#139962)

(Portage version: 2.1-r1)
 (Signed Manifest commit)

3 files changed, 19 insertions, 216 deletions

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 83e0b03ee13d..ba4debdd4897 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -32,7 +32,7 @@ DIST squid-2.5.STABLE13-patches-20060325.tar.gz 23020 RMD160 504261a17070faea4ca
 DIST squid-2.5.STABLE13.tar.gz 1399833 RMD160 5b66a9ef004f3fcb1225cd0378431f7ee4d005b6 SHA1 af1e1c3d33cf87cacadb7916f41b972a7d6df55a SHA256 e8a5330a5f0e79394612ef57d2bf48658551787062055ffba94eb0bc67355b1a
 DIST squid-2.5.STABLE14-patches-20060619.tar.gz 23811 RMD160 a2779367052e0ac2a8ab085c78ad29de41b6f166 SHA1 fccc2097838c9ff3727a5eac1d92e9d8998ea4a9 SHA256 0688f218779317304195aa2f728f6599635d34528882b23eb8461ca4cfa55319
 DIST squid-2.5.STABLE14.tar.gz 1399962 RMD160 abe464ab115b3f9541d3890fd413044f526ab5f0 SHA1 e8cd21bc84e4cab219a00142eb597f6dcefe301b SHA256 3ddb16abfe51f5fcbab66d2ca6a6e25341ed470eb7eb1415111401b9e20ba5f2
-DIST squid-2.6.STABLE1-patches-20060710.tar.gz 4758 RMD160 244c68ded0ffc671c5bc33e309183444f175bd35 SHA1 9900948befb7a03457490a5c9ee9e6137cbc9396 SHA256 fa1cc3af134f58e0dbf8d09652e1a99f876def7299adf893871e4048874066d6
+DIST squid-2.6.STABLE1-patches-20060711.tar.gz 24063 RMD160 9cc2daf35f22fcf0dc2bf4109b39ac8032b78985 SHA1 570c4afc683a128021f9b1bb7bd96a1cd11bbd99 SHA256 edea461781c676b8c6a2ad5e181436594c64325ac8f76d9d870e77d4596801b6
 DIST squid-2.6.STABLE1.tar.gz 1579299 RMD160 6b1740a6db8117b12ba8b859d56a28669d29d10a SHA1 6ebfb890d2224a8686224cd8b82619229389029e SHA256 e52a4c8b35a0644f0b1285874e4b0c0905e6415140d134c30ed2a4717392692e
 EBUILD squid-2.5.12-r1.ebuild 6753 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 SHA1 6341414a00f644e58786363965ae3363e2747e3c SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249
 MD5 d016ce3a38feda11279d8b2c1f6dba25 squid-2.5.12-r1.ebuild 6753
@@ -50,18 +50,18 @@ EBUILD squid-2.5.14.ebuild 6527 RMD160 c2b1cf2ec3ccd50e72487b8af58b53bd8a326faa
 MD5 8dfa340028c58c6dac7f5201af768462 squid-2.5.14.ebuild 6527
 RMD160 c2b1cf2ec3ccd50e72487b8af58b53bd8a326faa squid-2.5.14.ebuild 6527
 SHA256 7350cb597937098f99635e9e93161fbe0ddfe07d39e0dcbb48a8f42c461cd125 squid-2.5.14.ebuild 6527
-EBUILD squid-2.6.1.ebuild 6259 RMD160 d81cf4ba83c40d5357b00fd925cbdf22219ecbb1 SHA1 2f05448927a1b072c7dd73eea281d3316931e8ac SHA256 5e0e2421ac89805148de1b013d319767be043e42bd0dd276d11d3c9681b6ce34
-MD5 1a763835141946c725ce7513799b7aa9 squid-2.6.1.ebuild 6259
-RMD160 d81cf4ba83c40d5357b00fd925cbdf22219ecbb1 squid-2.6.1.ebuild 6259
-SHA256 5e0e2421ac89805148de1b013d319767be043e42bd0dd276d11d3c9681b6ce34 squid-2.6.1.ebuild 6259
-MISC ChangeLog 27056 RMD160 e774a19d058937cd8c08b9e74957289075725536 SHA1 f42389320f5ef7673252fc1d400a83e8c8f195ae SHA256 7487953859fc5ef224d2dfcce0cf761074b1131cf8a106c222a5c24d0ec879d7
-MD5 dedb401b95d7cfb624e9b3524b4b84fb ChangeLog 27056
-RMD160 e774a19d058937cd8c08b9e74957289075725536 ChangeLog 27056
-SHA256 7487953859fc5ef224d2dfcce0cf761074b1131cf8a106c222a5c24d0ec879d7 ChangeLog 27056
-MISC metadata.xml 241 RMD160 f966fc130df3c4340939cfbc501781ec74c5ab02 SHA1 62e709c1d0237031ac3bdd8d663cbbbcfffaa8a2 SHA256 f00eeb2aa39f141db6914b1e6d6da77c278225c70276e3bd9fbb13ee34080b08
-MD5 cf398556bce540358644ce9a452abfba metadata.xml 241
-RMD160 f966fc130df3c4340939cfbc501781ec74c5ab02 metadata.xml 241
-SHA256 f00eeb2aa39f141db6914b1e6d6da77c278225c70276e3bd9fbb13ee34080b08 metadata.xml 241
+EBUILD squid-2.6.1-r1.ebuild 6253 RMD160 4fae7e2f64c96a9ec12ee26c859ac89834f3f030 SHA1 9f74b5a1fd68cebcd11e41d70b0c6c82ae483440 SHA256 751f173b887174fa8c714d6c364e9ec050e03f8c409c6d99deb4150a2717c41d
+MD5 51eec6b606a326ae9e5d465fd6e6bf50 squid-2.6.1-r1.ebuild 6253
+RMD160 4fae7e2f64c96a9ec12ee26c859ac89834f3f030 squid-2.6.1-r1.ebuild 6253
+SHA256 751f173b887174fa8c714d6c364e9ec050e03f8c409c6d99deb4150a2717c41d squid-2.6.1-r1.ebuild 6253
+MISC ChangeLog 27238 RMD160 bdf24c4ddaff7b4c98ffee603a5854b202232f7d SHA1 4690674c6e396e08caa0303c9a36afe979824433 SHA256 4fa410b8360d324cd469c2e48c21f83c4424a9ab2ec9341e0eab8b912d2ec217
+MD5 98e2f16fd3eaafa7cdc528b1c7eb25ad ChangeLog 27238
+RMD160 bdf24c4ddaff7b4c98ffee603a5854b202232f7d ChangeLog 27238
+SHA256 4fa410b8360d324cd469c2e48c21f83c4424a9ab2ec9341e0eab8b912d2ec217 ChangeLog 27238
+MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
+MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
+RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
+SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87 metadata.xml 229
 MD5 8d31bb67b8d482af9deb6b5ae8151e8b files/digest-squid-2.5.12 563
 RMD160 d4409fe33dfd3758d077145e4697d87615fead6e files/digest-squid-2.5.12 563
 SHA256 ff17e3a44f2032593a3bd496eeebcf8a2bda464b148676c708240ab180bc73c0 files/digest-squid-2.5.12 563
@@ -74,13 +74,13 @@ SHA256 34af136654198a96d6fdad147b0b0a49c6216f14baa08625373fca5b96ed5e95 files/di
 MD5 94e9eea9d8b6b6cad4263131af7c7887 files/digest-squid-2.5.14 563
 RMD160 5b862305d93ac58ec4907ee9dc7a98671d5e1077 files/digest-squid-2.5.14 563
 SHA256 1727923e9880a2d267ed0cc7cbc782c1617aa8b5a9161ad7c6dc255870f1c916 files/digest-squid-2.5.14 563
-MD5 0d5b90d095cbc696d7b316ee575ee754 files/digest-squid-2.6.1 554
-RMD160 cf198388ef9b83c77502e569f2ef7b230daa00bf files/digest-squid-2.6.1 554
-SHA256 4c3c8055e4d2c304c1b1a219b114a10584c0c75d50bb156aad6381fe99aefc09 files/digest-squid-2.6.1 554
+MD5 b6ed1b56b618678cf691d12f0d461f1a files/digest-squid-2.6.1-r1 557
+RMD160 744937035c3208d15abdc4cfe082432b547daf9f files/digest-squid-2.6.1-r1 557
+SHA256 8401caf0f6014b6f7ba8e4d83e22927b249992a9f62c174e0b6e6473f2dede55 files/digest-squid-2.6.1-r1 557
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsp1B3sf9c6kjmR8RAhmJAJ9x3nuRCAPPptLfBSKcUKCarhvHLwCglAkF
-3AuN4kp6pQdoNLcBInMmP6g=
-=x1uI
+iD8DBQFEs/Q23sf9c6kjmR8RAkLIAKCpHczdZpn2++Irmu8+icfBAsdxAACgqDCP
+b3jyI2TJEQd162kIkgejzL8=
+=EgXl
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.1 b/net-proxy/squid/files/digest-squid-2.6.1
deleted file mode 100644
index d85339be01e4..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0c91b6fb13c375d96965a4402bfbd3f1 squid-2.6.STABLE1-patches-20060710.tar.gz 4758
-RMD160 244c68ded0ffc671c5bc33e309183444f175bd35 squid-2.6.STABLE1-patches-20060710.tar.gz 4758
-SHA256 fa1cc3af134f58e0dbf8d09652e1a99f876def7299adf893871e4048874066d6 squid-2.6.STABLE1-patches-20060710.tar.gz 4758
-MD5 f1e7f7693c3d2ed329c31a7a855c83cb squid-2.6.STABLE1.tar.gz 1579299
-RMD160 6b1740a6db8117b12ba8b859d56a28669d29d10a squid-2.6.STABLE1.tar.gz 1579299
-SHA256 e52a4c8b35a0644f0b1285874e4b0c0905e6415140d134c30ed2a4717392692e squid-2.6.STABLE1.tar.gz 1579299
diff --git a/net-proxy/squid/squid-2.6.1.ebuild b/net-proxy/squid/squid-2.6.1.ebuild
deleted file mode 100644
index df8231f2d949..000000000000
--- a/net-proxy/squid/squid-2.6.1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.1.ebuild,v 1.1 2006/07/10 18:25:01 mrness Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools
-
-#lame archive versioning scheme..
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-PATCH_VERSION="20060710"
-
-DESCRIPTION="A caching web proxy, with advanced features"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp selinux logrotate \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux \
-	underscores customlog zero-penalty-hit follow-xff" #Dead flags; should be removed when <squid-2.6.1 versions are removed
-
-RDEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	ssl? ( >=dev-libs/openssl-0.9.7j )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-
-	use zero-penalty-hit && ewarn "zero-penalty-hit patch has been removed because the homepage has vanished."
-	use underscores && ewarn "underscores USE flag has no effect (the option is available through allow_underscore configuration directive)."
-	use customlog && ewarn "customlog USE flag has no effect (the correspondent patch has been included in the main version)."
-	use follow-xff && ewarn "follow-xff USE flag has no effect (the correspondent patch has been included in the main version)."
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd "${S}" || die "dir ${S} not found"
-
-	# Do bulk patching from squids bug fix list as well as our patches
-	EPATCH_SUFFIX="patch"
-	epatch "${WORKDIR}/patch"
-
-	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
-		helpers/basic_auth/*/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM"
-	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}"
-
-	local ext_helpers="ip_user,session,unix_group,wbinfo_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter --enable-epoll"
-	elif use kernel_freebsd || use kernel_openbsd || use kernel_netbsd ; then
-		myconf="${myconf} --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)
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="SMB,fakeauth" \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/lib/squid/ncsa_auth
-	fowners root:squid /usr/lib/squid/pam_auth
-	fperms 4750 /usr/lib/squid/ncsa_auth
-	fperms 4750 /usr/lib/squid/pam_auth
-
-	#some clean ups
-	rm -f "${D}"/usr/bin/Run*
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/share/squid/errors/English /etc/squid/errors
-
-	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_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root"
-	ewarn "This allows shadow based authentication, see bug #52977 for more"
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-}