Update squid package to 2.5.3nb2.

- (Minor) round-robin cache_dir selection incorrectly compares max-size
- (Major) cbdata.c:186: "c->valid" assertion due to peer digest not found
- (Major) Crash after ftpTimeout: timeout in SENT_PASV state
- (Minor) Requests denied by http_reply_access are not logged with TCP_DENIED
- (Minor) ie_refresh does not signal no-cache to peer caches
- (Medium) Client Socket Buffer leak on reply_body_max_size
- (Medium) Forward Host headers in place
- (Medium) Memory leak in deny_info TCP_RESET
- (Cosmetic) ERR_TOO_BIG Spanish translation
- (Cosmetic) minimum_retry_timeout unused
- (Minor) SNMP update of cachePeerPingsSent and cachePeerPingsAcked
- (Cosmetic) store_check_cachable_stats slghtly misleading
- (Minor) /etc/hosts and lines with comments after the host name
- (Minor) sbrk as fallback method for high_memory_warning
- (Minor) header_access fails when using peers
- (Cosmetic) neighbor_type_domain documentation update
- (Minor) issue warning if CARP load factor values decrease in the  cache_peer list
- (Cosmetic) Compile time warnings when using GCC-3.3
- (Minor) aufs Files queued for open counter mismatch
- (Minor) external_acl does not wait for ident lookups to complete
- (Minor) icmpRecv: recv: (11) Resource temporarily unavailable
- (Cosmetic) Incorrect RFC reference regarding URL syntax
- (Cosmetic) quote '%' character in logs
- (Cosmetic) check open("/dev/null") return value for errors.
- (Cosmetic) "cache_dir diskd" documentation update

Not all of the pathces are new but updated one.

2 files changed, 76 insertions, 9 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 06f6ed9bf12..3eae07038d5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2003/07/17 22:56:03 grant Exp $
+# $NetBSD: Makefile,v 1.88 2003/07/21 06:20:16 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE3
 PKGNAME=	squid-2.5.3
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -12,11 +12,34 @@ EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
 PATCHFILES=	squid-2.5.STABLE3-Lithuanian.patch \
-		squid-2.5.STABLE3-deny_info.patch \
 		squid-2.5.STABLE3-HttpHeaderTools.patch \
+		squid-2.5.STABLE3-deny_info.patch \
+		squid-2.5.STABLE3-cache_dir_doc.patch \
+		squid-2.5.STABLE3-devnull.patch \
+		squid-2.5.STABLE3-log_quote.patch \
+		squid-2.5.STABLE3-rfc_reference.patch \
+		squid-2.5.STABLE3-icmpRecv.patch \
 		squid-2.5.STABLE3-external_acl_ident.patch \
 		squid-2.5.STABLE3-aufs-openingfds.patch \
-		squid-2.5.STABLE3-gcc-3_3.patch
+		squid-2.5.STABLE3-gcc-3_3.patch \
+		squid-2.5.STABLE3-carpfactor.patch \
+		squid-2.5.STABLE3-neighbor_type_domain.patch \
+		squid-2.5.STABLE3-header_access_peer.patch \
+		squid-2.5.STABLE3-memwarnsbrk.patch \
+		squid-2.5.STABLE3-hostscomments.patch \
+		squid-2.5.STABLE3-store_check_cachable_stats.patch \
+		squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch \
+		squid-2.5.STABLE3-minimum_retry_timeout.patch \
+		squid-2.5.STABLE3-ERR_TOO_BIG_Spanish.patch \
+		squid-2.5.STABLE3-tcp_reset_leak.patch \
+		squid-2.5.STABLE3-hostheader.patch \
+		squid-2.5.STABLE3-reply_body_max_size.patch \
+		squid-2.5.STABLE3-ie_refresh.patch \
+		squid-2.5.STABLE3-http_reply_access-denied.patch \
+		squid-2.5.STABLE3-SENT_PASV.patch \
+		squid-2.5.STABLE3-peer_digest_not_found_assertion.patch \
+		squid-2.5.STABLE3-round_robin_max_size.patch
+
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index e2c0a8f9c9e..b404fc0159c 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,19 +1,63 @@
-$NetBSD: distinfo,v 1.33 2003/07/06 14:08:44 taca Exp $
+$NetBSD: distinfo,v 1.34 2003/07/21 06:20:17 taca Exp $
 
 SHA1 (squid-2.5.3/squid-2.5.STABLE3.tar.bz2) = 37ceb0a65e9ac644e52ba29cd8bd0c296dca64cb
 Size (squid-2.5.3/squid-2.5.STABLE3.tar.bz2) = 1028081 bytes
 SHA1 (squid-2.5.3/squid-2.5.STABLE3-Lithuanian.patch) = be9c09a8dab329cdcd73105d96fa68c1ab02b3b2
 Size (squid-2.5.3/squid-2.5.STABLE3-Lithuanian.patch) = 25761 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-deny_info.patch) = 665600974d6381d663bb6dbcd0d50967c1c40d36
-Size (squid-2.5.3/squid-2.5.STABLE3-deny_info.patch) = 741 bytes
 SHA1 (squid-2.5.3/squid-2.5.STABLE3-HttpHeaderTools.patch) = 97b5648b20379d8c98a120b332595155053db4e7
 Size (squid-2.5.3/squid-2.5.STABLE3-HttpHeaderTools.patch) = 916 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-deny_info.patch) = 665600974d6381d663bb6dbcd0d50967c1c40d36
+Size (squid-2.5.3/squid-2.5.STABLE3-deny_info.patch) = 741 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-cache_dir_doc.patch) = 763579c7b618247ad63cd3e8a20a59deb9cc4f98
+Size (squid-2.5.3/squid-2.5.STABLE3-cache_dir_doc.patch) = 499 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-devnull.patch) = 0951fa67c99c550bcb22f54ec7cdcbd158a854c3
+Size (squid-2.5.3/squid-2.5.STABLE3-devnull.patch) = 498 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-log_quote.patch) = fbb5403c9bdb63ab77df3bac5f5e4395499c0866
+Size (squid-2.5.3/squid-2.5.STABLE3-log_quote.patch) = 792 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-rfc_reference.patch) = 7e82f72cd830d7903f56661803c1afb734cf888d
+Size (squid-2.5.3/squid-2.5.STABLE3-rfc_reference.patch) = 850 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-icmpRecv.patch) = a857f83360200186a01c4ff57a42d231736ac32d
+Size (squid-2.5.3/squid-2.5.STABLE3-icmpRecv.patch) = 654 bytes
 SHA1 (squid-2.5.3/squid-2.5.STABLE3-external_acl_ident.patch) = e46b7bcaf0d94f2ff75d4160d4c5689d937b03e4
 Size (squid-2.5.3/squid-2.5.STABLE3-external_acl_ident.patch) = 903 bytes
 SHA1 (squid-2.5.3/squid-2.5.STABLE3-aufs-openingfds.patch) = 9fa576f4f6bd4ebdb1b60faa30683784e12b242b
 Size (squid-2.5.3/squid-2.5.STABLE3-aufs-openingfds.patch) = 851 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-gcc-3_3.patch) = 12cae6c36c92968338264b91df13f5737e2e265c
-Size (squid-2.5.3/squid-2.5.STABLE3-gcc-3_3.patch) = 5452 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-gcc-3_3.patch) = 2428ae815331d2d1f156b6c3b653df1f95a554fc
+Size (squid-2.5.3/squid-2.5.STABLE3-gcc-3_3.patch) = 17191 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-carpfactor.patch) = 2033cd84196fd82fdc9246b0780d39936f4725bb
+Size (squid-2.5.3/squid-2.5.STABLE3-carpfactor.patch) = 870 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-neighbor_type_domain.patch) = 813b1f85afea173e34f34281233ca073fd444343
+Size (squid-2.5.3/squid-2.5.STABLE3-neighbor_type_domain.patch) = 739 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-header_access_peer.patch) = 6434e62f93e9245c9e4f8e7c4404d381de066a84
+Size (squid-2.5.3/squid-2.5.STABLE3-header_access_peer.patch) = 511 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-memwarnsbrk.patch) = 4de86afdb84855173642ec99c4b610343283b639
+Size (squid-2.5.3/squid-2.5.STABLE3-memwarnsbrk.patch) = 529 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-hostscomments.patch) = aa5cc8136e7c201d30a05958f4f0dde8807560ca
+Size (squid-2.5.3/squid-2.5.STABLE3-hostscomments.patch) = 485 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 4cc01c27ebdcbb853bc966ce8510947c38caea94
+Size (squid-2.5.3/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 1815 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = 80254088adcb2af78322680820a9f06b461dbb2f
+Size (squid-2.5.3/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = 1051 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-minimum_retry_timeout.patch) = 28ea2edba658f308ba9c677bb5004a44cd47dc55
+Size (squid-2.5.3/squid-2.5.STABLE3-minimum_retry_timeout.patch) = 2293 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-ERR_TOO_BIG_Spanish.patch) = a380afc6b5a81e5001a2804d0612b382b51935d0
+Size (squid-2.5.3/squid-2.5.STABLE3-ERR_TOO_BIG_Spanish.patch) = 2411 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-tcp_reset_leak.patch) = c550bdfe5f049a0ff4285da1a4729a2441dd7237
+Size (squid-2.5.3/squid-2.5.STABLE3-tcp_reset_leak.patch) = 522 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-hostheader.patch) = ae2181cc549629abb543bbc08a35d3645f593468
+Size (squid-2.5.3/squid-2.5.STABLE3-hostheader.patch) = 1630 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-reply_body_max_size.patch) = 882a85bf0a9316fba249808ce436828db9dffccb
+Size (squid-2.5.3/squid-2.5.STABLE3-reply_body_max_size.patch) = 764 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-ie_refresh.patch) = 1b5c2fbeea08ae4b3e6c52acdac9a63da19f52fb
+Size (squid-2.5.3/squid-2.5.STABLE3-ie_refresh.patch) = 645 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-http_reply_access-denied.patch) = 22d9cd846a4d9721470330e403567dee964e7713
+Size (squid-2.5.3/squid-2.5.STABLE3-http_reply_access-denied.patch) = 551 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-SENT_PASV.patch) = d2309e94fa8c0a3efa846df00ceda34c68df1c51
+Size (squid-2.5.3/squid-2.5.STABLE3-SENT_PASV.patch) = 1325 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = 7d795418b8b322e0c04782feeae301c8fd734df4
+Size (squid-2.5.3/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = 794 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE3-round_robin_max_size.patch) = 89aa269b95f79115b8870c67971ac6d1176b59f8
+Size (squid-2.5.3/squid-2.5.STABLE3-round_robin_max_size.patch) = 688 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0