Update squid package to 2.5.3nb5. Apply some official patches.

external_acl_type concurrency= renamed to children=

   synopsis To lessen confusion in later upgrades to Squid-3 the
	    external_acl_type concurrency= option has been renamed to
	    children= to match Squid-3 usage. This is done because
	    concurrency= has a completely different meaning in
	    squid-3. Squid-2.5 still accepts the old syntax to keep
	    compatibility within the Squid-2.5 release, but it is recommended
	    to start using the new syntax unless you need to be able to
	    easily downgrade to a earlier Squid-2.5 release.

   severity Cosmetic

   date	    2003-09-02 07:02

   versions Squid-2.5.STABLE3 and earlier

  platforms All

 workaround Make sure to read the Squid-3 releasenotes very carefully when
	    upgrading.


Assertion error or segmentation fault if using proxy_auth in delay_access

   synopsis If proxy_auth acl type is used in delay_access then Squid may
	    abort with an assertion error or segmentation fault. Notice: This
	    patch may change some error conditions to be logged with
	    TCP_DENIED rather than TCP_MISS.

   severity Medium

   date	    2003-09-01 20:01

   bugzilla #638, #756

   versions Squid-2.5

  platforms All

 workaround Don't use proxy_auth acl types in delay_access


Segmentation fault if proxy_auth with ntlm used in http_reply_access

   synopsis In configurations where authentication is enforced in http_access
	    and then reused in http_reply_access to further control access
	    levels Squid may segfault if the ntlm authentication scheme is
	    used.

   severity Medium

   date	    2003-09-01 20:01

   bugzilla #763

   versions Squid-2.5

  platforms All

 workaround Don't use proxy_type acls in http_reply_access or disable the use
	    of the ntlm authentication scheme (disabled by default)


code 407 instead of 403 for authenticated traffic-shaped user

   synopsis delay_access can disturb Squids logics on when to request a new
	    login from the user. Most notably if delay_access ends up in a
	    proxy_auth acl then any access denials will require a new login
	    but the opposite may also happen.

   severity Medium

   date	    2003-08-31 09:31

   bugzilla #742

   versions Squid-2.5 and earlier

   platforms All

  workaround make sure delay_access always ends up in the same class of ACL as
	     http_access does on the same request.


Form POSTing troubles with NTLM authentication or other error responses

   synopsis Large POST/PUT requests may fail with a "Connection reset" error
	    in the browser in situations where Squid immediately responds
	    with an error page. This is most notable when using NTLM
	    authentication but may also occur in a few other situations

   severity Medium

   date	    2003-08-28 22:28

   bugzilla #267, #757

   versions Squid-2.5 and earlier

  platforms All

 workaround Allow POST/PUT without requiring authentication if you are using
	    NTLM authentication.


No explicit error message when ncsa_auth (squid user) can't access passwd file

   synopsis ncsa_auth just exists if it can not read the supplied password
	    file, instead of reporting an error.

   severity Minor

   date	    2003-08-20 12:20

   bugzilla #733

   versions Squid-2.5 and earlier

  platforms All

 workaround If ncsa_auth exits for no apparent reason, verify that the given
	    ncsa password file is readable by the cache_effective_user.


forwarded_for off has no effect

   synopsis The patch for Bug #92 (squid-2.5.STABLE3-mem_cfd.patch) broke the
	    forwarded_for directive.

   severity Minor

   date	    2003-08-18 17:18

   bugzilla #750

   versions Squid-2.5.STABLE3 snapshots 2003-08-07 to 2003-08-18

  platforms All

 workaround Use anonymization via http_header_access to delete the
	    X-Forwarded-For header from forwarded requests. This is probably
	    preferred in any case.

2 files changed, 25 insertions, 4 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 4700ed67532..e29d4dadeaa 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2003/08/18 17:00:24 taca Exp $
+# $NetBSD: Makefile,v 1.91 2003/09/11 15:48:24 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE3
 PKGNAME=	squid-2.5.3
-PKGREVISION=	4
+PKGREVISION=	5
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -48,7 +48,14 @@ PATCHFILES=	squid-2.5.STABLE3-Lithuanian.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-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_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 56abfac4efd..4d27419fa40 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2003/08/18 17:00:24 taca Exp $
+$NetBSD: distinfo,v 1.37 2003/09/11 15:48:24 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
@@ -78,6 +78,20 @@ SHA1 (squid-2.5.3/squid-2.5.STABLE3-407_user_name.patch) = b35eda048d1cea42dcaf6
 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) = bf7e5e3eea7328514f1c1a8101ea88f3d8c2cea2
+Size (squid-2.5.3/squid-2.5.STABLE3-http_reply_access_denied.patch) = 1181 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 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0