Update squid package to 2.5.4. Most of changes are already in

squid 2.5.3nb4 package.

Changes to squid-2.5.STABLE4 (15 Sep 2003):
	- Lithuanian error messages added to the distribution
	- Bug #660: segfauld if more than one custom deny_info line
	- cache_dir disd documentation cleanup
	- check open of /dev/null to avoid 100% CPU loop in badly
	  configured chroot environments
	- documentation update on uri_whitespace to refer to the correct RFC
	- Bug #655: icmpRecv: recv: (11) Resource temporarily unavailable
	- Bug #683: external_acl does not wait for ident lookups to complete
	- aufs: Fix a minor use-after-free problem which could cause the
	  count of opening filedescriptors to grow larger than it should
	- Syntax changes to make GCC-3.3 accept Squid without complaints
	- Warning if CARP server defined in incorrect load factor order
	- neighbor_type_domain documentation update
	- http_header_access now works when using cache peers
	- high_memory_warning now uses sbrk as fallback mechanism on
	  platforms where neither mallinfo or mstats are available.
	- hosts_file now handles comments at the end of lines correcly
	- storeCheckCachable() Stats corrected for release_request and
	  wrong_content_length.
	- cachePeerPingsSent MIB type corrected
	- unused minimum_retry_timeout directive removed
	- Bug #702: ERR_TO_BIG spanish translation
	- Bug #705: Memory leak on deny_info TCP_RESET
	- Code cleanup to fix compile error in httpHeaderDelById
	- Bug #699: Host header now forwarded exactly where it was in the
	  original request to work around certain broken firewalls or
	  load balancers which fail if this header is too far into the
	  request headers.
	- Bug #704: Memory leak on reply_body_max_size
	- Bug #686: requests denied due to http_reply_access are now
	  logged with TCP_DENIED (instead of TCP_MISS, etc).
	- Bug #708: ie_refresh now sends no-cache to have the reload
	  request propagate properly in cache meshes
	- Bug #700: Crashes related to ftpTimeout: timeout in SENT_PASV state
	- Bug #709: cbdata.c:186: "c->valid" assertion due to peer
	  digest not found
	- Bug #710: round-robin cache_dir selection incorrectly
	  compares max-size.
	- Statistics corrections in HTTP header statitics
	- QUICKSTART cleanups
	- Bug #715: statCounter.syscalls.disk counters treated
	  inconsistently.  Now increment the counters in AUFS
	  functions and for unlinkd.
	- Improvements to the (experimental) COSS storage scheme.
	- Bug #721: User name field in access.log sometimes blank
	- Bug #94: assertion failed: http.c: "-1 == cfd ||
	  FD_SOCKET == fd_table[cfd].type"
	- Bug #716: assertion failed: client_side.c:1478: "size > 0"
	- Bug #732: aufs calculates number of threads and limits wrongly
	- Bug #663: Username not logged into access.log in case of /407
	- Bug #267: Form POSTing troubles with NTLM authentication
	  and occationally in differen other error conditions.
	- Bug #736: ICP dynamic timeout algorithm ignores multicast.
	- Bug #733: No explicit error message when ncsa_auth can't access
	  passwd file
	- Bug #267, #757: POST with NTLM stops after persistent connection
	  timeout
	- Bug #742: Wrong status code on access denials if delay_access
	  is used. Most notably 407 instead of 403 could be returned.
	- Bug #763: segfault if using ntlm in http_reply_access
	- Bug #638: assertion error if using proxy_auth in delay_access
	- Bug #756: segmentation fault if using ntlm proxy_auth in delay_access
	- The issue of reply_body_max_size limiting the size of error
	  messages no longer applies.
	- external_acl_type concurrency= option renamed to children= to
	  prepare for Squid-3 upgrades. Old syntax still accepted for the
	  duration of the Squid-2.5 release.
	- number of filedescriptors rounded down to an even multiple of 64
	  to work around issues in certain libc implementations.
	- winbind helpers less noisy in cache.log on restarts/shutdown.
	- Squid now automatically restarts helpers if too many of them
	  have crashed.

2 files changed, 8 insertions, 143 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index e29d4dadeaa..66ca635af02 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2003/09/11 15:48:24 taca Exp $
+# $NetBSD: Makefile,v 1.92 2003/09/16 15:58:39 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE3
-PKGNAME=	squid-2.5.3
-PKGREVISION=	5
+DISTNAME=	squid-2.5.STABLE4
+PKGNAME=	squid-2.5.4
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -10,52 +9,8 @@ MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 		ftp://ftp1.au.squid-cache.org/pub/squid/squid-2/STABLE/
 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-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-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 \
-		squid-2.5.STABLE3-syscalls.disk-counters.patch \
-		squid-2.5.STABLE3-coss-improvements.patch \
-		squid-2.5.STABLE3-blank-username-log.patch \
-		squid-2.5.STABLE3-coss-improvements-2.patch \
-		squid-2.5.STABLE3-mem_cfd.patch \
-		squid-2.5.STABLE3-aufs_open_fail.patch \
-		squid-2.5.STABLE3-aufs_threads.patch \
-		squid-2.5.STABLE3-digest_compile.patch \
-		squid-2.5.STABLE3-407_user_name.patch \
-		squid-2.5.STABLE3-multicast-ICP-timeout.patch \
-		squid-2.5.STABLE3-forwarded_for.patch \
-		squid-2.5.STABLE3-ncsa_auth_passwdfile.patch \
-		squid-2.5.STABLE3-POST-error.patch \
-		squid-2.5.STABLE3-auth_delay_pools.patch \
-		squid-2.5.STABLE3-http_reply_access_denied.patch \
-		squid-2.5.STABLE3-delay_access_auth.patch \
-		squid-2.5.STABLE3-external_acl_children.patch
+#PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+#PATCHFILES=
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index a19b070d1d9..479ed5bfafb 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,97 +1,7 @@
-$NetBSD: distinfo,v 1.38 2003/09/12 03:22:31 taca Exp $
+$NetBSD: distinfo,v 1.39 2003/09/16 15:58:40 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-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) = 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 (squid-2.5.3/squid-2.5.STABLE3-syscalls.disk-counters.patch) = ccafdad340b1813d1ec90349030314949e5f37ae
-Size (squid-2.5.3/squid-2.5.STABLE3-syscalls.disk-counters.patch) = 2478 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-coss-improvements.patch) = d776c2c20c590d1f9007bf7eaa53fa58ce010365
-Size (squid-2.5.3/squid-2.5.STABLE3-coss-improvements.patch) = 26803 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-blank-username-log.patch) = 8b0b2f62b78bdd6751b4d364be5f50f8774a573f
-Size (squid-2.5.3/squid-2.5.STABLE3-blank-username-log.patch) = 394 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-coss-improvements-2.patch) = c2b3a2d7abe19f688afb7b97703a52780b51fb70
-Size (squid-2.5.3/squid-2.5.STABLE3-coss-improvements-2.patch) = 21096 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-mem_cfd.patch) = 533ed4b0bd7d338e1212647124b3352ed9732bf2
-Size (squid-2.5.3/squid-2.5.STABLE3-mem_cfd.patch) = 8088 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-aufs_open_fail.patch) = 7f5fd4c5761fa5478f42269957916ccaf33ed92b
-Size (squid-2.5.3/squid-2.5.STABLE3-aufs_open_fail.patch) = 817 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-aufs_threads.patch) = 7c4e1ac6ded7d8d163ef5c5c5395d514ce7d75bc
-Size (squid-2.5.3/squid-2.5.STABLE3-aufs_threads.patch) = 4093 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-digest_compile.patch) = cfbf9d650268269bd6492ac19c00e799306b423d
-Size (squid-2.5.3/squid-2.5.STABLE3-digest_compile.patch) = 1445 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-407_user_name.patch) = b35eda048d1cea42dcaf6751c52939bb4d13c2d3
-Size (squid-2.5.3/squid-2.5.STABLE3-407_user_name.patch) = 723 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-multicast-ICP-timeout.patch) = f3b93425b2979249c7dad536fb77b0f0445e01ca
-Size (squid-2.5.3/squid-2.5.STABLE3-multicast-ICP-timeout.patch) = 1863 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-forwarded_for.patch) = 23d7206338454db02d63806b5ed2a7459072bde5
-Size (squid-2.5.3/squid-2.5.STABLE3-forwarded_for.patch) = 949 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-ncsa_auth_passwdfile.patch) = 04e7a62717daf24467888d6b0663ffca110ede08
-Size (squid-2.5.3/squid-2.5.STABLE3-ncsa_auth_passwdfile.patch) = 641 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-POST-error.patch) = 79a383c870810d1dc5bd48a479cb9b2868c536a9
-Size (squid-2.5.3/squid-2.5.STABLE3-POST-error.patch) = 9828 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-auth_delay_pools.patch) = e991189cbc21a6945f079b2544560c096f166159
-Size (squid-2.5.3/squid-2.5.STABLE3-auth_delay_pools.patch) = 1275 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-http_reply_access_denied.patch) = c1bb758ce585daae249e0ac4eaa48ea37b02c26b
-Size (squid-2.5.3/squid-2.5.STABLE3-http_reply_access_denied.patch) = 3268 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-delay_access_auth.patch) = ad29242a43f492871958e83c17367fa67fbf0597
-Size (squid-2.5.3/squid-2.5.STABLE3-delay_access_auth.patch) = 5527 bytes
-SHA1 (squid-2.5.3/squid-2.5.STABLE3-external_acl_children.patch) = 15bb8c2f808ae679490dadba5506b30bf0d089dd
-Size (squid-2.5.3/squid-2.5.STABLE3-external_acl_children.patch) = 2333 bytes
+SHA1 (squid-2.5.3/squid-2.5.STABLE4.tar.bz2) = 470a2697625cf6edb83ad6fe59af2e147f557e24
+Size (squid-2.5.3/squid-2.5.STABLE4.tar.bz2) = 1036704 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0