STABLE6 and STABLE7 patches, see bug #57081

6 files changed, 208 insertions, 8 deletions

diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 64cd2de4891c..3d440869f332 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-proxy/squid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.14 2004/10/17 02:26:27 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.15 2004/10/17 03:19:29 cyfred Exp $
+
+*squid-2.5.6-r3 (17 Oct 2004)
+
+  17 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; +squid-2.5.6-r3.ebuild,
+  squid-2.5.7.ebuild:
+  More patches for 2.5.STABLE6 and started the patchset for STABLE7, see bug
+  #57081
 
 *squid-2.5.7 (17 Oct 2004)
 
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index 91f66c580e45..3cc793e98655 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,13 +1,15 @@
 MD5 81a38c1c8b9bde45861c616a3d06621a squid-2.5.5-r3.ebuild 5383
 MD5 30ae77f62cc477f3e340346ba5040170 squid-2.5.6-r2.ebuild 5767
 MD5 e4a8135ed447b72a7271fade6c06e9cc squid-2.4.7.ebuild 4000
-MD5 dc26f977898ed9ef47b03105ee8dc567 ChangeLog 10781
+MD5 1fe0ecf84a257f5c0ed71db31f5b445c squid-2.5.6-r3.ebuild 5800
+MD5 1e5b993a392132644f9e5c69a254ea04 ChangeLog 10995
 MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
-MD5 551b45650f9240928a8ad5ea4542f008 squid-2.5.7.ebuild 5767
+MD5 5815ce97e5959b37402a2a67ef75f975 squid-2.5.7.ebuild 5797
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
 MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
 MD5 45bf3c4b37515fe4da4ed6d39904132d files/digest-squid-2.5.5-r3 147
 MD5 3f83edef485d5ba24d3819daee026aeb files/digest-squid-2.5.6-r2 156
+MD5 c3cb57db464a884a63d0c53ceb38331b files/digest-squid-2.5.6-r3 156
 MD5 6e37fe3047234060fc63d5c16a4b7853 files/squid.confd 437
 MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41
 MD5 469070d468395f998ae41ff8a788d2eb files/squid-2.5.7-gentoo.diff 11242
@@ -18,4 +20,4 @@ MD5 bea1d2ef8cb2f1590f89bf37f28b9268 files/squid.pam 505
 MD5 1b391c390c547ef3a249aee590e654d8 files/squid.rc6 1980
 MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
 MD5 4995c4c8c3365f121620ea78d6ca8794 files/digest-squid-2.4.7 222
-MD5 c2438c7f5202f2247361c752ba322806 files/digest-squid-2.5.7 71
+MD5 a8a6dbf036a288e569daa56bdf5ae774 files/digest-squid-2.5.7 154
diff --git a/www-proxy/squid/files/digest-squid-2.5.6-r3 b/www-proxy/squid/files/digest-squid-2.5.6-r3
new file mode 100644
index 000000000000..d6e20aa37fda
--- /dev/null
+++ b/www-proxy/squid/files/digest-squid-2.5.6-r3
@@ -0,0 +1,2 @@
+MD5 7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 1047199
+MD5 528e905f676b99b84af342c2e2ad4d2a squid-2.5.STABLE6-patches-20041017.tar.gz 38575
diff --git a/www-proxy/squid/files/digest-squid-2.5.7 b/www-proxy/squid/files/digest-squid-2.5.7
index 35271b33ca53..5c061ff92a8a 100644
--- a/www-proxy/squid/files/digest-squid-2.5.7
+++ b/www-proxy/squid/files/digest-squid-2.5.7
@@ -1 +1,2 @@
 MD5 bf63e34906c68d716896eec0351108dc squid-2.5.STABLE7.tar.bz2 1051830
+MD5 94348d39ace114ed4cd45757ae6d5a90 squid-2.5.STABLE7-patches-20041017.tar.gz 524
diff --git a/www-proxy/squid/squid-2.5.6-r3.ebuild b/www-proxy/squid/squid-2.5.6-r3.ebuild
new file mode 100644
index 000000000000..ab64f4b51af5
--- /dev/null
+++ b/www-proxy/squid/squid-2.5.6-r3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.6-r3.ebuild,v 1.1 2004/10/17 03:19:29 cyfred Exp $
+
+inherit eutils
+
+IUSE="pam ldap ssl sasl snmp debug uclibc selinux"
+
+#lame archive versioning scheme..
+S_PV=${PV%.*}
+S_PL=${PV##*.}
+S_PP=${PN}-${S_PV}.STABLE${S_PL}
+PATCH_VERSION="20041017"
+
+DESCRIPTION="A caching web proxy, with advanced features"
+HOMEPAGE="http://www.squid-cache.org/"
+
+S=${WORKDIR}/${S_PP}
+SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2
+	http://dev.gentoo.org/~cyfred/distfiles/squid-2.5.STABLE6-patches-${PATCH_VERSION}.tar.gz"
+
+RDEPEND="virtual/libc
+	pam? ( >=sys-libs/pam-0.75 )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6m )
+	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
+	selinux? ( sec-policy/selinux-squid )"
+DEPEND="${RDEPEND} dev-lang/perl"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 alpha ppc sparc hppa ppc64"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	#do NOT just remove this patch.  yes, it's here for a reason.
+	#woodchip@gentoo.org (07 Nov 2002)
+	patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die
+
+	# Do bulk patching from squids bug fix list for stable 6 see #57081
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
+
+	#hmm #10865
+	cd helpers/external_acl/ldap_group
+	cp Makefile.in Makefile.in.orig
+	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
+		Makefile.in.orig > Makefile.in
+
+	if ! use debug
+	then
+		cd ${S}
+		mv configure.in configure.in.orig
+		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
+		export WANT_AUTOCONF=2.1
+		autoconf || die
+	fi
+}
+
+src_compile() {
+	# Support for uclibc #61175
+	if use uclibc; then
+		local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	else
+		local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	fi
+
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	use sasl && basic_modules="SASL,${basic_modules}"
+	# SASL 1 / 2 Supported Natively
+
+	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local myconf=""
+	use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
+	use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
+
+	use amd64 && myconf="${myconf} --disable-internal-dns "
+
+	if use underscores; then
+		ewarn "Enabling underscores in domain names will result in dns resolution"
+		ewarn "failure if your local DNS client (probably bind) is not compatible."
+		myconf="${myconf} --enable-underscores"
+	fi
+
+	# Support for uclibc #61175
+	if use 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
+
+	./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 \
+		\
+		--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,no_check,winbind" \
+		--enable-linux-netfilter \
+		--enable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-truncate \
+		--enable-arp-acl \
+		--with-pthreads \
+		--enable-htcp \
+		--enable-carp \
+		--enable-poll \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+		#--enable-icmp
+
+	mv include/autoconf.h include/autoconf.h.orig
+	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
+		include/autoconf.h.orig > include/autoconf.h
+
+#	if [ "${ARCH}" = "hppa" ]
+#	then
+#		mv include/autoconf.h include/autoconf.h.orig
+#		sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \
+#			include/autoconf.h.orig > include/autoconf.h
+#	fi
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	#--enable-icmp
+	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
+	#chown root:squid ${D}/usr/lib/squid/pinger
+	#chmod 4750 ${D}/usr/lib/squid/pinger
+
+	#need suid root for looking into /etc/shadow
+	chown root:squid ${D}/usr/lib/squid/ncsa_auth
+	chown root:squid ${D}/usr/lib/squid/pam_auth
+	chmod 4750 ${D}/usr/lib/squid/ncsa_auth
+	chmod 4750 ${D}/usr/lib/squid/pam_auth
+
+	#some clean ups
+	rm -rf ${D}/var
+	mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
+
+	#simply switch this symlink to choose the desired language..
+	dosym /usr/lib/squid/errors/English /etc/squid/errors
+
+	dodoc CONTRIBUTORS COPYING COPYRIGHT 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*
+
+	insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
+	exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
+	insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
+	exeinto /etc/cron.weekly ; newexe ${FILESDIR}/squid-r1.cron squid.cron
+}
+
+pkg_postinst() {
+	# empty dirs..
+	install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
+	install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
+
+	echo
+	ewarn "Squid authentication helpers have been installed suid root"
+	ewarn "This allows shadow based authentication, see bug #52977 for more"
+	echo
+}
diff --git a/www-proxy/squid/squid-2.5.7.ebuild b/www-proxy/squid/squid-2.5.7.ebuild
index 898f050298ba..13218ff97e48 100644
--- a/www-proxy/squid/squid-2.5.7.ebuild
+++ b/www-proxy/squid/squid-2.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.7.ebuild,v 1.1 2004/10/17 02:26:27 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.7.ebuild,v 1.2 2004/10/17 03:19:29 cyfred Exp $
 
 inherit eutils
 
@@ -10,13 +10,14 @@ IUSE="pam ldap ssl sasl snmp debug uclibc selinux"
 S_PV=${PV%.*}
 S_PL=${PV##*.}
 S_PP=${PN}-${S_PV}.STABLE${S_PL}
+PATCH_VERSION="20041017"
 
 DESCRIPTION="A caching web proxy, with advanced features"
 HOMEPAGE="http://www.squid-cache.org/"
 
 S=${WORKDIR}/${S_PP}
-SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
-#	http://dev.gentoo.org/~cyfred/distfiles/squid-2.5.STABLE6-patches-20040823.tar.gz"
+SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2
+	http://dev.gentoo.org/~cyfred/distfiles/squid-2.5.STABLE7-patches-${PATCH_VERSION}.tar.gz"
 
 RDEPEND="virtual/libc
 	pam? ( >=sys-libs/pam-0.75 )
@@ -38,7 +39,7 @@ src_unpack() {
 	patch -p1 <${FILESDIR}/squid-2.5.7-gentoo.diff || die
 
 	# Do bulk patching from squids bug fix list for stable 6 see #57081
-	#EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
 
 	#hmm #10865
 	cd helpers/external_acl/ldap_group