Update squid package to 2.5.4nb8; apply five official patches.

o Empty proxy_auth ACLs are silently accepted but lead to unpredictable ACL matching

synopsis	If a proxy_auth acl is incorrectly defined with no members
		then any http_access rules using this acl will give
		unpredictable results depending on the results of earlier
		acl lookups.  This patch corrects both the reason to why
		acl lookups became unpredictable and makes Squid reject
		such incorrect acl definitions.
severity	Medium
date		2004-01-15 07:44
bugzilla	#893
versions	Squid-2.5 and earlier
platforms	All
workaround	Make sure your proxy_auth acls are correctly defined.  If
		the acl should not match any users then don't declare the
		acl at all.

o Squid doesn't follow telnet protocol on FTP control connections

synopsis	Squid forgot to escape IAC characters (ascii code 255) in
		FTP requests, causing problems to access files/directories
		using this character in their name or to log in with this
		character in the login or password.
severity	Minor
date		2004-02-03 14:38
bugzilla	#877
versions	Squid-2.5 and earlier
platforms	All
workaround	Double any such characters in the input to Squid.  (%ff%ff
		instead of %ff)

o Random auth popups and account lockouts when using NTLM

synopsis	When using NTLM authentication random auth popups and
		account lockouts may be experienced.
severity	Medium
date		2004-02-11 22:12
bugzilla	#908
versions	Squid-2.5
platforms	All
workaround	It may help to configure a lot of NTLM helpers but this is
		not verified.


o squid_ldap_group -S option did not work

synopsis	The -S and -E options in squid_ldap_group v2.12 was mixed
		up, making the options somewhat hard to use.
severity	Minor
date		2004-02-09 17:10
bugzilla	#911
versions	Squid-2.5.STABLE4 + ldap_group 2.12 patch
platforms	All
workaround	Specify -E instead of -S.

o Squid stuck at 100% CPU loop in ipcache_purgelru, or segfault in the same

synopsis	The squid-2.5.STABLE4-connect_cleanup.patch was not
		entirely correct and could cause memory corruption in
		certain situations involving negative DNS replies (host not
		found etc)
severity	Major
date		2004-02-12 09:42
bugzilla	#891
versions	Squid-2.5.STABLE4-20031210 to 20040212
platforms	All

2 files changed, 21 insertions, 6 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index c5f24f14a62..19d7b07b9b8 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.101 2004/01/20 12:28:00 agc Exp $
+# $NetBSD: Makefile,v 1.102 2004/02/12 14:45:00 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE4
 PKGNAME=	squid-2.5.4
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 		ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -44,7 +44,12 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
 		squid-2.5.STABLE4-ldap_group_bufsize.patch \
-		squid-2.5.STABLE4-http_workarounds.patch
+		squid-2.5.STABLE4-http_workarounds.patch \
+		squid-2.5.STABLE4-empty_proxy_auth.patch \
+		squid-2.5.STABLE4-ftp_telnet.patch \
+		squid-2.5.STABLE4-ntlm_auth_popups.patch \
+		squid-2.5.STABLE4-ldap_group-S.patch \
+		squid-2.5.STABLE4-ipcache_purge.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 65775bc1c6e..0c60b9f07ba 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2004/01/20 06:49:21 taca Exp $
+$NetBSD: distinfo,v 1.48 2004/02/12 14:45:00 taca Exp $
 
 SHA1 (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 470a2697625cf6edb83ad6fe59af2e147f557e24
 Size (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 1036704 bytes
@@ -70,8 +70,18 @@ SHA1 (squid-2.5.4/squid-2.5.STABLE4-ldap_tls.patch) = 3d20ba0a993cb9fcc3c2193207
 Size (squid-2.5.4/squid-2.5.STABLE4-ldap_tls.patch) = 1853 bytes
 SHA1 (squid-2.5.4/squid-2.5.STABLE4-ldap_group_bufsize.patch) = 7f9415c2068a0df5560c853696823816781ce950
 Size (squid-2.5.4/squid-2.5.STABLE4-ldap_group_bufsize.patch) = 762 bytes
-SHA1 (squid-2.5.4/squid-2.5.STABLE4-http_workarounds.patch) = 22107d8cfa63eea6bbb18ccc3cd03954a839503d
-Size (squid-2.5.4/squid-2.5.STABLE4-http_workarounds.patch) = 11032 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-http_workarounds.patch) = db70ba21cf79b7a28e89658f70e068a2d5215f80
+Size (squid-2.5.4/squid-2.5.STABLE4-http_workarounds.patch) = 12322 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-empty_proxy_auth.patch) = 7c915ff182178f6315831999290d80282f409290
+Size (squid-2.5.4/squid-2.5.STABLE4-empty_proxy_auth.patch) = 2719 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-ftp_telnet.patch) = 985d113918bd59bb32bbf2924fae4dd1267e5d64
+Size (squid-2.5.4/squid-2.5.STABLE4-ftp_telnet.patch) = 3844 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-ntlm_auth_popups.patch) = d55620fbd667c14098d5dec0a2c1fd1f7ce79686
+Size (squid-2.5.4/squid-2.5.STABLE4-ntlm_auth_popups.patch) = 63653 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-ldap_group-S.patch) = f290046043732b92014b3957806dab32675d448b
+Size (squid-2.5.4/squid-2.5.STABLE4-ldap_group-S.patch) = 993 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-ipcache_purge.patch) = fe724fd85cd3de56a1d80d097d3847ab9572f360
+Size (squid-2.5.4/squid-2.5.STABLE4-ipcache_purge.patch) = 1022 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0