Version bump. Update customlog and zero penalty hit patches.

(Portage version: 2.0.54)

5 files changed, 42 insertions, 31 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e7c6d6dfa52e..faf375893dc8 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.69 2006/03/19 12:13:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.70 2006/03/25 08:39:30 mrness Exp $
+
+*squid-2.5.13 (25 Mar 2006)
+
+  25 Mar 2006; Alin Nastac <mrness@gentoo.org> -squid-2.5.11.ebuild,
+  +squid-2.5.13.ebuild:
+  Version bump. Update customlog and zero penalty hit patches.
 
   19 Mar 2006; Markus Rothe <corsair@gentoo.org> squid-2.5.12-r1.ebuild:
   Stable on ppc64
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 494423c922ea..d7405df93faa 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,7 +1,7 @@
 MD5 90594a05111a9a5c0ae7a1afd6a916fc ChangeLog 25733
-MD5 9aae33d4872e127be17e8a1bc587c2a7 files/digest-squid-2.5.11 157
 MD5 3e02deef24558936110d58663433ace3 files/digest-squid-2.5.12 157
 MD5 5d6f903d6b8e8bbcd6fd6f93b8db5986 files/digest-squid-2.5.12-r1 157
+MD5 3bde0dbe28adf17eef22397e3d227158 files/digest-squid-2.5.13 157
 MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
 MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid.cron 133
 MD5 29c067429711e7189923fcfc522000b3 files/squid.initd 2015
@@ -9,6 +9,6 @@ MD5 59d7ba17075734a74e527151edef9075 files/squid.initd-logrotate 1909
 MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid.logrotate 101
 MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315
 MD5 cf398556bce540358644ce9a452abfba metadata.xml 241
-MD5 e134f5c38aadc2fd333ac8b006dbc252 squid-2.5.11.ebuild 6389
 MD5 475662414f4f733965e174439d204c98 squid-2.5.12-r1.ebuild 6757
 MD5 ac886689f2b0bcdeb4a449ff6069541f squid-2.5.12.ebuild 6412
+MD5 452eef335a6e9d5680f9c3ee8ba7751c squid-2.5.13.ebuild 6762
diff --git a/net-proxy/squid/files/digest-squid-2.5.11 b/net-proxy/squid/files/digest-squid-2.5.11
deleted file mode 100644
index ec7ca46fb194..000000000000
--- a/net-proxy/squid/files/digest-squid-2.5.11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ab2b6f7bf930323b4ebfbcf7233f9af9 squid-2.5.STABLE11.tar.gz 1392629
-MD5 20f5c2d6f430a78ea74fadea7090d3ad squid-2.5.STABLE11-patches-20051019.tar.gz 27204
diff --git a/net-proxy/squid/files/digest-squid-2.5.13 b/net-proxy/squid/files/digest-squid-2.5.13
new file mode 100644
index 000000000000..1a3c90f193f1
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-2.5.13
@@ -0,0 +1,2 @@
+MD5 8f15070ca10fec0f39598bb1c4c751a7 squid-2.5.STABLE13-patches-20060325.tar.gz 23020
+MD5 a9427d8c21b27b1c6fd650315f1b7d2b squid-2.5.STABLE13.tar.gz 1399833
diff --git a/net-proxy/squid/squid-2.5.11.ebuild b/net-proxy/squid/squid-2.5.13.ebuild
index b381adedef03..4d0e7079d366 100644
--- a/net-proxy/squid/squid-2.5.11.ebuild
+++ b/net-proxy/squid/squid-2.5.13.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.11.ebuild,v 1.9 2006/01/09 11:51:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.13.ebuild,v 1.1 2006/03/25 08:39:31 mrness Exp $
 
-inherit eutils pam toolchain-funcs
+inherit eutils pam toolchain-funcs flag-o-matic
 
 #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="20051019"
+S_PV="${PV%.*}"
+S_PL="${PV##*.}"
+S_PL="${S_PL/_rc/-RC}"
+S_PP="${PN}-${S_PV}.STABLE${S_PL}"
+PATCH_VERSION="20060325"
 
 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"
+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 )
@@ -31,6 +29,8 @@ RDEPEND="pam? ( virtual/pam )
 	!mips? ( logrotate? ( app-admin/logrotate ) )"
 DEPEND="${RDEPEND} dev-lang/perl"
 
+S="${WORKDIR}/${S_PP}"
+
 pkg_setup() {
 	enewgroup squid 31
 	enewuser squid 31 -1 /var/cache/squid squid
@@ -38,21 +38,21 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
-	cd ${S} || die "dir ${S} not found"
+	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*
+	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
+	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:' \
+	sed -i -e 's:_LDFLAGS[ ]*=:_LDFLAGS = '$(bindnow-flags)':' \
 		helpers/basic_auth/*/Makefile.in
 
 	if ! use debug ; then
@@ -111,8 +111,8 @@ src_compile() {
 		--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-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 \
@@ -144,7 +144,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 
 	#--enable-icmp
 	#make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
@@ -152,13 +152,13 @@ src_install() {
 	#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
+	fowners root:squid /usr/lib/squid/ncsa_auth
+	fowners root:squid /usr/lib/squid/pam_auth
+	fperms 4750 /usr/lib/squid/ncsa_auth
+	fperms 4750 /usr/lib/squid/pam_auth
 
 	#some clean ups
-	rm -f ${D}/usr/bin/Run*
+	rm -f "${D}"/usr/bin/Run*
 
 	#simply switch this symlink to choose the desired language..
 	dosym /usr/lib/squid/errors/English /etc/squid/errors
@@ -183,9 +183,9 @@ src_install() {
 		newexe "${FILESDIR}/squid.cron" squid.cron
 	fi
 
-	rm -rf ${D}/var
+	rm -rf "${D}"/var
 	diropts -m0755 -o squid -g squid
-	dodir /var/cache/squid /var/log/squid
+	keepdir /var/cache/squid /var/log/squid
 }
 
 pkg_preinst() {
@@ -203,4 +203,9 @@ pkg_postinst() {
 	einfo "in the cache_effective_group option on your squid.conf:"
 	einfo "    chgrp squid /var/cache/samba/winbindd_privileged"
 	echo
+	ewarn "Be careful what type of cache_dir you select!"
+	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
+	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
+	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
+	echo
 }