Update squid package to 2.5.2nb4.

- Don't left share/doc/squid directory on deinstall.
- Apply recent 12 official patches.

 - (Minor) deny_info TCP_RESET does not work
 - (Minor) Digest authentication fails on URLs with comma
 - (Minor) digest nonce count workarounds for broken browsers
 - (Minor) external_acl hangs if defined with ttl=0
 - (Minor) smb_auth.pl (multi-domain-NTLM) fails on domain qualified logins
 - (Minor) smb_auth fails on complex logins (involving domain names or odd
           characters)
 - (Minor) ACL regression error introduced by earlier 2.5.STABLE2 patch
 - (Cosmetic) segmentation fault in authentication if debugging enabled
 - (Cosmetic) Unreachable code due to siged/unsigned errors
 - (Minor) logic error in comm_select.
 - (Minor) wb_group update to 1.2 to add support for domain qualified goups
 - (Minor) Segmentation fault when using negated external acls

3 files changed, 42 insertions, 5 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 5f4df256c84..a35d54a2e70 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2003/05/09 05:07:13 taca Exp $
+# $NetBSD: Makefile,v 1.84 2003/05/24 12:31:34 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE2
 PKGNAME=	squid-2.5.2
-PKGREVISION=	3
+PKGREVISION=	4
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -29,7 +29,19 @@ PATCHFILES=	squid-2.5.STABLE2-concurrent_external_acl.patch \
 		squid-2.5.STABLE2-ident_REQUIRED.patch \
 		squid-2.5.STABLE2-reply_body_max_size.patch \
 		squid-2.5.STABLE2-acl_lookup_loop.patch \
-		squid-2.5.STABLE2-squid_ldap_auth.patch
+		squid-2.5.STABLE2-squid_ldap_auth.patch \
+		squid-2.5.STABLE2-external_lookup.patch \
+		wb_group-1.2.patch \
+		squid-2.5.STABLE2-comm-select.patch \
+		squid-2.5.STABLE2-unreachcode.patch \
+		squid-2.5.STABLE2-authdebug.patch \
+		squid-2.5.STABLE2-aclregression.patch \
+		squid-2.5.STABLE2-smb_auth.patch \
+		squid-2.5.STABLE2-smb_auth_pl.patch \
+		squid-2.5.STABLE2-external_acl_ttl0.patch \
+		squid-2.5.STABLE2-digest_nonce_count.patch \
+		squid-2.5.STABLE2-digestcomma.patch \
+		squid-2.5.STABLE2-deny_info_reset.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@netbsd.org
diff --git a/www/squid/PLIST b/www/squid/PLIST
index b84169cd295..2fffee8538b 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/03/27 06:44:24 taca Exp $
+@comment $NetBSD: PLIST,v 1.14 2003/05/24 12:31:34 taca Exp $
 bin/squidclient
 etc/rc.d/squid
 libexec/cachemgr.cgi
@@ -11,4 +11,5 @@ share/examples/squid/squid.conf
 sbin/RunAccel
 sbin/RunCache
 sbin/squid
+@dirrm share/doc/squid
 @dirrm share/examples/squid
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 6ff86fcf0c9..f0f843fa951 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2003/05/09 05:07:13 taca Exp $
+$NetBSD: distinfo,v 1.31 2003/05/24 12:31:34 taca Exp $
 
 SHA1 (squid-2.5.2/squid-2.5.STABLE2.tar.bz2) = e319b3cfdf5d92df9ef39da048fc4235d9cc5154
 Size (squid-2.5.2/squid-2.5.STABLE2.tar.bz2) = 1020696 bytes
@@ -40,6 +40,30 @@ SHA1 (squid-2.5.2/squid-2.5.STABLE2-acl_lookup_loop.patch) = 3067187cd63f7e4dbc4
 Size (squid-2.5.2/squid-2.5.STABLE2-acl_lookup_loop.patch) = 3773 bytes
 SHA1 (squid-2.5.2/squid-2.5.STABLE2-squid_ldap_auth.patch) = 8f5eb18f4b6a8c1542232604a8629658dc909b20
 Size (squid-2.5.2/squid-2.5.STABLE2-squid_ldap_auth.patch) = 19060 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_lookup.patch) = a53fe442c7ed6e5e44ba795762c1497e57fc3d9e
+Size (squid-2.5.2/squid-2.5.STABLE2-external_lookup.patch) = 2431 bytes
+SHA1 (squid-2.5.2/wb_group-1.2.patch) = 55207a24ab2c7c7e8cb9f25b379404d18835f3bf
+Size (squid-2.5.2/wb_group-1.2.patch) = 9032 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-comm-select.patch) = fbbeb5459c295aac0969056cd742da331b49b0a0
+Size (squid-2.5.2/squid-2.5.STABLE2-comm-select.patch) = 675 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-unreachcode.patch) = a6fed5b9a07e456c9a7df313261548cac37aac9b
+Size (squid-2.5.2/squid-2.5.STABLE2-unreachcode.patch) = 12318 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-authdebug.patch) = 5bd3a18425d47a22f7de44096f54aae9b6bed1c8
+Size (squid-2.5.2/squid-2.5.STABLE2-authdebug.patch) = 1085 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-aclregression.patch) = 33bf5b378574b17fbd428bd59f1355f212348c8d
+Size (squid-2.5.2/squid-2.5.STABLE2-aclregression.patch) = 784 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-smb_auth.patch) = ce81b5bd84964f59ffd306c9d2ff5e226719320a
+Size (squid-2.5.2/squid-2.5.STABLE2-smb_auth.patch) = 817 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-smb_auth_pl.patch) = 64b0feeeb03efaf2ffd5c0197ccb6295d2d6325a
+Size (squid-2.5.2/squid-2.5.STABLE2-smb_auth_pl.patch) = 673 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_ttl0.patch) = 4f245b75c0a48e7a612ae444275c158fb3f55ec0
+Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_ttl0.patch) = 3002 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-digest_nonce_count.patch) = 3b4a1db8e8c85145de870b96b9294e6fba818bd5
+Size (squid-2.5.2/squid-2.5.STABLE2-digest_nonce_count.patch) = 11275 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-digestcomma.patch) = c50873d4d1dc3dbe18f242f04b5e4268f8156ef2
+Size (squid-2.5.2/squid-2.5.STABLE2-digestcomma.patch) = 1484 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-deny_info_reset.patch) = d91d63a437df9d62297eaa7a6115920e26f3a672
+Size (squid-2.5.2/squid-2.5.STABLE2-deny_info_reset.patch) = 5479 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0