Update squid package to 2.5.12 (squid-2.5.STABLE12).

Changes to squid-2.5.STABLE12 (22 Oct 2005)

	- [Major] Error introduced in 2.5.STABLE11 causing truncated responses
	  when using delay pools (Bug #1405)
	- [Cosmetic] Document that tcp_outgoing_* works badly in combination
	  with server_persistent_connections (Bug #454)
	- [Cosmetic] Add additinal tracing to squid_ldap_auth making
	  diagnostics easier on squid_ldap_auth configuration errors
	  (Bug #1395)
	- [Minor] $HOME not set when started as root (Bug #1401)
	- [Minor] httpd_accel_single_host breaks in combination with
	  server_persistent_connections (Bug #1402)
	- [Cosmetic] Setting CACHE_HTTP_PORT to configure was only partially
	  implemented, effectively ignored. (Bug #1403)
	- [Minor] CNAME based DNS addresses could get cached for longer
	  than intended (Bug #1404)
	- [Minor] Incorrect handling of squid-internal-dynamic/netdb exchanges
	  in transparently intercepting proxies (Bug #1410).
	- [Minor] Cache revalidations on HEAD requests causing poor cache
	  hit ratio (Bug #1411).
	- [Minor] Not possible to send 302 redirects via a redirector in
	  response to CONNECT requests (bug #1412)
	- [Minor] Incorrect handling of Set-Cookie on cache refreshes (Bug
	  #1419)
	- [Major] Segmentation fault crash in rfc1738_do_escape (Bug #1426)
	- [Minor] Delay pools class 3 fails on clients in network 255
	  (Bug #1431)

3 files changed, 36 insertions, 50 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 9bcf7949380..567862a3463 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.161 2005/10/09 14:47:55 taca Exp $
+# $NetBSD: Makefile,v 1.162 2005/10/23 22:32:32 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE11
-PKGNAME=	squid-2.5.11
+DISTNAME=	squid-2.5.STABLE12
+PKGNAME=	squid-2.5.12
 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/ \
 		ftp://ftp1.au.squid-cache.org/pub/squid/squid-2/STABLE/
 EXTRACT_SUFX=	.tar.bz2
 
-PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE11-delaypools_truncated.patch \
-		squid-2.5.STABLE11-tcp_outgoing_xxx.patch \
-		squid-2.5.STABLE11-ldap_auth.patch \
-		squid-2.5.STABLE11.accel_single_host_pconn.patch \
-		squid-2.5.STABLE11-CACHE_HTTP_PORT.patch \
-		squid-2.5.STABLE11-CNAME.patch
-PATCH_DIST_STRIP= -p1
+#PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+#PATCHFILES=
+#PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 7ef5e69fa40..6a1dbef5ebd 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,32 +1,14 @@
-$NetBSD: distinfo,v 1.105 2005/10/09 14:47:55 taca Exp $
+$NetBSD: distinfo,v 1.106 2005/10/23 22:32:32 taca Exp $
 
-SHA1 (squid-2.5.11/squid-2.5.STABLE11.tar.bz2) = 0142bde507ea0f30f1ad9548d901b3acf2d5e771
-RMD160 (squid-2.5.11/squid-2.5.STABLE11.tar.bz2) = 4dac10f1657ee76e686d1736186ba45b0de49d16
-Size (squid-2.5.11/squid-2.5.STABLE11.tar.bz2) = 1075431 bytes
-SHA1 (squid-2.5.11/squid-2.5.STABLE11-delaypools_truncated.patch) = 220aa65b665d39b82fd2ebc8673af5b3bb6a02b7
-RMD160 (squid-2.5.11/squid-2.5.STABLE11-delaypools_truncated.patch) = 59a3500ce7a39562ae55d2eff65f434898b1d207
-Size (squid-2.5.11/squid-2.5.STABLE11-delaypools_truncated.patch) = 588 bytes
-SHA1 (squid-2.5.11/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = 9f1460c1a3d0f7eedc6b00c03e2238eb5867a15a
-RMD160 (squid-2.5.11/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = c4323024c40cc1ba290cd304efd93088f2b36da2
-Size (squid-2.5.11/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = 1140 bytes
-SHA1 (squid-2.5.11/squid-2.5.STABLE11-ldap_auth.patch) = 827482df32c57f8952baa6b4ad63c81dda4aafad
-RMD160 (squid-2.5.11/squid-2.5.STABLE11-ldap_auth.patch) = e117f7b7b3e6ffb9e8e25a7433898aba0a93b041
-Size (squid-2.5.11/squid-2.5.STABLE11-ldap_auth.patch) = 4857 bytes
-SHA1 (squid-2.5.11/squid-2.5.STABLE11.accel_single_host_pconn.patch) = 7318a668ff6376035e68c559a57c1a37c9e3d521
-RMD160 (squid-2.5.11/squid-2.5.STABLE11.accel_single_host_pconn.patch) = 57235922e13689e13db1b8afa395c0d081d6d7fd
-Size (squid-2.5.11/squid-2.5.STABLE11.accel_single_host_pconn.patch) = 944 bytes
-SHA1 (squid-2.5.11/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = f59892e70b3e2eb411c4a3ed4da7dfe482da5256
-RMD160 (squid-2.5.11/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = 10b6099c21bf66da44b77a603e2ec2d8ad9f4d80
-Size (squid-2.5.11/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = 4010 bytes
-SHA1 (squid-2.5.11/squid-2.5.STABLE11-CNAME.patch) = e6efb35e10c203758f4970aaa8b52614e36de256
-RMD160 (squid-2.5.11/squid-2.5.STABLE11-CNAME.patch) = fa93a5f0407c3acafbbca7f0b94987e4c6b1fc78
-Size (squid-2.5.11/squid-2.5.STABLE11-CNAME.patch) = 3825 bytes
+SHA1 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 57a046ca0eda0f649d259c2c161dc95c81a5dc09
+RMD160 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 0b332612d90d74681e47505a2afbfb6c962807a4
+Size (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 1075111 bytes
 SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
 SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
-SHA1 (patch-ag) = c4e801c39d47162eceb1bf540b258bd1f6888d7d
+SHA1 (patch-ag) = 560f3a2a571cb988a1080e8d45f29a9eafef959e
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
 SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 305d45d6851..e89d5239193 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.22 2005/10/09 14:47:56 taca Exp $
+$NetBSD: patch-ag,v 1.23 2005/10/23 22:32:32 taca Exp $
 
---- configure.orig	2005-10-02 15:31:21.000000000 +0900
+--- configure.orig	2005-10-22 18:56:01.000000000 +0900
 +++ configure
-@@ -2247,7 +2247,7 @@ if test "${enable_snmp+set}" = set; then
+@@ -2249,7 +2238,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
  EOF
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.22 2005/10/09 14:47:56 taca Exp $
      
  
  if true; then
-@@ -4068,6 +4068,7 @@ for ac_hdr in \
+@@ -4070,6 +4059,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.22 2005/10/09 14:47:56 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -6315,43 +6316,38 @@ fi
+@@ -6317,47 +6307,45 @@ fi
  echo "$ac_t""$ac_cv_type_mode_t" 1>&6
  if test $ac_cv_type_mode_t = no; then
    cat >> confdefs.h <<\EOF
@@ -30,15 +30,18 @@ $NetBSD: patch-ag,v 1.22 2005/10/09 14:47:56 taca Exp $
  fi
  
 -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6
--echo "configure:6325: checking for fd_mask" >&5
+-echo "configure:6327: 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:6318: 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 6330 "configure"
+-#line 6332 "configure"
++#line 6324 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
 -#if STDC_HEADERS
@@ -53,15 +56,16 @@ $NetBSD: patch-ag,v 1.22 2005/10/09 14:47:56 taca Exp $
  EOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "(^|[^a-zA-Z_0-9])fd_mask[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+if { (eval echo configure:5983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
 -  ac_cv_type_fd_mask=yes
-+   ac_cv_have_fd_mask=yes
++  ac_cv_have_fd_mask="yes"
  else
-+   echo "configure: failed program was:" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
    rm -rf conftest*
 -  ac_cv_type_fd_mask=no
-+   ac_cv_have_fd_mask=no
++  ac_cv_have_fd_mask="no"
  fi
  rm -f conftest*
  
@@ -73,11 +77,16 @@ $NetBSD: patch-ag,v 1.22 2005/10/09 14:47:56 taca Exp $
 -EOF
 -
 -fi
-+echo "$ac_t""$ac_cv_have_fd_mask" 1>&6
  
++echo "$ac_t""$ac_cv_have_fd_mask" 1>&6
  
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-@@ -7667,8 +7663,8 @@ if test "$GCC" = "yes"; then
+-echo "configure:6361: checking size of off_t" >&5
++echo "configure:6349: checking size of off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7669,8 +7657,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])