Update squid packate to 2.5.9nb2.

Add these official patches:

* 2005-03-30 22:51 (Cosmetic)
	external acls requiring authentication does not request new
	credentials on access denials like proxy_auth does.
* 2005-03-29 09:52 (Cosmetic)
	New cachemgr pending_objects and client_objects actions
* 2005-03-26 23:53 (Minor) rename() related cleanup
* 2005-03-30 22:51 (Medium)
	Fails to process requests for files larger than 2GB in size
* 2005-03-19 23:57 (Cosmetic)
	aufs warning about open event filedescriptors on shutdown
* 2005-03-19 01:35 (Minor) --disable-hostname-checks not working
* 2005-03-19 01:11 (Cosmetic) LDAP helpers fails to compile with SUN LDAP SDK
* 2005-03-21 20:44 (Minor)
	CONNECT requests truncated if client side disconnects first
	assertion failed: comm.c:430: "ntohs(address->sin_port) != 0"
* 2005-03-19 00:25 (Minor)
	Basic authentication fails with very long logins or password
* 2005-03-29 08:45 (Minor) Several minor aufs issues
* 2005-03-09 15:46 (Cosmetic)
	Extend relaxed_header_parser to work around "excess data from"
	errors from many major web servers.
* 2005-03-09 15:46 (Cosmetic)
	Duplicate content-length headers logged as conflicting with
	relaxed_header_parser off
* 2005-03-09 15:46 (Cosmetic)
	Defer digest fetch if the peer is not allowed to be used
* 2005-03-10 23:38 (Minor) Incorrect use of ctype functions
* 2005-03-15 04:27 (Minor) compile warnings due to pid_t not being an int
* 2005-03-09 15:46 (Minor)
	bzero is a non-standard function not available on all platforms
* 2005-03-09 15:46 (Cosmetic)
	Check several squid.conf directives for int overflows
* 2005-03-09 15:46 (Cosmetic) Clarify delay_access function
* 2005-03-09 15:46 (Minor)
	reload_into_ims fails to revalidate negatively cached entries
* 2005-03-09 15:46 (Minor) Handle odd date formats

3 files changed, 88 insertions, 8 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index fd76ab2f80f..6dca15cd901 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.139 2005/03/06 13:30:48 taca Exp $
+# $NetBSD: Makefile,v 1.140 2005/03/31 16:44:25 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE9
 PKGNAME=	squid-2.5.9
-PKGREVISION=	1
+PKGREVISION=	2
 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/ \
@@ -13,7 +13,27 @@ PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
 PATCHFILES=	squid-2.5.STABLE9-setcookie.patch \
 		squid-2.5.STABLE9-ftp_EPLF.patch \
 		squid-2.5.STABLE9-ftp_base_href.patch \
-		squid-2.5.STABLE9-acl_error.patch
+		squid-2.5.STABLE9-acl_error.patch \
+		squid-2.5.STABLE9-date.patch \
+		squid-2.5.STABLE9-reload_into_ims.patch \
+		squid-2.5.STABLE9-delay_access_doc.patch \
+		squid-2.5.STABLE9-config_overflow.patch \
+		squid-2.5.STABLE9-bzero.patch \
+		squid-2.5.STABLE9-pid_t.patch \
+		squid-2.5.STABLE9-ctype.patch \
+		squid-2.5.STABLE9-defer_digest_fetch.patch \
+		squid-2.5.STABLE9-dup_content_length.patch \
+		squid-2.5.STABLE9-excess_data.patch \
+		squid-2.5.STABLE9-aufs.patch \
+		squid-2.5.STABLE9-long_basic_auth.patch \
+		squid-2.5.STABLE9-CONNECT_truncated.patch \
+		squid-2.5.STABLE9-LDAP_SUN_SDK.patch \
+		squid-2.5.STABLE9-disable_hostname_checks.patch \
+		squid-2.5.STABLE9-aufs_shutdown.patch \
+		squid-2.5.STABLE9-2GB.patch \
+		squid-2.5.STABLE9-rename_cleanup.patch \
+		squid-2.5.STABLE9-cachemgr_objects.patch \
+		squid-2.5.STABLE9-extaclauth.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index c46ac431ad5..36407b52881 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.86 2005/03/06 13:30:48 taca Exp $
+$NetBSD: distinfo,v 1.87 2005/03/31 16:44:25 taca Exp $
 
 SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b
 RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9.tar.bz2) = 98e49ff58ffc4664a46350f3d6c34be99b713716
@@ -15,6 +15,66 @@ Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-ftp_base_href.patch) = 709 bytes
 SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-acl_error.patch) = fec6e7f2b82bd3a8f9f26e6044f516c8127b9120
 RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-acl_error.patch) = 820a48ca76d5512dd0a0a28c4247d1a09d1ff528
 Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-acl_error.patch) = 8499 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-date.patch) = 3e98e96f3ce41c8b93f11f455e909fe3c31fa1ff
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-date.patch) = 4bfbfc7acd55747b58ce72316c6bb058fa7d4c0a
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-date.patch) = 5647 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-reload_into_ims.patch) = 9313f40309fe075a05a76be26623acda67a1d0e4
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-reload_into_ims.patch) = 1a312d5ab48416a33dc9af2c8adad4e66f7edc52
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-reload_into_ims.patch) = 852 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-delay_access_doc.patch) = 9b96b169dfd5f383350460c6c89b7baca5fede6f
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-delay_access_doc.patch) = c209d9178829ed3289111be8d489a603d031ae07
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-delay_access_doc.patch) = 1258 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-config_overflow.patch) = 03f7e72278e34c7bce6cac37bd5dfb4b91cc359b
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-config_overflow.patch) = 9b286b4b77162b5bbafc0a57f976101c6f9a091e
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-config_overflow.patch) = 591 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-bzero.patch) = 2899bd43bc53c00d79a54eec89d90b3b33715e02
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-bzero.patch) = b8888bdf567935fd0e00342b327441d338e2e191
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-bzero.patch) = 11326 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-pid_t.patch) = b03fa99462a522ebfbd759c6d2252e8d516ac230
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-pid_t.patch) = e429d87b89dd3dd91f385c7b187b43b58ac92044
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-pid_t.patch) = 5576 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-ctype.patch) = d1956f64ab2312a146279971e06d0b3463956334
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-ctype.patch) = 2e70bdb6899b97be611ce344dfbd516d1d2a8b5d
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-ctype.patch) = 4698 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-defer_digest_fetch.patch) = a0ce5fa1787383ae000efab7cdbb7da7eda523b3
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-defer_digest_fetch.patch) = 0592299cbd0780faac1aa1fc56af6306a7d5ed15
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-defer_digest_fetch.patch) = 1026 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-dup_content_length.patch) = f7d424975a35e253d981d3092b8e336cee037de2
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-dup_content_length.patch) = fbd59d1acf271c5d36ecc99cb0ec64df11a52665
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-dup_content_length.patch) = 1685 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-excess_data.patch) = 7b272cadafb070c322d8ff488249c85e4640f5dd
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-excess_data.patch) = 4a87f35949b25171f5b24d195a4a770eb2b1c5c1
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-excess_data.patch) = 1553 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-aufs.patch) = 5e970b98c8ddfebf34d36587acc63a3ab9de9d78
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-aufs.patch) = e23f773014c69ec6df6f0ef00de8f1d816ff007c
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-aufs.patch) = 9317 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-long_basic_auth.patch) = 43b6ab0692290e38eddf8bdbd027bedadf6c36db
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-long_basic_auth.patch) = 331b2d19c436523b5b627b9c95f6c689f68e3f5d
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-long_basic_auth.patch) = 1328 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-CONNECT_truncated.patch) = c5d90e4bb1021c58b74275d7d12900d671edc12c
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-CONNECT_truncated.patch) = 8cda87c642edc90b5713430dfd0a8d85bbf1e613
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-CONNECT_truncated.patch) = 4885 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-LDAP_SUN_SDK.patch) = dc16026dc554116377da400ba7d35b501acf0f6b
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-LDAP_SUN_SDK.patch) = e77200c032598eee5c1d1c41f0251b4e25cd5b65
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-LDAP_SUN_SDK.patch) = 8490 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-disable_hostname_checks.patch) = 993f5111623ff0149352ec69e2f10380b3e3bc69
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-disable_hostname_checks.patch) = 12ec3273716a9e6da31be5ec1a880662cb2957ec
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-disable_hostname_checks.patch) = 2964 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-aufs_shutdown.patch) = 23ab9e4a8ef9042d03b5eaca366232c7609f6217
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-aufs_shutdown.patch) = 68d2e27eceb4e2738cd4e495769ad7d58f288768
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-aufs_shutdown.patch) = 10649 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-2GB.patch) = 04295dbb320bc0336bc78a324385f950c898882d
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-2GB.patch) = 3667a30b5eb3ca9ba85ebe19f5aafaf1f4d64c11
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-2GB.patch) = 251192 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-rename_cleanup.patch) = d61dbbee6a39fac03a323a62a81342cab9e15228
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-rename_cleanup.patch) = 5f051fb2b6f9b655d2d938945789655d30f8e86b
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-rename_cleanup.patch) = 6055 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-cachemgr_objects.patch) = f010f54998b726998bc02a922f52ae2887a6f3fc
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-cachemgr_objects.patch) = 3b4d9f6547f9bbb47b46299b8b9862aed728430e
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-cachemgr_objects.patch) = 2625 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9-extaclauth.patch) = aaa6abdd081e24be771fa0ab8fb82eac2b16b854
+RMD160 (squid-2.5.9-2005022800/squid-2.5.STABLE9-extaclauth.patch) = 775220147c070a0313a68f0ad6fc8958c89c6f2b
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9-extaclauth.patch) = 1799 bytes
 SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
@@ -29,5 +89,5 @@ SHA1 (patch-bb) = cc0486eaf27f5796d83041e6b7a9562a134d8063
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
 SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7
 SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8
-SHA1 (patch-cc) = 58a0ee7bbe32fd259583d3f9622b929cb568820d
+SHA1 (patch-cc) = 53d72f0df09f1e2c4cc9b65a635d320e4d315cf5
 SHA1 (patch-cd) = 2a22aa071cc0f50b5ed87e31c0e531a5fc9dc2b7
diff --git a/www/squid/patches/patch-cc b/www/squid/patches/patch-cc
index 6c3cd1465ee..6b3c3f312c4 100644
--- a/www/squid/patches/patch-cc
+++ b/www/squid/patches/patch-cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-cc,v 1.2 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-cc,v 1.3 2005/03/31 16:44:25 taca Exp $
 
---- src/fs/diskd/store_io_diskd.c.orig	2002-08-09 05:17:41.000000000 +0900
+--- src/fs/diskd/store_io_diskd.c.orig	2005-03-28 23:52:36.000000000 +0900
 +++ src/fs/diskd/store_io_diskd.c
 @@ -37,9 +37,12 @@
  #include "squid.h"
@@ -15,4 +15,4 @@ $NetBSD: patch-cc,v 1.2 2004/08/22 15:11:09 taca Exp $
 +
  #include "store_diskd.h"
  
- static int storeDiskdSend(int, SwapDir *, int, storeIOState *, int, int, off_t);
+ static int storeDiskdSend(int, SwapDir *, int, storeIOState *, int, off_t, int);