update squid pacakge to 2.5.3 (squid-2.5.STABLE3).

Changes to squid-2.5.STABLE3 (25 May 2003):

	- Bug #573: Occational false negatives in external acl lookups
	- Bug #577: assertion failed: cbdata.c:224: "c->y == c" when
	  external_acl helpers crashes
	- Bug #590: Squid may hang or behave oddly on shutdown while
	  requests is being processed.
	- Bug #590: external acl lookups does not deal well with queue
	  overload
	- cache_effective_user documentation update
	- cache_peer documentation update for htcp and carp
	- Bug #600: The example header_access paranoid setting is
	  missing WWW-Authenticate
	- Bug #605: Segmentation fault in idnsGrokReply() on certain
	  platforms
	- Fixes to build properly on AIX 5
	- Bug #574: wb_group updated to version 1.1 to make group names
	  case insensitive and correct a segfault issue in the helper
	- SNMP mib updates to make cacheNumObjCount,
	  cacheCurrentUnlinkRequests, cacheCurrentSwapSize and cacheClients
	  correctly report as gauges (was reporting as counters).
	- Woraround for --enable-ssl Kerberos issue on RedHat 9
	- Bug #579: Close and repopen log files on "squid -k reconfigure"
	- Bug #598: squid_ldap_auth could segfault if LDAP server is
	  unavailable
	- Bug #609,#612: msntauth helper fixes in dealing with large
 	  or non-existing allow/deny user files.
	- Bug #620: acl ident REQUIRED matches even if the ident lookup fails
	- Bug #432: reply_body_max_size fails with ident or proxy_auth acls
	  and also fails to block large objects where the content-length
	  is not known
	- Bug #606: Basic auth looping and gets stuck at high CPU usage when
	  multiple proxy_auth ACLs combined in one line and login fails.
	- squid_ldap_auth updated with support for TLS and SSL
	- Bug #623: segfault if using negated external acls in certain
	  configurations involving other acls later on the same http_access
	  line.
	- Bug #622: wb_group helper update to version 1.2 to ass support for
	  Domain-Qualified groups refering to groups in a specific domain
	- Bug #596: logic error in poll() error management
	- Bug #597: logic errors in error management
	- Bug #591: segmentation fault in authentication on "squid -k debug"
	- Bug #587: smb_auth fails on complex logins involving domain names
	  or other odd characters
	- Bug #558, #587: smb_auth.pl fails on complex logins involving
          domain names or other odd characters
	- Bug #643: external_acl fails with ttl=0 due to a change introduced
	  by the patch for Bug #553 in 2.5.STABLE2.
	- Bug #630: minor issues in digest authantication causing random
	  authentication failures and incompability with many mainstream
	  browser digest implementations due to browser qop bugs. To deal
	  with those broken browser nonce_stricness now defaults to off,
	  and two new digest options have been added (check_nonce_count
	  and post_workaround) to allow workarounds to other quite bad
	  browser bugs if needed.
	- Bug #644: digest authentication fails on requests with one
	  or more comma in the requested URL
	- Bug #648: deny_info TCP_RESET not working. The fix for this also
	  adds the ability to send redirects.

3 files changed, 22 insertions, 121 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index a35d54a2e70..062ff565de1 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2003/05/24 12:31:34 taca Exp $
+# $NetBSD: Makefile,v 1.85 2003/05/25 14:58:16 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE2
-PKGNAME=	squid-2.5.2
-PKGREVISION=	4
+DISTNAME=	squid-2.5.STABLE3
+PKGNAME=	squid-2.5.3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -11,37 +10,7 @@ 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.STABLE2-concurrent_external_acl.patch \
-		squid-2.5.STABLE2-external_acl_crash.patch \
-		squid-2.5.STABLE2-shutdown.patch \
-		squid-2.5.STABLE2-external_acl_overload.patch \
-		squid-2.5.STABLE2-cache_effective_user_docs.patch \
-		squid-2.5.STABLE2-cache_peer_docs.patch \
-		squid-2.5.STABLE2-header_access_paranoid.patch \
-		squid-2.5.STABLE2-dns_root_label.patch \
-		squid-2.5.STABLE2-aix5.patch \
-		wb_group-1.1.patch \
-		squid-2.5.STABLE2-snmp_gauges.patch \
-		squid-2.5.STABLE2-redhat9-ssl.patch \
-		squid-2.5.STABLE2-reconfig_logs.patch \
-		squid-2.5.STABLE2-ldap_auth_unavail.patch \
-		squid-2.5.STABLE2-msntauth.patch \
-		squid-2.5.STABLE2-ident_REQUIRED.patch \
-		squid-2.5.STABLE2-reply_body_max_size.patch \
-		squid-2.5.STABLE2-acl_lookup_loop.patch \
-		squid-2.5.STABLE2-squid_ldap_auth.patch \
-		squid-2.5.STABLE2-external_lookup.patch \
-		wb_group-1.2.patch \
-		squid-2.5.STABLE2-comm-select.patch \
-		squid-2.5.STABLE2-unreachcode.patch \
-		squid-2.5.STABLE2-authdebug.patch \
-		squid-2.5.STABLE2-aclregression.patch \
-		squid-2.5.STABLE2-smb_auth.patch \
-		squid-2.5.STABLE2-smb_auth_pl.patch \
-		squid-2.5.STABLE2-external_acl_ttl0.patch \
-		squid-2.5.STABLE2-digest_nonce_count.patch \
-		squid-2.5.STABLE2-digestcomma.patch \
-		squid-2.5.STABLE2-deny_info_reset.patch
+PATCHFILES=	squid-2.5.STABLE3-Lithuanian.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@netbsd.org
@@ -49,7 +18,7 @@ HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
 USE_PERL5=	build
-DIST_SUBDIR=	squid-2.5.2
+DIST_SUBDIR=	squid-2.5.3
 DOCDIR=		${PREFIX}/share/doc/squid
 EXAMPLESDIR=	${PREFIX}/share/examples/squid
 
@@ -102,14 +71,6 @@ OPTIONAL_FILES+= libexec/ip_user_check libexec/smb_auth libexec/smb_auth.sh
 OPTIONAL_FILES+= libexec/squid_unix_group libexec/wb_auth libexec/wb_group
 OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8
 
-# workaround for wb_group-1.1.patch.
-# using somewhat redundant regexp for preventing RCS Id's substitution.
-pre-patch:
-	cd ${WRKSRC}/helpers/external_acl/winbind_group; \
-		${MV} wb_check_group.c wb_check_group.c.ORIG; \
-		${SED} -e 's/\$$\Id:.*\$$/\$$\Id\$$/' wb_check_group.c.ORIG > \
-			wb_check_group.c
-
 pre-install:
 	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
diff --git a/www/squid/distinfo b/www/squid/distinfo
index f0f843fa951..bd43f81e62d 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,75 +1,15 @@
-$NetBSD: distinfo,v 1.31 2003/05/24 12:31:34 taca Exp $
+$NetBSD: distinfo,v 1.32 2003/05/25 14:58:16 taca Exp $
 
-SHA1 (squid-2.5.2/squid-2.5.STABLE2.tar.bz2) = e319b3cfdf5d92df9ef39da048fc4235d9cc5154
-Size (squid-2.5.2/squid-2.5.STABLE2.tar.bz2) = 1020696 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-concurrent_external_acl.patch) = 8f6cacd9bfeda386006a417383d9f8f5049fd8da
-Size (squid-2.5.2/squid-2.5.STABLE2-concurrent_external_acl.patch) = 730 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_crash.patch) = 79d2cd10f832513a547b3d77bf09c2c359a6831c
-Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_crash.patch) = 1356 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-shutdown.patch) = 5a8e3915c8bfa9374998e69c50bc62732222a387
-Size (squid-2.5.2/squid-2.5.STABLE2-shutdown.patch) = 890 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_overload.patch) = f74a09f17bd1722f0ef4c0b51e892e0ac70c6fbd
-Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_overload.patch) = 977 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-cache_effective_user_docs.patch) = 31f899fa0bbbe09ac196d8458331c472d59ccb69
-Size (squid-2.5.2/squid-2.5.STABLE2-cache_effective_user_docs.patch) = 1532 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-cache_peer_docs.patch) = 130f145e06b5da2589cfa0bf2216ce447289e998
-Size (squid-2.5.2/squid-2.5.STABLE2-cache_peer_docs.patch) = 1324 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-header_access_paranoid.patch) = b330d73d796e974caf7af2cf1970cd2bc0d8963e
-Size (squid-2.5.2/squid-2.5.STABLE2-header_access_paranoid.patch) = 524 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-dns_root_label.patch) = e6b1b319ab8a58e4ef9111e4301caed27b72f171
-Size (squid-2.5.2/squid-2.5.STABLE2-dns_root_label.patch) = 719 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-aix5.patch) = 2b3e51af316512654fee851a0fd8c9c101b51747
-Size (squid-2.5.2/squid-2.5.STABLE2-aix5.patch) = 2545 bytes
-SHA1 (squid-2.5.2/wb_group-1.1.patch) = 16768e2acb4e9a223cd1e7e85fac5d7ce01af81a
-Size (squid-2.5.2/wb_group-1.1.patch) = 10273 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-snmp_gauges.patch) = 128b85509df14ce758021029c3ffbeb9b0edde66
-Size (squid-2.5.2/squid-2.5.STABLE2-snmp_gauges.patch) = 4111 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-redhat9-ssl.patch) = 9e091cd97ee0dbb6e757408f33d92c88cdc5fa81
-Size (squid-2.5.2/squid-2.5.STABLE2-redhat9-ssl.patch) = 1336 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-reconfig_logs.patch) = 58facfe58925d47bb4de0ea99523bd1d570c0ece
-Size (squid-2.5.2/squid-2.5.STABLE2-reconfig_logs.patch) = 853 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-ldap_auth_unavail.patch) = 6da92b65a6659330c7c715613ef935b02393891b
-Size (squid-2.5.2/squid-2.5.STABLE2-ldap_auth_unavail.patch) = 599 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-msntauth.patch) = d5d2f346a479a9ef960dfff4d683bbd3db9b6550
-Size (squid-2.5.2/squid-2.5.STABLE2-msntauth.patch) = 1696 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-ident_REQUIRED.patch) = d70765268f5820393c5d254756535acf8ce671ce
-Size (squid-2.5.2/squid-2.5.STABLE2-ident_REQUIRED.patch) = 650 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-reply_body_max_size.patch) = 8626969a543fa8c42f2a0a3af2142d6901dbe919
-Size (squid-2.5.2/squid-2.5.STABLE2-reply_body_max_size.patch) = 6548 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-acl_lookup_loop.patch) = 3067187cd63f7e4dbc472700b5ddcc6e06ae9dc2
-Size (squid-2.5.2/squid-2.5.STABLE2-acl_lookup_loop.patch) = 3773 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-squid_ldap_auth.patch) = 8f5eb18f4b6a8c1542232604a8629658dc909b20
-Size (squid-2.5.2/squid-2.5.STABLE2-squid_ldap_auth.patch) = 19060 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_lookup.patch) = a53fe442c7ed6e5e44ba795762c1497e57fc3d9e
-Size (squid-2.5.2/squid-2.5.STABLE2-external_lookup.patch) = 2431 bytes
-SHA1 (squid-2.5.2/wb_group-1.2.patch) = 55207a24ab2c7c7e8cb9f25b379404d18835f3bf
-Size (squid-2.5.2/wb_group-1.2.patch) = 9032 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-comm-select.patch) = fbbeb5459c295aac0969056cd742da331b49b0a0
-Size (squid-2.5.2/squid-2.5.STABLE2-comm-select.patch) = 675 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-unreachcode.patch) = a6fed5b9a07e456c9a7df313261548cac37aac9b
-Size (squid-2.5.2/squid-2.5.STABLE2-unreachcode.patch) = 12318 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-authdebug.patch) = 5bd3a18425d47a22f7de44096f54aae9b6bed1c8
-Size (squid-2.5.2/squid-2.5.STABLE2-authdebug.patch) = 1085 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-aclregression.patch) = 33bf5b378574b17fbd428bd59f1355f212348c8d
-Size (squid-2.5.2/squid-2.5.STABLE2-aclregression.patch) = 784 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-smb_auth.patch) = ce81b5bd84964f59ffd306c9d2ff5e226719320a
-Size (squid-2.5.2/squid-2.5.STABLE2-smb_auth.patch) = 817 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-smb_auth_pl.patch) = 64b0feeeb03efaf2ffd5c0197ccb6295d2d6325a
-Size (squid-2.5.2/squid-2.5.STABLE2-smb_auth_pl.patch) = 673 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-external_acl_ttl0.patch) = 4f245b75c0a48e7a612ae444275c158fb3f55ec0
-Size (squid-2.5.2/squid-2.5.STABLE2-external_acl_ttl0.patch) = 3002 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-digest_nonce_count.patch) = 3b4a1db8e8c85145de870b96b9294e6fba818bd5
-Size (squid-2.5.2/squid-2.5.STABLE2-digest_nonce_count.patch) = 11275 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-digestcomma.patch) = c50873d4d1dc3dbe18f242f04b5e4268f8156ef2
-Size (squid-2.5.2/squid-2.5.STABLE2-digestcomma.patch) = 1484 bytes
-SHA1 (squid-2.5.2/squid-2.5.STABLE2-deny_info_reset.patch) = d91d63a437df9d62297eaa7a6115920e26f3a672
-Size (squid-2.5.2/squid-2.5.STABLE2-deny_info_reset.patch) = 5479 bytes
+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 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 23a906011ffef78d070cc49c94c4f4837eb319ec
 SHA1 (patch-ae) = 5031183c7512573c8c8602d0b0541999f43343f2
-SHA1 (patch-ag) = b01a2b0309f3e0711c1c4e75580766e506915f10
+SHA1 (patch-ag) = fc215888a815d2b39f408b980f8bce3bf5ca998c
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 19861281d8a9ece352ce9e881e1e60f6787933e3
 SHA1 (patch-al) = 534f273ec63f6de0818f1f86a2b655eac4564213
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 34a08405815..bdaba61226f 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $
+$NetBSD: patch-ag,v 1.14 2003/05/25 14:58:16 taca Exp $
 
---- configure.orig	2003-03-18 04:00:14.000000000 +0900
+--- configure.orig	2003-05-25 22:04:25.000000000 +0900
 +++ configure
 @@ -2180,7 +2180,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $
      
  
  if true; then
-@@ -3771,6 +3771,7 @@ for ac_hdr in \
+@@ -3776,6 +3776,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -3821,6 +3822,7 @@ for ac_hdr in \
+@@ -3826,6 +3827,7 @@ for ac_hdr in \
  	syslog.h \
  	time.h \
  	unistd.h \
@@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $
  	utime.h \
  	varargs.h \
  	byteswap.h \
-@@ -6016,44 +6018,39 @@ fi
+@@ -6021,44 +6023,39 @@ 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.13 2003/03/25 17:44:24 taca Exp $
  fi
  
 -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6
--echo "configure:6026: checking for fd_mask" >&5
+-echo "configure:6031: 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:6026: checking for fd_set" >&5
++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 6031 "configure"
+ #line 6036 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
 -#if STDC_HEADERS
@@ -85,8 +85,8 @@ $NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $
 +echo "$ac_t""$ac_cv_have_fd_mask" 1>&6
  
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
- echo "configure:6060: checking size of off_t" >&5
-@@ -7324,8 +7321,8 @@ if test "$GCC" = "yes"; then
+ echo "configure:6065: checking size of off_t" >&5
+@@ -7333,8 +7330,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -97,7 +97,7 @@ $NetBSD: patch-ag,v 1.13 2003/03/25 17:44:24 taca Exp $
  		;;
  	esac
  fi
-@@ -7417,6 +7414,7 @@ for ac_func in \
+@@ -7426,6 +7423,7 @@ for ac_func in \
  	setrlimit \
  	getrlimit \
  	setsid \