Update squid package, applying official patches.

* 2004-09-01 13:59 (Minor)
    Squid does not recognise Content-Disposition header

* 2004-09-01 13:09 (Cosmetic)
    cachemge config dumps mixed up Range and Request-Range headers

* 2004-09-01 12:25 (Minor)
    acl time fails to parse multiple time specifications correctly

* 2004-08-28 22:46 (Minor)
    Segfault in CvtBin / authenticateDigestHandleReply

* 2004-08-25 21:11 (Minor)
    assertion failed: comm.c:430: "n_ufs_dirs <= Config.cacheSwap.n_configured"

* 2004-08-25 20:30 (Minor)
    Temporary NTLM memory leak with challenge reuse enabled

* 2004-08-25 20:30 (Medium)
    Memory leaks when using NTLM authentication without challenge reuse

Bump PKGREVISION.

2 files changed, 61 insertions, 40 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 244270ba8eb..821077dff38 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2004/08/22 15:11:07 taca Exp $
+# $NetBSD: Makefile,v 1.115 2004/09/03 22:58:19 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE6
 PKGNAME=	squid-2.5.6
-PKGREVISION=	# empty
+PKGREVISION=	1
 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/ \
@@ -26,7 +26,14 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
 		squid-2.5.STABLE6-heap_segfault.patch \
 		squid-2.5.STABLE6-initgroups.patch \
 		squid-2.5.STABLE6-external_acl_newlines.patch \
-		squid-2.5.STABLE6-ntlm_fetch_string.patch
+		squid-2.5.STABLE6-ntlm_fetch_string.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-rotate_error.patch \
+		squid-2.5.STABLE6-digest_crash.patch \
+		squid-2.5.STABLE6-acl_times.patch \
+		squid-2.5.STABLE6-http_header_range.patch \
+		squid-2.5.STABLE6-Content-Disposition.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 2aac10416bd..6b86b87f3b8 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,41 +1,55 @@
-$NetBSD: distinfo,v 1.62 2004/08/22 15:11:08 taca Exp $
+$NetBSD: distinfo,v 1.63 2004/09/03 22:58:20 taca Exp $
 
-SHA1 (squid-2.5.6/squid-2.5.STABLE6.tar.bz2) = e9d6606949b3e7caedfac5d3959d33703a81bb67
-Size (squid-2.5.6/squid-2.5.STABLE6.tar.bz2) = 1047199 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 0b89c01cda73e728439ba2600f991815969da043
-Size (squid-2.5.6/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-ldap_helpers.patch) = 41c62edf948dc6683e5fbc84aa5bc6bef88fed7e
-Size (squid-2.5.6/squid-2.5.STABLE6-ldap_helpers.patch) = 25444 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 031f1306ee2584f2a68b7625cdc380664f5e63af
-Size (squid-2.5.6/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6461 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-request_header_max_size.patch) = cad44074a4cdb9bcee48538a4287399b3211f49e
-Size (squid-2.5.6/squid-2.5.STABLE6-request_header_max_size.patch) = 765 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 531e0841020a287203925170ea515895dd0ecc6c
-Size (squid-2.5.6/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-HEAD.patch) = 7c7a2c1d1bbb3cbeeeb8cce5fca15b196e5e042a
-Size (squid-2.5.6/squid-2.5.STABLE6-HEAD.patch) = 895 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-ufs_create_error.patch) = d7d6c01047dda7e3f7bd9861fd23569e560d474c
-Size (squid-2.5.6/squid-2.5.STABLE6-ufs_create_error.patch) = 847 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 236a04d28b29827ed3938d24b0cfe12a5acbad22
-Size (squid-2.5.6/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-active_requests_delaypool.patch) = 62ca044bc57c84ee6963b69e8fd48e1e4a13bad1
-Size (squid-2.5.6/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-client_db_gc.patch) = b5ad443c429245cd4cdf01d44c1beb02ff545442
-Size (squid-2.5.6/squid-2.5.STABLE6-client_db_gc.patch) = 3668 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-ntlmtruncated.patch) = 88657150423327808b475ffff9999497fbd76657
-Size (squid-2.5.6/squid-2.5.STABLE6-ntlmtruncated.patch) = 4383 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-grammar.patch) = 8761ab12ca0b09f1f7f8c33a952944ce9b4c596d
-Size (squid-2.5.6/squid-2.5.STABLE6-grammar.patch) = 50267 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-errorpage_quote.patch) = 3c0347dd66b1aaf1ed8313aba02feaaf453bd978
-Size (squid-2.5.6/squid-2.5.STABLE6-errorpage_quote.patch) = 377 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-heap_segfault.patch) = 0996cceec384ffe8ec89cff7ccbcaf9ead3b0e61
-Size (squid-2.5.6/squid-2.5.STABLE6-heap_segfault.patch) = 867 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-initgroups.patch) = c640e126659f453a02b3d1f0baed4251bd64da25
-Size (squid-2.5.6/squid-2.5.STABLE6-initgroups.patch) = 11060 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-external_acl_newlines.patch) = da8c002ab230670edcf9d3a815fda6890d68a09d
-Size (squid-2.5.6/squid-2.5.STABLE6-external_acl_newlines.patch) = 4965 bytes
-SHA1 (squid-2.5.6/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 0a63727cd4b72b65df063de0920afa610ffd5bf6
-Size (squid-2.5.6/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6.tar.bz2) = e9d6606949b3e7caedfac5d3959d33703a81bb67
+Size (squid-2.5.6nb1/squid-2.5.STABLE6.tar.bz2) = 1047199 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 0b89c01cda73e728439ba2600f991815969da043
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ldap_helpers.patch) = 41c62edf948dc6683e5fbc84aa5bc6bef88fed7e
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ldap_helpers.patch) = 25444 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 031f1306ee2584f2a68b7625cdc380664f5e63af
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6461 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-request_header_max_size.patch) = cad44074a4cdb9bcee48538a4287399b3211f49e
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-request_header_max_size.patch) = 765 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 531e0841020a287203925170ea515895dd0ecc6c
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-HEAD.patch) = 7c7a2c1d1bbb3cbeeeb8cce5fca15b196e5e042a
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-HEAD.patch) = 895 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_create_error.patch) = d7d6c01047dda7e3f7bd9861fd23569e560d474c
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ufs_create_error.patch) = 847 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 236a04d28b29827ed3938d24b0cfe12a5acbad22
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-active_requests_delaypool.patch) = 62ca044bc57c84ee6963b69e8fd48e1e4a13bad1
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-client_db_gc.patch) = b5ad443c429245cd4cdf01d44c1beb02ff545442
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-client_db_gc.patch) = 3668 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlmtruncated.patch) = 88657150423327808b475ffff9999497fbd76657
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlmtruncated.patch) = 4383 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-grammar.patch) = 8761ab12ca0b09f1f7f8c33a952944ce9b4c596d
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-grammar.patch) = 50267 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-errorpage_quote.patch) = 3c0347dd66b1aaf1ed8313aba02feaaf453bd978
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-errorpage_quote.patch) = 377 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-heap_segfault.patch) = 0996cceec384ffe8ec89cff7ccbcaf9ead3b0e61
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-heap_segfault.patch) = 867 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-initgroups.patch) = c640e126659f453a02b3d1f0baed4251bd64da25
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-initgroups.patch) = 11060 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-external_acl_newlines.patch) = da8c002ab230670edcf9d3a815fda6890d68a09d
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-external_acl_newlines.patch) = 4965 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 0a63727cd4b72b65df063de0920afa610ffd5bf6
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 5ceb8d6a1df52053dda1b19fa23302247374509f
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = ee9e835033e7b24694c18a921df65240de8bc07b
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 13473 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-rotate_error.patch) = b0688938aeccde5d4af0fb777f751461bb5cda38
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-rotate_error.patch) = 2238 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-digest_crash.patch) = a32bef42fc250b73a1a4215eab8cc14664cf0fa5
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-digest_crash.patch) = 1250 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-acl_times.patch) = 8d0d5fd6eea03c8202ded68120dc81339f7f579e
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-acl_times.patch) = 3047 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-http_header_range.patch) = 578817fa1211efd152017f0af72422fa17a67803
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-http_header_range.patch) = 616 bytes
+SHA1 (squid-2.5.6nb1/squid-2.5.STABLE6-Content-Disposition.patch) = c0503e1aaa426e917cb414e713a006b0243e8714
+Size (squid-2.5.6nb1/squid-2.5.STABLE6-Content-Disposition.patch) = 1815 bytes
 SHA1 (patch-aa) = 1bb64a2d302c206466d62596d1fefb83a060f9b7
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0