Version bump and add reload() to the rc-script.

5 files changed, 184 insertions, 5 deletions

diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index 6dd93debbb15..d4398ef9774c 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/squid
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.32 2004/02/19 17:46:42 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.33 2004/03/19 01:32:29 woodchip Exp $
+
+*squid-2.5.5 (18 Mar 2004)
+
+  18 Mar 2004; Donny Davies <woodchip@gentoo.org> squid-2.5.5.ebuild,
+  files/squid.rc6:
+  Version bump and add reload() to the rc-script, both thanks to
+  Wolfram Schlich <wschlich@gentoo.org>.
 
   19 Feb 2004; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild:
   Bug #41882; add 'export WANT_AUTOCONF=2.1'.
diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest
index f9cdfd1eee7b..ce329d2352f8 100644
--- a/net-www/squid/Manifest
+++ b/net-www/squid/Manifest
@@ -1,8 +1,8 @@
 MD5 02981b4c7f2321997a00aaec1da5c266 squid-2.5.4.ebuild 5241
 MD5 a921cc8d38355df4ce57a40094e063a6 squid-2.5.3.ebuild 4921
 MD5 82a17b56b238e10ef81b408301a4733f squid-2.4.7.ebuild 3502
-MD5 16491ab1d1269edfceee44115a1d5588 squid-2.5.5.ebuild 4978
-MD5 08e62ae570d575aa28ca9b83f90b5c31 ChangeLog 4828
+MD5 9840790684f4dafe6a89592c8e9939c6 squid-2.5.5.ebuild 4977
+MD5 590350cf4570ad644a9f1c357f284456 ChangeLog 5052
 MD5 abd44e391b7ba8c288305b87309a264e metadata.xml 250
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
 MD5 f1e7ce6a855c380b1772f2894715b2b8 files/squid.confd 444
@@ -10,7 +10,7 @@ MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41
 MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
 MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 c91a09e06237e673a07ec28364f3e0e1 files/squid.pam 506
-MD5 3e5bce07182984d68ab18682cb9179a6 files/squid.rc6 1987
+MD5 a34e95bca7acfe80d17dd3431fc7d9cc files/squid.rc6 1990
 MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
 MD5 6658bb10c03cd2940380d3358c2d8eef files/digest-squid-2.5.3 71
 MD5 7183dd9775e11802755e8dc6be14e083 files/digest-squid-2.5.4 146
diff --git a/net-www/squid/files/digest-squid-2.5.5 b/net-www/squid/files/digest-squid-2.5.5
new file mode 100644
index 000000000000..14cc1f4b2777
--- /dev/null
+++ b/net-www/squid/files/digest-squid-2.5.5
@@ -0,0 +1 @@
+MD5 45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2 1044932
diff --git a/net-www/squid/files/squid.rc6 b/net-www/squid/files/squid.rc6
index 0323d26dce81..b5ef269c2cf5 100644
--- a/net-www/squid/files/squid.rc6
+++ b/net-www/squid/files/squid.rc6
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.9 2004/03/06 03:59:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.10 2004/03/19 01:32:29 woodchip Exp $
+
+opts="${opts} reload"
 
 depend() {
 	need net
@@ -78,3 +80,10 @@ stop() {
 		eend 0
 	fi
 }
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading squid"
+	/usr/sbin/squid -k reconfigure
+	eend $?
+}
diff --git a/net-www/squid/squid-2.5.5.ebuild b/net-www/squid/squid-2.5.5.ebuild
new file mode 100644
index 000000000000..30f3c5fd921f
--- /dev/null
+++ b/net-www/squid/squid-2.5.5.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2004 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.5.ebuild,v 1.1 2004/03/19 01:32:29 woodchip Exp $
+
+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"
+
+RDEPEND="virtual/glibc
+	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 )"
+DEPEND="${RDEPEND} dev-lang/perl"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ppc64 ~ia64"
+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
+
+	#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 "`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"
+
+	./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
+
+	#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 ; doexe ${FILESDIR}/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
+}