Update squid package to squid-2.5.1nb4.

- include more official squid patches.

   o Make external_acl user names available as IDENT in later acl processing
   o digest authentication security issue
   o external_acl Assertion failed: auth_user_request != NULL
   o make install fails to install icons after make distclean
   o "error: invalid HTTP-ident" breaks log processing

3 files changed, 23 insertions, 8 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 22ed5162432..a0de649ecfc 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2003/02/19 23:44:42 taca Exp $
+# $NetBSD: Makefile,v 1.78 2003/03/02 16:22:43 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE1
 PKGNAME=	squid-2.5.1
-PKGREVISION=	3
+PKGREVISION=	4
 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/ \
@@ -10,7 +10,12 @@ MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
+PATCHFILES=	squid-2.5.STABLE1-external_acl_user.patch \
+		squid-2.5.STABLE1-auth_digest.patch \
+		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
+		squid-2.5.STABLE1-distclean_icons.patch \
+		squid-2.5.STABLE1-error-http-ident.patch \
+		squid-2.5.STABLE1-disable-ident-lookups.patch \
 		squid-2.5.STABLE1-disable-http-violations.patch \
 		squid-2.5.STABLE1-proxy_auth.patch \
 		squid-2.5.STABLE1-max_user_ip.patch \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 9207bbec503..11b6560ade2 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,7 +1,17 @@
-$NetBSD: distinfo,v 1.25 2003/02/19 23:44:42 taca Exp $
+$NetBSD: distinfo,v 1.26 2003/03/02 16:22:43 taca Exp $
 
 SHA1 (squid-2.5.1/squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62
 Size (squid-2.5.1/squid-2.5.STABLE1.tar.bz2) = 1006600 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-external_acl_user.patch) = 9048000ac8a2e728f91968f0143a6b460999ca02
+Size (squid-2.5.1/squid-2.5.STABLE1-external_acl_user.patch) = 909 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-auth_digest.patch) = 097fc3425b15d766772aa014d2ff0a0e9bd95e4c
+Size (squid-2.5.1/squid-2.5.STABLE1-auth_digest.patch) = 7305 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = 02b161e4ba3e3cbe47ceab6f8e9de64aeaa33b8e
+Size (squid-2.5.1/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = 2490 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-distclean_icons.patch) = c0b767c4e7ef406f20788674ac32b39f56ba4b2b
+Size (squid-2.5.1/squid-2.5.STABLE1-distclean_icons.patch) = 1505 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-error-http-ident.patch) = 22b3c847f6c21aee01287f13fe815d4fd6671501
+Size (squid-2.5.1/squid-2.5.STABLE1-error-http-ident.patch) = 983 bytes
 SHA1 (squid-2.5.1/squid-2.5.STABLE1-disable-ident-lookups.patch) = 8b21d1c40c85a86c575e039021b10010e0ab55a8
 Size (squid-2.5.1/squid-2.5.STABLE1-disable-ident-lookups.patch) = 695 bytes
 SHA1 (squid-2.5.1/squid-2.5.STABLE1-disable-http-violations.patch) = 18bc6685a7ee054e75f5260f6db15064671df361
@@ -132,7 +142,7 @@ SHA1 (patch-aa) = e29686a5c75635129b7e2eaf451140f10f29e081
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 23a906011ffef78d070cc49c94c4f4837eb319ec
-SHA1 (patch-ae) = 33888cf772b3fb3b7c4352cc29551a2dadfb12fa
+SHA1 (patch-ae) = 5031183c7512573c8c8602d0b0541999f43343f2
 SHA1 (patch-ag) = 7a0aa328d18374a4a954f66ac1431779a303f395
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 19861281d8a9ece352ce9e881e1e60f6787933e3
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index 933a3804076..5e60c17faa5 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-ae,v 1.6 2003/03/02 16:22:44 taca Exp $
 
---- icons/Makefile.in.orig	Fri Jul 12 17:38:22 2002
+--- icons/Makefile.in.orig	2003-03-03 01:16:42.000000000 +0900
 +++ icons/Makefile.in
 @@ -147,7 +147,7 @@ ICON2 = anthony-bomb.gif \
  		anthony-xpm.gif
@@ -10,4 +10,4 @@ $NetBSD: patch-ae,v 1.5 2002/10/13 16:43:21 taca Exp $
 +icondir = $(datadir)/squid/icons
  icon_DATA = $(ICON1) $(ICON2)
  EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
- DISTCLEANFILES = $(ICON1) $(ICON2)
+ DISTCLEANFILES =