- Enable --enable-arp-acl configure option on FreeBSD, Linux and SunOS.

- Add 9 official patches.

Bump package revision, squid-2.5.6nb3.

* 2004-09-30 09:28 (Minor) CARP ignores cache_peer_domain/cache_peer_access
* 2004-09-27 18:23 (Minor) balance_on_multiple_ip squid.conf directive
* 2004-09-27 18:10 (Minor) Race window and poor responsiveness to aborted
  CONNECT requests
* 2004-09-25 21:42 (Cosmetic) Support the --program-prefix and other program
  name transforms
* 2004-09-25 21:08 (Cosmetic) Document the caseinsensitive basic auth option
* 2004-09-25 20:57 (Cosmetic) ncsa_auth is sensitive on line ending format
* 2004-09-25 12:00 (Medium) Add support for arbitrary headers acess controls
* 2004-09-26 21:22 (Minor) Limit internal send/receive buffers
* 2004-09-25 09:55 (Cosmetic) arp acls is supported on FreeBSD these days..

3 files changed, 91 insertions, 60 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index de9049211d4..b9075cb7bc8 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2004/10/03 00:18:27 tv Exp $
+# $NetBSD: Makefile,v 1.117 2004/10/03 16:06:18 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE6
 PKGNAME=	squid-2.5.6
-PKGREVISION=	2
+PKGREVISION=	3
 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/ \
@@ -33,7 +33,16 @@ PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.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
+		squid-2.5.STABLE6-Content-Disposition.patch \
+		squid-2.5.STABLE6-freebsd_arp_nowarning.patch \
+		squid-2.5.STABLE6-huge_tcp_windows.patch \
+		squid-2.5.STABLE6-arbitrary_headers.patch \
+		squid-2.5.STABLE6-ncsa_auth_lineendings.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive-2.patch \
+		squid-2.5.STABLE6-program-prefix.patch \
+		squid-2.5.STABLE6-CONNECT.patch \
+		squid-2.5.STABLE6-balance_on_multiple_ip.patch \
+		squid-2.5.STABLE6-CARP-cache_peer_access.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
@@ -70,6 +79,10 @@ RCD_SCRIPTS=		squid
 CONF_FILES+=		${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=		${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
 
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--enable-arp-acl
+.endif
+
 # Configuration options which can be overwritten by the user.
 SQUID_CONFIGURE_ARGS?=	--enable-auth=basic,digest,ntlm \
 			--enable-cachemgr-hostname=localhost \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 6b86b87f3b8..c2b7f2d6c10 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,56 +1,74 @@
-$NetBSD: distinfo,v 1.63 2004/09/03 22:58:20 taca Exp $
+$NetBSD: distinfo,v 1.64 2004/10/03 16:06:18 taca Exp $
 
-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 (squid-2.5.6nb3/squid-2.5.STABLE6.tar.bz2) = e9d6606949b3e7caedfac5d3959d33703a81bb67
+Size (squid-2.5.6nb3/squid-2.5.STABLE6.tar.bz2) = 1047199 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 0b89c01cda73e728439ba2600f991815969da043
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ldap_helpers.patch) = 41c62edf948dc6683e5fbc84aa5bc6bef88fed7e
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ldap_helpers.patch) = 25444 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 031f1306ee2584f2a68b7625cdc380664f5e63af
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6461 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-request_header_max_size.patch) = cad44074a4cdb9bcee48538a4287399b3211f49e
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-request_header_max_size.patch) = 765 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 531e0841020a287203925170ea515895dd0ecc6c
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-HEAD.patch) = 7c7a2c1d1bbb3cbeeeb8cce5fca15b196e5e042a
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-HEAD.patch) = 895 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ufs_create_error.patch) = d7d6c01047dda7e3f7bd9861fd23569e560d474c
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ufs_create_error.patch) = 847 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 236a04d28b29827ed3938d24b0cfe12a5acbad22
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-active_requests_delaypool.patch) = 62ca044bc57c84ee6963b69e8fd48e1e4a13bad1
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-client_db_gc.patch) = b5ad443c429245cd4cdf01d44c1beb02ff545442
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-client_db_gc.patch) = 3668 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ntlmtruncated.patch) = 88657150423327808b475ffff9999497fbd76657
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ntlmtruncated.patch) = 4383 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-grammar.patch) = 8761ab12ca0b09f1f7f8c33a952944ce9b4c596d
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-grammar.patch) = 50267 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-errorpage_quote.patch) = 3c0347dd66b1aaf1ed8313aba02feaaf453bd978
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-errorpage_quote.patch) = 377 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-heap_segfault.patch) = 0996cceec384ffe8ec89cff7ccbcaf9ead3b0e61
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-heap_segfault.patch) = 867 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-initgroups.patch) = c640e126659f453a02b3d1f0baed4251bd64da25
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-initgroups.patch) = 11060 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-external_acl_newlines.patch) = da8c002ab230670edcf9d3a815fda6890d68a09d
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-external_acl_newlines.patch) = 4965 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 0a63727cd4b72b65df063de0920afa610ffd5bf6
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ntlm_fetch_string.patch) = 1606 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 5ceb8d6a1df52053dda1b19fa23302247374509f
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = ee9e835033e7b24694c18a921df65240de8bc07b
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 13473 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-rotate_error.patch) = b0688938aeccde5d4af0fb777f751461bb5cda38
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-rotate_error.patch) = 2238 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-digest_crash.patch) = a32bef42fc250b73a1a4215eab8cc14664cf0fa5
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-digest_crash.patch) = 1250 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-acl_times.patch) = 8d0d5fd6eea03c8202ded68120dc81339f7f579e
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-acl_times.patch) = 3047 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-http_header_range.patch) = 578817fa1211efd152017f0af72422fa17a67803
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-http_header_range.patch) = 616 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-Content-Disposition.patch) = c0503e1aaa426e917cb414e713a006b0243e8714
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-Content-Disposition.patch) = 1815 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-freebsd_arp_nowarning.patch) = 9fb7bac5ccbc6fbe1223b972b7bac80b00eadb6a
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-freebsd_arp_nowarning.patch) = 797 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-huge_tcp_windows.patch) = e1a9d6c2c2fac0b6bafb88dd582be6ce56e8401c
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-huge_tcp_windows.patch) = 2559 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-arbitrary_headers.patch) = 72ffcfe22a7755a25dcaecdb4a0461e39991a8c6
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-arbitrary_headers.patch) = 16244 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-ncsa_auth_lineendings.patch) = 6f06ff24822a277cb1bf600a2b5e8b7b7d73da44
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-ncsa_auth_lineendings.patch) = 903 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-basic_auth_caseinsensitive-2.patch) = 96b424fc098ec6e9cb110c3576e1e2f30f0e879f
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-basic_auth_caseinsensitive-2.patch) = 1526 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-program-prefix.patch) = fcd0b838160354651f826458b997f785c38dd753
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-program-prefix.patch) = 5459 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-CONNECT.patch) = 75cd22f650c4a701e01557e52f3ecf2a940c6366
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-CONNECT.patch) = 4207 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-balance_on_multiple_ip.patch) = ec67d869ae9016dafcc7cc8c8cf88d3b32438e26
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-balance_on_multiple_ip.patch) = 6258 bytes
+SHA1 (squid-2.5.6nb3/squid-2.5.STABLE6-CARP-cache_peer_access.patch) = 09de3824d54dc327f04b3b4cf8b61eeca581c7fa
+Size (squid-2.5.6nb3/squid-2.5.STABLE6-CARP-cache_peer_access.patch) = 721 bytes
+SHA1 (patch-aa) = 8d760f58175cdb62af453fd1b07783859fa0bcf9
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 3f86e1ebbed..be869f4235a 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.13 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-aa,v 1.14 2004/10/03 16:06:18 taca Exp $
 
---- src/Makefile.in.orig	2004-06-08 20:37:22.000000000 +0900
+--- src/Makefile.in.orig	2004-10-01 18:30:32.000000000 +0900
 +++ src/Makefile.in
 @@ -380,14 +380,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -9,9 +9,9 @@ $NetBSD: patch-aa,v 1.13 2004/08/22 15:11:09 taca Exp $
 -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
 +DEFAULT_PID_FILE = /var/run/squid.pid
  DEFAULT_SWAP_DIR = $(localstatedir)/cache
- DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT)
- DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT)
- DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT)
+ DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
 -DEFAULT_ICON_DIR = $(datadir)/icons
 -DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 -DEFAULT_MIB_PATH = $(datadir)/mib.txt