#10865

4 files changed, 143 insertions, 8 deletions

diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index 8da575a909dd..7dfe8a3618de 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/squid
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.8 2002/11/07 12:23:56 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.9 2002/11/19 07:11:02 woodchip Exp $
+
+*squid-2.5.1-r1 (19 Nov 2002)
+
+  19 Nov 2002; Donny Davies <woodchip@gentoo.org> : Fix for #10865.
 
 *squid-2.5.1 (07 Nov 2002)
 
diff --git a/net-www/squid/files/digest-squid-2.5.1-r1 b/net-www/squid/files/digest-squid-2.5.1-r1
new file mode 100644
index 000000000000..71ee1aa5cce7
--- /dev/null
+++ b/net-www/squid/files/digest-squid-2.5.1-r1
@@ -0,0 +1 @@
+MD5 c83e3f4f0313529a2bc4b5dd6f651544 squid-2.5.STABLE1.tar.bz2 1006600
diff --git a/net-www/squid/files/squid.rc6 b/net-www/squid/files/squid.rc6
index e4075a6ace41..9360b17d3313 100644
--- a/net-www/squid/files/squid.rc6
+++ b/net-www/squid/files/squid.rc6
@@ -1,15 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.6 2002/09/15 01:26:51 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.7 2002/11/19 07:11:02 woodchip Exp $
 
 depend() {
 	need net
 }
 
-#
 # Try to increase the # of filedescriptors we can open.
-#
 maxfds() {
 	[ -n "$SQUID_MAXFD" ] || return
 	[ -f /proc/sys/fs/file-max ] || return 0
@@ -56,9 +54,7 @@ stop() {
 	PID=`cat /var/run/squid.pid 2>/dev/null`
 	start-stop-daemon --stop --quiet --exec /usr/sbin/squid \
 		--pidfile /var/run/squid.pid
-	#
 	# Now we have to wait until squid has _really_ stopped.
-	#
 	sleep 2
 	if test -n "$PID" && kill -0 $PID 2>/dev/null
 	then
@@ -69,9 +65,7 @@ stop() {
 			cnt=`expr $cnt + 1`
 			if [ $cnt -gt 60 ]
 			then
-				#
 				# Waited 120 seconds now. Fail.
-				#
 				eend 1 "Failed."
 				break
 			fi
diff --git a/net-www/squid/squid-2.5.1-r1.ebuild b/net-www/squid/squid-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..4c8ad4dbf73d
--- /dev/null
+++ b/net-www/squid/squid-2.5.1-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.1-r1.ebuild,v 1.1 2002/11/19 07:11:02 woodchip Exp $
+
+IUSE="pam ldap ssl sasl snmp"
+
+#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"
+
+RDEPEND="pam? >=sys-libs/pam-0.72
+	ldap? >=net-nds/openldap-2
+	ssl? >=dev-libs/openssl-0.9.6g
+	sasl? =dev-libs/cyrus-sasl-1*"
+DEPEND="${RDEPEND} sys-devel/perl"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~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}/${P}-gentoo.diff || die
+
+	#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 [ -z "$DEBUGBUILD" ]
+	then
+		cd ${S}
+		mv configure.in configure.in.orig
+		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
+		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}"
+
+	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"
+
+	./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 \
+		--disable-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
+
+	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
+
+	#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 README QUICKSTART CONTRIBUTORS COPYRIGHT COPYING \
+		CREDITS ChangeLog 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
+	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
+}
+
+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
+}