fix follow-xff patch (#105468)

Package-Manager: portage-2.0.51.22-r2

4 files changed, 237 insertions, 10 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 21b534d9f382..70b72582e7bd 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.33 2005/09/08 14:24:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.34 2005/09/10 20:41:12 mrness Exp $
+
+*squid-2.5.10-r3 (10 Sep 2005)
+
+  10 Sep 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.10-r3.ebuild:
+  Fix follow-xff patch (#105468).
 
   08 Sep 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.10-r2.ebuild:
   Mark 2.5.10-r2 stable on ia64
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index a1c079671ce6..a6d96b741666 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,16 +1,28 @@
-MD5 e9e1e54a7ed3f6f4f00012f78ab9042d squid-2.5.10-r2.ebuild 6374
-MD5 c2a21a50fca07975a99242ebc54c2f88 metadata.xml 330
-MD5 e1d533a57040ae57298503add293c11e ChangeLog 21214
-MD5 07e48c460df0316a538a1a658c978755 squid-2.5.10-r1.ebuild 6381
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 05e24a49376ee7582d3cd63438f934dc squid-2.5.10_rc3.ebuild 6274
+MD5 e9e1e54a7ed3f6f4f00012f78ab9042d squid-2.5.10-r2.ebuild 6374
 MD5 20b097989d5bcdac0f6adb1b17987ee7 squid-2.5.10.ebuild 6306
-MD5 e4892b020a8f891012008954377a2663 files/digest-squid-2.5.10-r1 157
-MD5 40a3fdee0d8db88cb690a6eceb59e45a files/squid.pam 505
-MD5 daa5a0fb0b6b042cae9e9cac37319a5b files/digest-squid-2.5.10_rc3 165
+MD5 07e48c460df0316a538a1a658c978755 squid-2.5.10-r1.ebuild 6381
+MD5 76138fd1ff8cccab9ad1768310a59626 squid-2.5.10-r3.ebuild 6430
+MD5 dc4d860558ebb0bb70f146846e3aa058 ChangeLog 21351
+MD5 c2a21a50fca07975a99242ebc54c2f88 metadata.xml 330
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 MD5 5cbc9bcecee98115731f5fc4b0f10907 files/squid.initd 1982
-MD5 208e20395de910fc529fcfb8031bfb13 files/squid.pam-include 326
-MD5 8cc1ace892824f141e77ba74760c02a2 files/digest-squid-2.5.10 157
+MD5 daa5a0fb0b6b042cae9e9cac37319a5b files/digest-squid-2.5.10_rc3 165
 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid.cron 133
+MD5 8cc1ace892824f141e77ba74760c02a2 files/digest-squid-2.5.10 157
+MD5 e4892b020a8f891012008954377a2663 files/digest-squid-2.5.10-r1 157
 MD5 9bc2547e30ed7f253626bd88246c0808 files/digest-squid-2.5.10-r2 157
+MD5 bf8511504cf63c341a51d2d31d410101 files/digest-squid-2.5.10-r3 157
+MD5 40a3fdee0d8db88cb690a6eceb59e45a files/squid.pam 505
 MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid-logrotate 101
+MD5 208e20395de910fc529fcfb8031bfb13 files/squid.pam-include 326
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDI0ULNSP4Vda7IdsRAhNzAJ9cudMoXezxk2EoPGQ4pGH4Okt0uQCfUqv0
+DXoAwnznGgZPCRPeTtwNJak=
+=7rGf
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.5.10-r3 b/net-proxy/squid/files/digest-squid-2.5.10-r3
new file mode 100644
index 000000000000..1add6137db0e
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-2.5.10-r3
@@ -0,0 +1,2 @@
+MD5 b74d7a0be462e9e3435ab771316385af squid-2.5.STABLE10.tar.gz 1383522
+MD5 7518f700a29d00044e7336ce22acb9f7 squid-2.5.STABLE10-patches-20050910.tar.gz 53256
diff --git a/net-proxy/squid/squid-2.5.10-r3.ebuild b/net-proxy/squid/squid-2.5.10-r3.ebuild
new file mode 100644
index 000000000000..98661d1fbc0a
--- /dev/null
+++ b/net-proxy/squid/squid-2.5.10-r3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.10-r3.ebuild,v 1.1 2005/09/10 20:41:12 mrness Exp $
+
+inherit eutils pam toolchain-funcs
+
+#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="20050910"
+
+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"
+
+S=${WORKDIR}/${S_PP}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam ldap ssl sasl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff"
+
+RDEPEND="pam? ( virtual/pam )
+	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 )
+	!mips? ( logrotate? ( app-admin/logrotate ) )"
+DEPEND="${RDEPEND} dev-lang/perl"
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+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 customlog || rm ${WORKDIR}/patch/9*customlog*
+	use zero-penalty-hit || rm ${WORKDIR}/patch/9*ToS_Hit*
+	use follow-xff || rm ${WORKDIR}/patch/9*follow_xff*
+	EPATCH_SUFFIX="patch"
+	epatch ${WORKDIR}/patch
+
+	#hmm #10865
+	sed -i -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
+		helpers/external_acl/ldap_group/Makefile.in
+
+	#disable lazy bindings on (some at least) suided basic auth programs
+	sed -i -e 's:_LDFLAGS[ ]*=:_LDFLAGS = -Wl,-z,now:' \
+		helpers/basic_auth/*/Makefile.in
+
+	if ! use debug ; then
+		sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
+	fi
+	export WANT_AUTOCONF=2.1
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	# Support for uclibc #61175
+	if use elibc_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 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
+
+	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 \
+		--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 \
+		--with-large-files \
+		--enable-htcp \
+		--enable-carp \
+		--enable-poll \
+		`use_enable follow-xff follow-x-forwarded-for` \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+		#--enable-icmp
+
+	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
+		include/autoconf.h
+
+#	if [ "${ARCH}" = "hppa" ]
+#	then
+#		sed -i -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 -f ${D}/usr/bin/Run*
+
+	#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*
+
+	newpamd "${FILESDIR}/squid.pam-include" squid
+	newinitd "${FILESDIR}/squid.initd" squid
+	newconfd "${FILESDIR}/squid.confd" 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
+
+	rm -rf ${D}/var
+	diropts -m0755 -o squid -g squid
+	dodir /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
+	einfo "For winbind authentication to work with squid you should change the"
+	einfo "/var/cache/samba/winbindd_privileged group to the same one you use"
+	einfo "in the cache_effective_group option on your squid.conf:"
+	einfo "    chgrp squid /var/cache/samba/winbindd_privileged"
+	echo
+}