Update squid package to 2.5.2nb1.

- Squid may hang or behave oddly on shutdown while requests is being processed.

  synopsis	Squid may hang or otherwise behave oddly in shutdown
		if there is new requests processed at the same
		time. On shutdown Squid internally shut down DNS,
		redirectors and external acls while still processing
		new requests already received. In combination with the
		external acl queue overload bug this can completely
		hang Squid, preventing it from shutting down.
  severity	Minor
  bugzilla	#590
  versions	Squid-2.5 and earlier
  platforms	All

- external acl lookups does not deal well with queue overload

  synopsis	If there is a queue overload for external acl lookups
		then Squid logs "externalAclLookup: 'xxx' queue
		overload" at a very high rate in cache.log until the
		condition clears up.
  severity	Major
  bugzilla	#590
  versions	Squid-2.5
  platforms	All

- cache_effective_user documentation unclear

  synopsis	The cache_effective_user/group documentation was
		unclear on what happens if only one of the directives
		is set, or when Squid is started as a non-root user.
  severity	Cosmetic
  versions	Squid-2.5 and earlier
  platforms	All

- cache_peer documentation missing for htcp and carp

  synopsis	The cache_peer documentation for the htcp and carp
		related options was missing
  severity	Cosmetic
  versions	Squid-2.5 and earlier
  platforms	All

2 files changed, 16 insertions, 3 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index f127c63e1a0..308e6deac6a 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2003/03/29 12:42:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.81 2003/04/11 09:51:40 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE2
 PKGNAME=	squid-2.5.2
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -11,7 +12,11 @@ EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
 PATCHFILES=	squid-2.5.STABLE2-concurrent_external_acl.patch \
-		squid-2.5.STABLE2-external_acl_crash.patch
+		squid-2.5.STABLE2-external_acl_crash.patch \
+		squid-2.5.STABLE2-shutdown.patch \
+		squid-2.5.STABLE2-external_acl_overload.patch \
+		squid-2.5.STABLE2-cache_effective_user_docs.patch \
+		squid-2.5.STABLE2-cache_peer_docs.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@netbsd.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 07d385f3c82..c5fa420b146 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2003/03/25 17:44:22 taca Exp $
+$NetBSD: distinfo,v 1.28 2003/04/11 09:51:40 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
@@ -6,6 +6,14 @@ SHA1 (squid-2.5.2/squid-2.5.STABLE2-concurrent_external_acl.patch) = 8f6cacd9bfe
 Size (squid-2.5.2/squid-2.5.STABLE2-concurrent_external_acl.patch) = 730 bytes
 SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_crash.patch) = 79d2cd10f832513a547b3d77bf09c2c359a6831c
 Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_crash.patch) = 1356 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-shutdown.patch) = 5a8e3915c8bfa9374998e69c50bc62732222a387
+Size (squid-2.5.2/squid-2.5.STABLE2-shutdown.patch) = 890 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_overload.patch) = f74a09f17bd1722f0ef4c0b51e892e0ac70c6fbd
+Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_overload.patch) = 977 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-cache_effective_user_docs.patch) = 31f899fa0bbbe09ac196d8458331c472d59ccb69
+Size (squid-2.5.2/squid-2.5.STABLE2-cache_effective_user_docs.patch) = 1532 bytes
+SHA1 (squid-2.5.2/squid-2.5.STABLE2-cache_peer_docs.patch) = 130f145e06b5da2589cfa0bf2216ce447289e998
+Size (squid-2.5.2/squid-2.5.STABLE2-cache_peer_docs.patch) = 1324 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0