Update squid package to 2.5.6 (squid 2.5.STALBE6 + official patches).

Squid 2.5.STABLE5 to 2.5.STABLE6:

* Several "Assertion error" bugs fixed
* Several "Segmentation fault" bugs fixes
* Corrects a security issue in the old ntlm_auth NTLM helper used in transparent NTLM authentication to a NT domain without using samba.
* Processing of Vary: * and Vary on error messages corrected
* a large number of minor and cosmetic bugfixes. See the list of squid-2.5.STABLE5 patches and the ChangeLog file for details.


2.5.STABLE56 official patches:

* 2004-08-20 08:18 (Major) NTLM authentication denial of service
* 2004-08-14 21:07 (Minor) external_acl does not handle newlines
* 2004-08-09 14:03 (Minor) Supplementary group memberships not set
* 2004-08-05 20:33 (Medium) Segfaults and other strange crashes when using heap policies
* 2004-08-06 11:05 (Cosmetic) Unknown %X errorpage codes incorrectly quoted
* 2004-08-17 12:22 (Cosmetic) Grammatical corrections in squid.conf.default
* 2004-07-27 21:52 (Minor) NTLM authentication truncated
* 2004-07-17 22:43 (Minor) Memory leak in client_db
* 2004-07-17 20:11 (Cosmetic) Add delay pools information to active_requests
* 2004-07-17 19:57 (Minor) case insensitive authentication
* 2004-07-17 19:48 (Cosmetic) Warn if cache_dir ufs can not create files
* 2004-07-17 16:33 (Cosmetic) HEAD requests may return stale information
* 2004-07-17 16:33 (Minor) Partial hit results in TCP_HIT, not TCP_MISS
* 2004-07-17 16:33 (Cosmetic) request_header_max_size configuration option doesn't work correctly
* 2004-07-29 13:29 (Minor) A large number of queued DNS lookups for the same domain
* 2004-08-10 09:40 (Minor) LDAP helpers update
* 2004-07-14 16:29 (Medium) storeCreate: no valid swapdirs for this object

14 files changed, 136 insertions, 179 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 002a3e602ac..244270ba8eb 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.113 2004/06/19 22:07:52 taca Exp $
+# $NetBSD: Makefile,v 1.114 2004/08/22 15:11:07 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE5
-PKGNAME=	squid-2.5.5
-PKGREVISION=	5
+DISTNAME=	squid-2.5.STABLE6
+PKGNAME=	squid-2.5.6
+PKGREVISION=	# empty
 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,38 +10,23 @@ 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.STABLE5-ntlm_assert.patch \
-		squid-2.5.STABLE5-ldap.patch \
-		squid-2.5.STABLE5-helper_warning.patch \
-		squid-2.5.STABLE5-pkgconfig.patch \
-		squid-2.5.STABLE5-vary.patch \
-		squid-2.5.STABLE5-lin22_poll.patch \
-		squid-2.5.STABLE5-version.patch \
-		squid-2.5.STABLE5-deny_info.patch \
-		squid-2.5.STABLE5-CONNECT_timeout.patch \
-		squid-2.5.STABLE5-cache_swap_log.patch \
-		squid-2.5.STABLE5-ntlm_warning.patch \
-		squid-2.5.STABLE5-rfc1035NameUnpack.patch \
-		squid-2.5.STABLE5-digest_blank.patch \
-		squid-2.5.STABLE5-post_assert.patch \
-		squid-2.5.STABLE5-spelling.patch \
-		squid-2.5.STABLE5-digest_ERR.patch \
-		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
-		squid-2.5.STABLE5-vary_negatively.patch \
-		squid-2.5.STABLE5-range_offset_limit.patch \
-		squid-2.5.STABLE5-large_cache_mem.patch \
-		squid-2.5.STABLE5-least-load.patch \
-		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
-		squid-2.5.STABLE5-debug_client_ip.patch \
-		squid-2.5.STABLE5-openbsd_m88k.patch \
-		squid-2.5.STABLE5-ftp_html_doctype.patch \
-		squid-2.5.STABLE5-dns_localhost.patch \
-		squid-2.5.STABLE5-msnt_auth_doc.patch \
-		squid-2.5.STABLE5-va_copy.patch \
-		squid-2.5.STABLE5-CONNECT_log_size.patch \
-		squid-2.5.STABLE5-proxy_abuse.patch \
-		squid-2.5.STABLE5-sasl_auth_SASL2.patch \
-		squid-2.5.STABLE5-ntlm_auth_overflow.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch \
+		squid-2.5.STABLE6-ntlmtruncated.patch \
+		squid-2.5.STABLE6-grammar.patch \
+		squid-2.5.STABLE6-errorpage_quote.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
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index cdcd20061f6..2aac10416bd 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,85 +1,55 @@
-$NetBSD: distinfo,v 1.61 2004/06/19 22:07:52 taca Exp $
+$NetBSD: distinfo,v 1.62 2004/08/22 15:11:08 taca Exp $
 
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5.tar.bz2) = fd632ebaad656566db11cf875868b19a9b4a71db
-Size (squid-2.5.5nb5/squid-2.5.STABLE5.tar.bz2) = 1044932 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_assert.patch) = 28c62c898a653269bee01540dd34c0fc7545b958
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_assert.patch) = 545 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ldap.patch) = b569f946c318f6cb7e84dd237bb33ce2022e7ccf
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ldap.patch) = 6245 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-helper_warning.patch) = 022664cebadd43b1999556bca8a6ea5178243544
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-helper_warning.patch) = 3302 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-pkgconfig.patch) = 8642b87f6ed143e13496d7a84e2b6772786c392e
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-pkgconfig.patch) = 3751 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-vary.patch) = d6d64680a3e841fcf756a63c7dc2ab916ae662d2
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-vary.patch) = 626 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-lin22_poll.patch) = 88fb540f1056ac6d1d627440a4f1858de44f5e92
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-lin22_poll.patch) = 1909 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-version.patch) = ebc1ee7794806d6e2429af89273307e490f5140c
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-version.patch) = 588 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-deny_info.patch) = 32a4b5a5752689818d354d139273fffa37aae25b
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-deny_info.patch) = 1282 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 7444d1df28e16c2eaf4f999136c3a7d87e9df858
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 2531 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-cache_swap_log.patch) = 7f9cc24a135b5299a9ed212c3ab54e9bf3c0bcd8
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_warning.patch) = 217bb0b556455d13ce3780edfaa50594c89719ed
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_warning.patch) = 900 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = fccb9ac30b3cf6cd6d2fdcf2a2e16f11f8e70455
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-digest_blank.patch) = 9a0d1febc08d3ded01c38bb24a342b2b550427a6
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-digest_blank.patch) = 4598 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-post_assert.patch) = 998ea80a6a4c3a657733ae00aac14e5b83bd7865
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-post_assert.patch) = 2953 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-spelling.patch) = bb41521fbd2ba2329568c6eeaa382e0c7b42124d
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-spelling.patch) = 3210 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-digest_ERR.patch) = c4dcaccfb474a6ec909c74aa2e17046fb60fd75f
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-digest_ERR.patch) = 1015 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 911a7cc196c8feb609816c952fcb89b5b81397c5
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 641 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-vary_negatively.patch) = fbf28253dc325e3e0bfd2f7884cfc245d2164f28
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-vary_negatively.patch) = 2308 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-range_offset_limit.patch) = 3c4399608b95ab341ba93609ac531818c7ba106f
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-range_offset_limit.patch) = 565 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-large_cache_mem.patch) = 67d9cd31327c6e88f9c1921ba0b8a8500029ffa7
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-least-load.patch) = 133b2dd6b64dec04c0fc421f1cc1d5a3ec2ebfa5
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-least-load.patch) = 2638 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 4d4c6de195e01da97a4acd9ef869d27665058a60
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-debug_client_ip.patch) = ede058b5a2580d09b338b1f0ee118e44db09812b
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-openbsd_m88k.patch) = fee467a13f364a6bcb8675eae746f05194dbd8a2
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-openbsd_m88k.patch) = 1360 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ftp_html_doctype.patch) = ec4430d1670b897b2c3b3d34ffcd7bc71a2fdf36
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-dns_localhost.patch) = 73be7a23e0aec3304c1597a8c003c40371b99a68
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-dns_localhost.patch) = 1408 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 9177b064a207fa0582fe18b6a965746bf7b3fa33
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-va_copy.patch) = 8bf37643f91687439b06b0e125c7044ed8ce3069
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-va_copy.patch) = 8337 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_log_size.patch) = 7ae32d244141571eed4cdf23a6c73e5f97676afa
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_log_size.patch) = 2011 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-proxy_abuse.patch) = 1922b5010241c2a748b5df43135a6a28b906caf2
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-proxy_abuse.patch) = 761 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-sasl_auth_SASL2.patch) = 832b2b1a1849be9aa5da8f88a622adc2262a4e13
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-sasl_auth_SASL2.patch) = 11268 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_auth_overflow.patch) = c9c26cbab3251561ef5d34e22ff1c9a11dc74775
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_auth_overflow.patch) = 3198 bytes
-SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
+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 (patch-aa) = 1bb64a2d302c206466d62596d1fefb83a060f9b7
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 867d12647d71e068645e8ee0ebc5740a005696f4
-SHA1 (patch-ae) = 5031183c7512573c8c8602d0b0541999f43343f2
-SHA1 (patch-ag) = 999f9f86cb85e28cbbf9073838f7f1ef8a7335d7
+SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
+SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
+SHA1 (patch-ag) = 37ec836fa74851d3ef4ec9534681d6c987ec2ec7
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
-SHA1 (patch-ak) = f4402cb429fd317650bd886a236eeb8476c5e33b
-SHA1 (patch-al) = 534f273ec63f6de0818f1f86a2b655eac4564213
-SHA1 (patch-an) = 932d0bd96ae80c92d4f0320b3ccf082a8373ceca
+SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
+SHA1 (patch-al) = db2377a7c1dc3f03f562f7b1fc1e15fc567c3983
+SHA1 (patch-an) = 1bc420b11173ec5aa2241f93a718d3de604676ff
 SHA1 (patch-ba) = c91bc26e4b6df2cb4b7042591efb4afd7c989462
-SHA1 (patch-bb) = 75840a5d893bd9aebe68380fdb4dfc594e5aac5e
+SHA1 (patch-bb) = b1a5cf09ea4c5f3a178676033046049e91290d6d
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
-SHA1 (patch-ca) = 652e35b253a6b75a3ac452773d681e70c5fc310d
-SHA1 (patch-cb) = 7fb49ee4f9e21dea9ca6e54da9a581866b225853
-SHA1 (patch-cc) = 9d9cf0b66768b3942c1683a7a908bfb0aa2fe0f2
-SHA1 (patch-cd) = 59e6db9cc8212738a2a3f58dc7994ff760c7d457
+SHA1 (patch-ca) = 132e45eea22cccf6678b5d920d913965f73f0db7
+SHA1 (patch-cb) = 603471bf702c3ff4480585dc59dc326f23a5f2e8
+SHA1 (patch-cc) = 58a0ee7bbe32fd259583d3f9622b929cb568820d
+SHA1 (patch-cd) = 2e2cea8d959bd637829d518544e07a0be8175bd3
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index eadf5251994..3f86e1ebbed 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $
+$NetBSD: patch-aa,v 1.13 2004/08/22 15:11:09 taca Exp $
 
---- src/Makefile.in.orig	2003-02-12 11:03:14.000000000 +0900
+--- src/Makefile.in.orig	2004-06-08 20:37:22.000000000 +0900
 +++ src/Makefile.in
-@@ -378,14 +378,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $
  
  DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
  
-@@ -836,20 +837,20 @@ CCDEPMODE = @CCDEPMODE@
+@@ -838,20 +839,20 @@ CCDEPMODE = @CCDEPMODE@
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
  	@$(NORMAL_INSTALL)
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $
  	done
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
-@@ -1048,7 +1049,7 @@ info-am:
+@@ -1050,7 +1051,7 @@ info-am:
  install-data-am: install-data-local install-dataDATA
  
  install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $
  
  install-info: install-info-recursive
  
-@@ -1066,7 +1067,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1068,7 +1069,7 @@ mostlyclean-am: mostlyclean-compile most
  
  uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
  	uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1149,19 +1150,12 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1151,19 +1152,12 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
  	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index c3e95ecfb25..5631212fc7e 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2004/06/07 00:27:02 taca Exp $
+$NetBSD: patch-ad,v 1.7 2004/08/22 15:11:09 taca Exp $
 
---- errors/Makefile.in.orig	2003-12-01 19:13:57.000000000 +0900
+--- errors/Makefile.in.orig	2004-06-08 20:37:11.000000000 +0900
 +++ errors/Makefile.in
-@@ -116,7 +116,7 @@ am__quote = @am__quote@
+@@ -118,7 +118,7 @@ am__quote = @am__quote@
  install_sh = @install_sh@
  makesnmplib = @makesnmplib@
  
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index 5e60c17faa5..6307ab91ee5 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2003/03/02 16:22:44 taca Exp $
+$NetBSD: patch-ae,v 1.7 2004/08/22 15:11:09 taca Exp $
 
---- icons/Makefile.in.orig	2003-03-03 01:16:42.000000000 +0900
+--- icons/Makefile.in.orig	2004-06-08 20:37:22.000000000 +0900
 +++ icons/Makefile.in
-@@ -147,7 +147,7 @@ ICON2 = anthony-bomb.gif \
+@@ -146,7 +146,7 @@ ICON2 = anthony-bomb.gif \
  		anthony-xpm.gif
  
  
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 02352977ded..c221257f985 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
+$NetBSD: patch-ag,v 1.16 2004/08/22 15:11:09 taca Exp $
 
---- configure.orig	2004-06-07 00:53:25.000000000 +0900
+--- configure.orig	2004-08-20 18:35:25.000000000 +0900
 +++ configure
 @@ -2219,7 +2219,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
      
  
  if true; then
-@@ -3814,6 +3814,7 @@ for ac_hdr in \
+@@ -3955,6 +3955,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -3864,6 +3865,7 @@ for ac_hdr in \
+@@ -4005,6 +4006,7 @@ for ac_hdr in \
  	syslog.h \
  	time.h \
  	unistd.h \
@@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
  	utime.h \
  	varargs.h \
  	byteswap.h \
-@@ -6059,44 +6061,39 @@ fi
+@@ -6200,43 +6202,38 @@ fi
  echo "$ac_t""$ac_cv_type_mode_t" 1>&6
  if test $ac_cv_type_mode_t = no; then
    cat >> confdefs.h <<\EOF
@@ -38,15 +38,15 @@ $NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
  fi
  
 -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6
--echo "configure:6031: checking for fd_mask" >&5
+-echo "configure:6210: checking for fd_mask" >&5
 -if eval "test \"`echo '$''{'ac_cv_type_fd_mask'+set}'`\" = set"; then
-+echo $ac_n "checking for fd_set""... $ac_c" 1>&6
-+echo "configure:6031: checking for fd_set" >&5
-+if eval "test \"`echo '$''{'ac_cv_have_fd_mask'+set}'`\" = set"; then
++ echo $ac_n "checking for fd_set""... $ac_c" 1>&6
++ echo "configure:6031: checking for fd_set" >&5
++ if eval "test \"`echo '$''{'ac_cv_have_fd_mask'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6036 "configure"
+ #line 6215 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
 -#if STDC_HEADERS
@@ -81,12 +81,11 @@ $NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
 -EOF
 -
 -fi
- 
 +echo "$ac_t""$ac_cv_have_fd_mask" 1>&6
  
+ 
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
- echo "configure:6065: checking size of off_t" >&5
-@@ -7373,8 +7370,8 @@ if test "$GCC" = "yes"; then
+@@ -7514,8 +7511,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -97,7 +96,7 @@ $NetBSD: patch-ag,v 1.15 2004/06/06 16:01:03 taca Exp $
  		;;
  	esac
  fi
-@@ -7467,6 +7464,7 @@ for ac_func in \
+@@ -7608,6 +7605,7 @@ for ac_func in \
  	setrlimit \
  	getrlimit \
  	setsid \
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
index 06122f20c0a..220af4bbc04 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.7 2004/06/06 16:01:03 taca Exp $
+$NetBSD: patch-ak,v 1.8 2004/08/22 15:11:09 taca Exp $
 
---- src/cf.data.pre.orig	2004-06-07 00:54:38.000000000 +0900
+--- src/cf.data.pre.orig	2004-08-20 18:35:25.000000000 +0900
 +++ src/cf.data.pre
-@@ -946,6 +946,23 @@ DOC_START
+@@ -952,6 +952,23 @@ DOC_START
  DOC_END
  
  
diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al
index 7b29e4ac744..4554d538fb9 100644
--- a/www/squid/patches/patch-al
+++ b/www/squid/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.4 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-al,v 1.5 2004/08/22 15:11:09 taca Exp $
 
---- src/structs.h.orig	Sat Oct 12 23:14:04 2002
+--- src/structs.h.orig	2004-08-20 18:35:25.000000000 +0900
 +++ src/structs.h
-@@ -525,6 +525,7 @@ struct _SquidConfig {
+@@ -527,6 +527,7 @@ struct _SquidConfig {
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 613f710bfa0..61ccd357659 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
+$NetBSD: patch-an,v 1.5 2004/08/22 15:11:09 taca Exp $
 
---- configure.in.orig	2004-06-07 00:53:25.000000000 +0900
+--- configure.in.orig	2004-08-20 18:35:25.000000000 +0900
 +++ configure.in
 @@ -489,7 +489,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1184,6 +1184,7 @@ AC_CHECK_HEADERS( \
+@@ -1207,6 +1207,7 @@ AC_CHECK_HEADERS( \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1234,6 +1235,7 @@ AC_CHECK_HEADERS( \
+@@ -1257,6 +1258,7 @@ AC_CHECK_HEADERS( \
  	syslog.h \
  	time.h \
  	unistd.h \
@@ -27,7 +27,7 @@ $NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
  	utime.h \
  	varargs.h \
  	byteswap.h \
-@@ -1409,8 +1411,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1432,8 +1434,17 @@ AC_CHECK_TYPE(pid_t, int)
  AC_CHECK_TYPE(size_t, unsigned int)
  AC_CHECK_TYPE(ssize_t, int)
  AC_CHECK_TYPE(off_t, int)
@@ -47,7 +47,7 @@ $NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1614,8 +1625,8 @@ if test "$GCC" = "yes"; then
+@@ -1637,8 +1648,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
@@ -58,7 +58,7 @@ $NetBSD: patch-an,v 1.4 2004/06/06 16:01:03 taca Exp $
  		;;
  	esac
  fi
-@@ -1710,6 +1721,7 @@ AC_CHECK_FUNCS(\
+@@ -1733,6 +1744,7 @@ AC_CHECK_FUNCS(\
  	setrlimit \
  	getrlimit \
  	setsid \
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 789263ce04b..417b950ab1c 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.3 2004/06/06 16:01:03 taca Exp $
+$NetBSD: patch-bb,v 1.4 2004/08/22 15:11:09 taca Exp $
 
---- include/autoconf.h.in.orig	2004-06-07 00:54:39.000000000 +0900
+--- include/autoconf.h.in.orig	2004-08-20 18:35:25.000000000 +0900
 +++ include/autoconf.h.in
-@@ -548,6 +548,9 @@
+@@ -551,6 +551,9 @@
  /* Define if you have the setpgrp function.  */
  #undef HAVE_SETPGRP
  
@@ -12,7 +12,7 @@ $NetBSD: patch-bb,v 1.3 2004/06/06 16:01:03 taca Exp $
  /* Define if you have the setrlimit function.  */
  #undef HAVE_SETRLIMIT
  
-@@ -656,6 +659,9 @@
+@@ -659,6 +662,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H
  
@@ -22,7 +22,7 @@ $NetBSD: patch-bb,v 1.3 2004/06/06 16:01:03 taca Exp $
  /* Define if you have the <malloc.h> header file.  */
  #undef HAVE_MALLOC_H
  
-@@ -824,6 +830,9 @@
+@@ -833,6 +839,9 @@
  /* Define if you have the <unistd.h> header file.  */
  #undef HAVE_UNISTD_H
  
diff --git a/www/squid/patches/patch-ca b/www/squid/patches/patch-ca
index b23d7ad0400..1f8028925d6 100644
--- a/www/squid/patches/patch-ca
+++ b/www/squid/patches/patch-ca
@@ -1,17 +1,18 @@
-$NetBSD: patch-ca,v 1.1 2002/12/01 05:36:51 grant Exp $
+$NetBSD: patch-ca,v 1.2 2004/08/22 15:11:09 taca Exp $
 
---- src/fs/diskd/diskd.c.orig	Thu Feb  8 05:56:54 2001
+--- src/fs/diskd/diskd.c.orig	2001-02-08 03:56:54.000000000 +0900
 +++ src/fs/diskd/diskd.c
-@@ -36,8 +36,11 @@
+@@ -36,9 +36,12 @@
  #include "squid.h"
  
  #include <sys/ipc.h>
 -#include <sys/msg.h>
  #include <sys/shm.h>
-+
+ 
 +#ifdef HAVE_SYS_MSG_H
 +#include <sys/msg.h>
 +#endif
- 
++
  #include "store_diskd.h"
  
+ #undef assert
diff --git a/www/squid/patches/patch-cb b/www/squid/patches/patch-cb
index 3f62191e654..6f4ef69eaa3 100644
--- a/www/squid/patches/patch-cb
+++ b/www/squid/patches/patch-cb
@@ -1,17 +1,18 @@
-$NetBSD: patch-cb,v 1.1 2002/12/01 05:36:51 grant Exp $
+$NetBSD: patch-cb,v 1.2 2004/08/22 15:11:09 taca Exp $
 
---- src/fs/diskd/store_dir_diskd.c.orig	Sun Jul 21 10:30:04 2002
+--- src/fs/diskd/store_dir_diskd.c.orig	2003-07-24 06:00:34.000000000 +0900
 +++ src/fs/diskd/store_dir_diskd.c
-@@ -36,8 +36,11 @@
+@@ -36,9 +36,12 @@
  #include "squid.h"
  
  #include <sys/ipc.h>
 -#include <sys/msg.h>
  #include <sys/shm.h>
-+
+ 
 +#ifdef HAVE_SYS_MSG_H
 +#include <sys/msg.h>
 +#endif
- 
++
  #include "store_diskd.h"
  
+ #define DefaultLevelOneDirs     16
diff --git a/www/squid/patches/patch-cc b/www/squid/patches/patch-cc
index 7ba380af94b..6c3cd1465ee 100644
--- a/www/squid/patches/patch-cc
+++ b/www/squid/patches/patch-cc
@@ -1,17 +1,18 @@
-$NetBSD: patch-cc,v 1.1 2002/12/01 05:36:51 grant Exp $
+$NetBSD: patch-cc,v 1.2 2004/08/22 15:11:09 taca Exp $
 
---- src/fs/diskd/store_io_diskd.c.orig	Fri Aug  9 06:17:41 2002
+--- src/fs/diskd/store_io_diskd.c.orig	2002-08-09 05:17:41.000000000 +0900
 +++ src/fs/diskd/store_io_diskd.c
-@@ -37,8 +37,11 @@
+@@ -37,9 +37,12 @@
  #include "squid.h"
  
  #include <sys/ipc.h>
 -#include <sys/msg.h>
  #include <sys/shm.h>
-+
+ 
 +#ifdef HAVE_SYS_MSG_H
 +#include <sys/msg.h>
 +#endif
- 
++
  #include "store_diskd.h"
  
+ static int storeDiskdSend(int, SwapDir *, int, storeIOState *, int, int, off_t);
diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd
index 9b71c821926..b7d577a6f81 100644
--- a/www/squid/patches/patch-cd
+++ b/www/squid/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.3 2004/03/30 08:17:46 agc Exp $
+$NetBSD: patch-cd,v 1.4 2004/08/22 15:11:09 taca Exp $
 
---- src/client_side.c	2004/03/30 08:10:51	1.1
-+++ src/client_side.c	2004/03/30 08:12:35
-@@ -2753,6 +2753,9 @@
+--- src/client_side.c.orig	2004-08-20 18:35:25.000000000 +0900
++++ src/client_side.c
+@@ -2752,6 +2752,9 @@ parseHttpRequest(ConnStateData * conn, m
  	    natLookup.nl_inip = http->conn->me.sin_addr;
  	    natLookup.nl_outip = http->conn->peer.sin_addr;
  	    natLookup.nl_flags = IPN_TCP;