Version bump (#154249). Mark version 2.6.4-r2 stable on x86.

Package-Manager: portage-2.1.1-r1

5 files changed, 236 insertions, 14 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 3198ea750d93..bacb6871ddee 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.99 2006/10/16 18:48:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.100 2006/11/08 08:49:06 mrness Exp $
+
+*squid-2.6.5 (08 Nov 2006)
+
+  08 Nov 2006; Alin Nastac <mrness@gentoo.org> squid-2.6.4-r2.ebuild,
+  +squid-2.6.5.ebuild:
+  Version bump (#154249). Mark version 2.6.4-r2 stable on x86.
 
 *squid-2.6.4-r2 (16 Oct 2006)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 641bd70708fb..7b315e72cc72 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -37,6 +37,8 @@ DIST squid-2.6.STABLE3-patches-20061007.tar.gz 7371 RMD160 f50c838e64501aeff6409
 DIST squid-2.6.STABLE3.tar.gz 1599876 RMD160 7b13a91f0809b94c1dacc11a9fe9366fd4362395 SHA1 59e52b0be9697108b3a581270cf0695119ffa7df SHA256 293c9b8ea4c5fa19e8df92d86e9554081b66454bd97b0acdf0bbb289845614a6
 DIST squid-2.6.STABLE4-patches-20061016.tar.gz 7261 RMD160 99571e719c8cffa77552967fdb788aa712a6d59f SHA1 95549601405147d4a64905b17f63741c908df314 SHA256 9493ed808920b89d527c26309a0b94a17ea35ac0da2acf65cc91547cf9a151c6
 DIST squid-2.6.STABLE4.tar.gz 1627562 RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 SHA1 82dea18e047c8f1192dde55e51b4537863f44a2c SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0
+DIST squid-2.6.STABLE5-patches-20061108.tar.gz 7328 RMD160 dc9bb2a41a23b17ec2dce6cbc98d1bcd55e2e566 SHA1 f511d33cb1602417a6585a78f4341dcc85dbc902 SHA256 d85c50d0f2716f35b6a230fdb1cea624383a7522b4292f088e6e8bf9588295fb
+DIST squid-2.6.STABLE5.tar.gz 1622608 RMD160 4f3f248678c76b5a289b40cc0279333d40a81ae5 SHA1 9bf5879c166521f519bfe1a1244125a87085ea5f SHA256 e860d12d4147360e03ff6ab5c6b88d6af106332fdd2e85d060d39efbd8a88a36
 EBUILD squid-2.5.12-r1.ebuild 6753 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 SHA1 6341414a00f644e58786363965ae3363e2747e3c SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249
 MD5 d016ce3a38feda11279d8b2c1f6dba25 squid-2.5.12-r1.ebuild 6753
 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 squid-2.5.12-r1.ebuild 6753
@@ -57,14 +59,18 @@ EBUILD squid-2.6.3.ebuild 6315 RMD160 732df4d73f0e4c065915866164906c92f264f6ea S
 MD5 cb335bf8d7bf5b7d84a72230fae8b9a2 squid-2.6.3.ebuild 6315
 RMD160 732df4d73f0e4c065915866164906c92f264f6ea squid-2.6.3.ebuild 6315
 SHA256 055275722f83580fc87141f430a58fc01f899747fba4e8a2be671797134de25b squid-2.6.3.ebuild 6315
-EBUILD squid-2.6.4-r2.ebuild 6621 RMD160 f5aee531c86822de9b3408fcd663777b69a7b6cc SHA1 d9857abfd86712f955e6d6279ff9a55b55bf9f93 SHA256 0bd341d62038ffb597a782546cf7745eb187819d9d5c5f1a46f88f8e4fc4e50f
-MD5 2e9b90f249d8e2c0e8488173744d60ee squid-2.6.4-r2.ebuild 6621
-RMD160 f5aee531c86822de9b3408fcd663777b69a7b6cc squid-2.6.4-r2.ebuild 6621
-SHA256 0bd341d62038ffb597a782546cf7745eb187819d9d5c5f1a46f88f8e4fc4e50f squid-2.6.4-r2.ebuild 6621
-MISC ChangeLog 29494 RMD160 866c0d38e0e9d6aeaf4f1e0fee11c8d698fb74cd SHA1 06ee45c2fc9e6424bdba9ca89728920790519035 SHA256 9ef66f86c08a8837266e4dbf72039fde3f64c3b7296e242d606e685c346be237
-MD5 8116b44958d3b3e540715c713a6731a0 ChangeLog 29494
-RMD160 866c0d38e0e9d6aeaf4f1e0fee11c8d698fb74cd ChangeLog 29494
-SHA256 9ef66f86c08a8837266e4dbf72039fde3f64c3b7296e242d606e685c346be237 ChangeLog 29494
+EBUILD squid-2.6.4-r2.ebuild 6620 RMD160 44d9a388a7736921fce1d7d5c08fbcaf231ead6e SHA1 97dbe4fa34888268e66f867e16bdace6626e6d18 SHA256 8ffb88c85911ba185de51e17acea7a8eb33a1155b490b9d445e12207ac78ef99
+MD5 77c906c209134123fa67419765dc395f squid-2.6.4-r2.ebuild 6620
+RMD160 44d9a388a7736921fce1d7d5c08fbcaf231ead6e squid-2.6.4-r2.ebuild 6620
+SHA256 8ffb88c85911ba185de51e17acea7a8eb33a1155b490b9d445e12207ac78ef99 squid-2.6.4-r2.ebuild 6620
+EBUILD squid-2.6.5.ebuild 6618 RMD160 88774e71ef043935109b276dbb969eee96b4c452 SHA1 7182cac6e5ba2be1311c4fbc199c5a6697f39abb SHA256 8185a6f0dae1a8785df5cc205f7a6415152131ce5c54d5a03c162b6f9343e891
+MD5 d783c965a6f71b297753fcd205b7efcc squid-2.6.5.ebuild 6618
+RMD160 88774e71ef043935109b276dbb969eee96b4c452 squid-2.6.5.ebuild 6618
+SHA256 8185a6f0dae1a8785df5cc205f7a6415152131ce5c54d5a03c162b6f9343e891 squid-2.6.5.ebuild 6618
+MISC ChangeLog 29680 RMD160 5d5490f358fea8ccd7084372dc60d168deea7b02 SHA1 355b7496a8433e321eda9760f7ea22bcdc1873c7 SHA256 7f1c7e2a3599c4afeea2a9c341a9d1545caa8469ae4e402bfa3f8a01556aa31b
+MD5 a5be33c7fe87d76e5726e5af2dfdbdec ChangeLog 29680
+RMD160 5d5490f358fea8ccd7084372dc60d168deea7b02 ChangeLog 29680
+SHA256 7f1c7e2a3599c4afeea2a9c341a9d1545caa8469ae4e402bfa3f8a01556aa31b ChangeLog 29680
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -87,10 +93,13 @@ SHA256 6de8efdb0f77fcd3fda484e7eff2934837b702d0e442358f4b212243a3f0e4c7 files/di
 MD5 0cd0b76791bf2bdd9ac30fd20138393f files/digest-squid-2.6.4-r2 554
 RMD160 f249a74c2deb7fbf3138f8751562febad8016e95 files/digest-squid-2.6.4-r2 554
 SHA256 6194b86ac425ead2f71ea960ef4e4e4b060a69b7af7001166a3955eaebcc4bbe files/digest-squid-2.6.4-r2 554
+MD5 cf556b2b4afe6d8a8f02a43e0252746a files/digest-squid-2.6.5 554
+RMD160 77a49ad5979119860725a304f19b516bbb3e2aae files/digest-squid-2.6.5 554
+SHA256 c691f9d5c16ba2a14ce66add145963b4c3cdb58a5442e6365e7f74e20201a838 files/digest-squid-2.6.5 554
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFM9Qg3sf9c6kjmR8RAoL9AJ9si5T9RKn0WX5ac0yPx1Ga1BXOWACZAQh0
-ufLnqRFkW32HorI4E3+7daM=
-=35c8
+iD8DBQFFUZo23sf9c6kjmR8RAvh5AJ98aO0dirZQ+cdlJl/w2G6K3bAGjgCfVmr+
+tC1QhNqfB8QDaj2QmYtoquE=
+=FA+4
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.5 b/net-proxy/squid/files/digest-squid-2.6.5
new file mode 100644
index 000000000000..2f2b5b10b04b
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-2.6.5
@@ -0,0 +1,6 @@
+MD5 778372da42690ec03c44df5b5908c7be squid-2.6.STABLE5-patches-20061108.tar.gz 7328
+RMD160 dc9bb2a41a23b17ec2dce6cbc98d1bcd55e2e566 squid-2.6.STABLE5-patches-20061108.tar.gz 7328
+SHA256 d85c50d0f2716f35b6a230fdb1cea624383a7522b4292f088e6e8bf9588295fb squid-2.6.STABLE5-patches-20061108.tar.gz 7328
+MD5 f2ec9d9e376974b5af4c7bb94d6ee852 squid-2.6.STABLE5.tar.gz 1622608
+RMD160 4f3f248678c76b5a289b40cc0279333d40a81ae5 squid-2.6.STABLE5.tar.gz 1622608
+SHA256 e860d12d4147360e03ff6ab5c6b88d6af106332fdd2e85d060d39efbd8a88a36 squid-2.6.STABLE5.tar.gz 1622608
diff --git a/net-proxy/squid/squid-2.6.4-r2.ebuild b/net-proxy/squid/squid-2.6.4-r2.ebuild
index 654469a3ee82..068e6e07bb51 100644
--- a/net-proxy/squid/squid-2.6.4-r2.ebuild
+++ b/net-proxy/squid/squid-2.6.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r2.ebuild,v 1.1 2006/10/16 18:48:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.4-r2.ebuild,v 1.2 2006/11/08 08:49:06 mrness Exp $
 
 inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="pam ldap sasl nis ssl snmp selinux logrotate zero-penalty-hit \
 	pf-transparent ipf-transparent \
 	elibc_uclibc kernel_linux \
diff --git a/net-proxy/squid/squid-2.6.5.ebuild b/net-proxy/squid/squid-2.6.5.ebuild
new file mode 100644
index 000000000000..4c6da3da3038
--- /dev/null
+++ b/net-proxy/squid/squid-2.6.5.ebuild
@@ -0,0 +1,201 @@
+# 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.5.ebuild,v 1.1 2006/11/08 08:49:06 mrness Exp $
+
+inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
+
+#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="20061108"
+
+DESCRIPTION="A full-featured web proxy cache"
+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 zero-penalty-hit \
+	pf-transparent ipf-transparent \
+	elibc_uclibc kernel_linux \
+	underscores customlog 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 ) )
+	>=sys-libs/db-4"
+DEPEND="${RDEPEND} dev-lang/perl"
+
+S="${WORKDIR}/${S_PP}"
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+
+	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
+	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
+	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"
+		if kernel_is ge 2 6 ; then
+			myconf="${myconf} --enable-epoll"
+		fi
+	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-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*
+
+	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
+
+	#Remove this after all versions prior to 2.6.4 has been removed from the tree
+	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
+		rm "${ROOT}/etc/squid/errors"
+	fi
+}
+
+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
+	ewarn "/etc/squid/errors symlink has been removed from your system."
+	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
+	echo
+	ewarn "Squid can be configured to run in transparent mode like this:"
+	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
+}