Updating patchsets for all versions, see bug #57081 for more

8 files changed, 405 insertions, 27 deletions

diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 96fa3b05dc7b..41a39c2a1378 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/squid
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.1 2004/08/15 19:01:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.2 2004/08/16 01:29:20 cyfred Exp $
+
+*squid-2.5.5-r3 (16 Aug 2004)
+
+  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.4.7.ebuild,
+  +squid-2.5.5-r3.ebuild, +squid-2.5.6-r1.ebuild:
+  Updating patchsets for all versions, see bug #57081 for more
 
 *squid-2.4.7 (15 Aug 2004)
 
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index 17e2d9e0edcc..b861ef787893 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,28 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b5174707a26de0d42dc90f5992854fdf ChangeLog 8564
+MD5 ec92b1f72a78919c9c354dde1c15c872 squid-2.5.5-r3.ebuild 5871
+MD5 2f8dd2acd78403df2d61495b30ea3652 squid-2.5.6.ebuild 5326
+MD5 f98ac2e961a1eaaa8437083b278a03d4 squid-2.5.5-r2.ebuild 5804
+MD5 950a718d60a57bf3aa802377b43042de squid-2.5.6-r1.ebuild 5388
+MD5 8956a75df1a11281957fdbb7a6dcb2a4 squid-2.4.7.ebuild 3993
+MD5 f1c6c8957dcfe952fa853d0cf579188c ChangeLog 9058
 MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
-MD5 29685f0894c8370b80ed6ae4908d1133 squid-2.4.7.ebuild 3539
-MD5 ff9c406bca91551573b2122a27da7a55 squid-2.5.6.ebuild 5324
-MD5 0b6db90aefc1221144795065f4dd31ec squid-2.5.5-r2.ebuild 5802
-MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
-MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
-MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
-MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
-MD5 3351a9887b4bb7b8a9d8be6a6c79c53c files/squid.confd 437
+MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
+MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71
+MD5 cd17ad8190576ce543d6573199bd3f01 files/digest-squid-2.5.5-r3 147
+MD5 3794efc63eff1b0c9140d2396ca83e4d files/digest-squid-2.5.6-r1 147
+MD5 6e37fe3047234060fc63d5c16a4b7853 files/squid.confd 437
 MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41
-MD5 8d991a8d722088e656a44cd8c2fdbf59 files/squid.pam 508
-MD5 a94acb581ad7e59d2451fcd0c68cc6ac files/squid.rc6 1981
-MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566
+MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
+MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133
-MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71
-MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+f4+mdTrptrqvGERAo1VAJ9SdF4gSnERHB5oxs6ZN+5e+/KAUACgmMnj
-vvmoObp8cGjszZ1ZVSVRTXs=
-=f8uu
------END PGP SIGNATURE-----
+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 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
diff --git a/www-proxy/squid/files/digest-squid-2.4.7 b/www-proxy/squid/files/digest-squid-2.4.7
index 863642c1c25f..bc9fd7334661 100644
--- a/www-proxy/squid/files/digest-squid-2.4.7
+++ b/www-proxy/squid/files/digest-squid-2.4.7
@@ -1 +1,3 @@
 MD5 3b91136b8ddcc37196716fa6e85a14b2 squid-2.4.STABLE7-src.tar.gz 1087532
+MD5 ef0f9ad85ef9770668c4bc509ac8c0b9 squid-2.4.STABLE7-patches.tar.gz 769
+MD5 61f54d69abfee45b28e36a385bb9069c msntauth-v2.0.3-squid.2.tar.gz 50939
diff --git a/www-proxy/squid/files/digest-squid-2.5.5-r3 b/www-proxy/squid/files/digest-squid-2.5.5-r3
new file mode 100644
index 000000000000..e40f217409cd
--- /dev/null
+++ b/www-proxy/squid/files/digest-squid-2.5.5-r3
@@ -0,0 +1,2 @@
+MD5 45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2 1044932
+MD5 bd7ef8df42e337261758cf4636984317 squid-2.5.STABLE5-patches.tar.gz 24552
diff --git a/www-proxy/squid/files/digest-squid-2.5.6-r1 b/www-proxy/squid/files/digest-squid-2.5.6-r1
new file mode 100644
index 000000000000..6f15da3a8dc8
--- /dev/null
+++ b/www-proxy/squid/files/digest-squid-2.5.6-r1
@@ -0,0 +1,2 @@
+MD5 7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 1047199
+MD5 08edb11870c5d84bb9c771b56b6f412d squid-2.5.STABLE6-patches.tar.gz 16268
diff --git a/www-proxy/squid/squid-2.4.7.ebuild b/www-proxy/squid/squid-2.4.7.ebuild
index 957a4740fab3..068bcdad2dbf 100644
--- a/www-proxy/squid/squid-2.4.7.ebuild
+++ b/www-proxy/squid/squid-2.4.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.4.7.ebuild,v 1.1 2004/08/15 19:01:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.4.7.ebuild,v 1.2 2004/08/16 01:29:20 cyfred Exp $
 
 inherit eutils
 
@@ -11,8 +11,11 @@ MY_P=${PN}-2.4.STABLE7
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A caching web proxy, with advanced features"
 HOMEPAGE="http://www.squid-cache.org/"
+PATCH_URI="http://dev.gentoo.org/~cyfred/distfiles/squid-2.4.STABLE7-patches.tar.gz
+	http://dev.gentoo.org/~cyfred/distfiles/msntauth-v2.0.3-squid.2.tar.gz"
 SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${MY_P}-src.tar.gz
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/${MY_P}-src.tar.gz"
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/${MY_P}-src.tar.gz
+	${PATCH_URI}"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -33,6 +36,14 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-debian.diff
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
+	# We are applying several patches for the 2.4 tree
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch
+
+	# Now copy the msnt_auth updates over the top of the tree
+	einfo "Updating msnt_auth module"
+	rm -rf auth_modules/MSNT/*
+	cp ${WORKDIR}/msntauth-v2.0.3-squid.2/* auth_modules/MSNT/
+
 	if ! use debug
 	then
 		sed -i 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
diff --git a/www-proxy/squid/squid-2.5.5-r3.ebuild b/www-proxy/squid/squid-2.5.5-r3.ebuild
new file mode 100644
index 000000000000..a7e4df368d24
--- /dev/null
+++ b/www-proxy/squid/squid-2.5.5-r3.ebuild
@@ -0,0 +1,188 @@
+# 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.5-r3.ebuild,v 1.1 2004/08/16 01:29:20 cyfred Exp $
+
+inherit eutils
+
+IUSE="pam ldap ssl sasl snmp debug"
+
+#lame archive versioning scheme..
+S_PV=${PV%.*}
+S_PL=${PV##*.}
+S_PP=${PN}-${S_PV}.STABLE${S_PL}
+
+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.STABLE5-patches.tar.gz"
+
+RDEPEND="virtual/libc
+	pam? ( >=sys-libs/pam-0.72 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
+	selinux? ( sec-policy/selinux-squid )"
+DEPEND="${RDEPEND} dev-lang/perl"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha hppa ~ia64 s390 amd64 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 for 2.5 Stable 5 tree see bug #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() {
+	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	if use sasl; then
+		basic_modules="SASL,${basic_modules}"
+		#support for cyrus-sasl-1.x and 2.x; thanks Raker!
+		if [ -f /usr/include/sasl/sasl.h ]; then
+			cd ${S}/helpers/basic_auth/SASL/
+			cp sasl_auth.c sasl_auth.c.orig
+			sed \
+				-e "s:sasl.h:sasl/sasl.h:" \
+				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
+				-e "s:strlen(password), \&errstr:strlen(password):" \
+				< sasl_auth.c.orig > sasl_auth.c
+			cp Makefile.in Makefile.in.orig
+			sed -e "s:-lsasl:-lsasl2:" \
+				< Makefile.in.orig > Makefile.in
+			cd ${S}
+		fi
+	fi
+
+	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
+
+	./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-storeio="ufs,diskd,coss,aufs,null" \
+		--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-async-io \
+		--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.6-r1.ebuild b/www-proxy/squid/squid-2.5.6-r1.ebuild
new file mode 100644
index 000000000000..6a7079e7021d
--- /dev/null
+++ b/www-proxy/squid/squid-2.5.6-r1.ebuild
@@ -0,0 +1,173 @@
+# 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-r1.ebuild,v 1.1 2004/08/16 01:29:20 cyfred Exp $
+
+inherit eutils
+
+IUSE="pam ldap ssl sasl snmp debug"
+
+#lame archive versioning scheme..
+S_PV=${PV%.*}
+S_PL=${PV##*.}
+S_PP=${PN}-${S_PV}.STABLE${S_PL}
+
+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.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"
+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() {
+	local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	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
+
+	./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-storeio="ufs,diskd,coss,aufs,null" \
+		--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-async-io \
+		--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
+}