Update squid package to 2.5.10nb3.

- pkgsrc update:

o s/SQUID_BACKEND/SQUID_BACKENDS/ as suggested by pkglint.
o Fix leaving ${PREFIX}/etc/squid/msntauth.conf.default out of PLIST.
o IP Filter related patches are incorporated to squid.


- Add/update official patches:

o 2005-09-15 11:15 (Major) FATAL: Incorrect scheme in auth header
o 2005-09-15 09:56 (Medium) Odd results on pipelined CONNECT requests
o 2005-09-13 23:59 (Minor) Transparent proxy problem with IP Filter
o 2005-09-11 01:53 (Medium) Clients bypassing delay pools by faking a cache
  hit
o 2005-09-11 01:42 (Cosmetic) Allow leaving core dumps on Linux
o 2005-09-11 01:21 (Cosmetic) enums can not be assumed to be signed ints
o 2005-09-11 01:21 (Cosmetic) Incorrect store dir selection debug message on
  objects >2G
o 2005-09-11 00:57 (Minor) LDAP helpers does not work with TLS (-Z option)

5 files changed, 19 insertions, 129 deletions

diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index e63b11369fc..28fe27bc7a1 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.20 2005/09/04 05:07:05 taca Exp $
+$NetBSD: patch-ag,v 1.21 2005/09/15 15:40:47 taca Exp $
 
---- configure.orig	2005-09-02 10:23:02.000000000 +0900
+--- configure.orig	2005-09-13 12:26:12.000000000 +0900
 +++ configure
 @@ -2241,7 +2241,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
@@ -11,27 +11,15 @@ $NetBSD: patch-ag,v 1.20 2005/09/04 05:07:05 taca Exp $
      
  
  if true; then
-@@ -4046,9 +4046,11 @@ for ac_hdr in \
- 	ip_fil_compat.h \
- 	ip_fil.h \
- 	ip_nat.h \
-+	ipl.h \
+@@ -4062,6 +4062,7 @@ for ac_hdr in \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
-+	machine/byte_swap.h \
++ 	machine/byte_swap.h \
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -4063,6 +4065,7 @@ for ac_hdr in \
- 	netinet/ip_fil_compat.h \
- 	netinet/ip_fil.h \
- 	netinet/ip_nat.h \
-+	netinet/ipl.h \
- 	openssl/err.h \
- 	openssl/md5.h \
- 	openssl/ssl.h \
-@@ -6294,43 +6297,38 @@ fi
+@@ -6309,43 +6310,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
@@ -89,7 +77,7 @@ $NetBSD: patch-ag,v 1.20 2005/09/04 05:07:05 taca Exp $
  
  
  echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-@@ -7646,8 +7644,8 @@ if test "$GCC" = "yes"; then
+@@ -7661,8 +7657,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index c502c0debb0..fb484f0a724 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.8 2005/09/04 05:07:05 taca Exp $
+$NetBSD: patch-an,v 1.9 2005/09/15 15:40:47 taca Exp $
 
---- configure.in.orig	2005-09-02 10:23:02.000000000 +0900
+--- configure.in.orig	2005-09-13 10:48:42.000000000 +0900
 +++ configure.in
 @@ -493,7 +493,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
@@ -11,27 +11,15 @@ $NetBSD: patch-an,v 1.8 2005/09/04 05:07:05 taca Exp $
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1282,9 +1282,11 @@ AC_CHECK_HEADERS( \
- 	ip_fil_compat.h \
- 	ip_fil.h \
- 	ip_nat.h \
-+	ipl.h \
+@@ -1302,6 +1302,7 @@ AC_CHECK_HEADERS( \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
-+	machine/byte_swap.h \
++ 	machine/byte_swap.h \
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1299,6 +1301,7 @@ AC_CHECK_HEADERS( \
- 	netinet/ip_fil_compat.h \
- 	netinet/ip_fil.h \
- 	netinet/ip_nat.h \
-+	netinet/ipl.h \
- 	openssl/err.h \
- 	openssl/md5.h \
- 	openssl/ssl.h \
-@@ -1510,8 +1513,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1529,8 +1530,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)
@@ -51,7 +39,7 @@ $NetBSD: patch-an,v 1.8 2005/09/04 05:07:05 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1719,8 +1731,8 @@ if test "$GCC" = "yes"; then
+@@ -1738,8 +1748,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
diff --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap
index d2afca5c963..f01e24ede64 100644
--- a/www/squid/patches/patch-ap
+++ b/www/squid/patches/patch-ap
@@ -1,13 +1,16 @@
-$NetBSD: patch-ap,v 1.1 2005/08/09 15:48:30 taca Exp $
+$NetBSD: patch-ap,v 1.2 2005/09/15 15:40:47 taca Exp $
 
 --- helpers/basic_auth/MSNT/Makefile.in.orig	2005-03-19 09:55:41.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -383,7 +383,7 @@ info: info-am
+@@ -383,9 +383,9 @@ info: info-am
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
- install-exec-am: install-libexecPROGRAMS install-sysconfDATA
+-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS
+ 
+ install-info: install-info-am
  
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 065874f24bd..661454fbcc6 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,17 +1,7 @@
-$NetBSD: patch-bb,v 1.7 2005/09/04 05:07:05 taca Exp $
+$NetBSD: patch-bb,v 1.8 2005/09/15 15:40:47 taca Exp $
 
 --- include/autoconf.h.in.orig	2005-04-23 10:32:27.000000000 +0900
 +++ include/autoconf.h.in
-@@ -656,6 +656,9 @@
- /* Define if you have the <ip_nat.h> header file.  */
- #undef HAVE_IP_NAT_H
- 
-+/* Define if you have the <ipl.h> header file.  */
-+#undef HAVE_IPL_H
-+
- /* Define if you have the <libc.h> header file.  */
- #undef HAVE_LIBC_H
- 
 @@ -665,6 +668,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H
@@ -22,13 +12,3 @@ $NetBSD: patch-bb,v 1.7 2005/09/04 05:07:05 taca Exp $
  /* Define if you have the <malloc.h> header file.  */
  #undef HAVE_MALLOC_H
  
-@@ -707,6 +713,9 @@
- /* Define if you have the <netinet/ip_nat.h> header file.  */
- #undef HAVE_NETINET_IP_NAT_H
- 
-+/* Define if you have the <netinet/ipl.h> header file.  */
-+#undef HAVE_NETINET_IPL_H
-+
- /* Define if you have the <netinet/tcp.h> header file.  */
- #undef HAVE_NETINET_TCP_H
- 
diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd
deleted file mode 100644
index 0bd2a9b98cf..00000000000
--- a/www/squid/patches/patch-cd
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-cd,v 1.11 2005/09/04 05:07:05 taca Exp $
-
---- src/client_side.c.orig	2005-09-02 10:23:02.000000000 +0900
-+++ src/client_side.c
-@@ -55,6 +55,11 @@
- #ifdef _SQUID_SOLARIS_
- #undef free
- #endif
-+#ifdef HAVE_IPL_H
-+#include <ipl.h>
-+#elif HAVE_NETINET_IPL_H
-+#include <netinet/ipl.h>
-+#endif
- #if HAVE_IP_FIL_COMPAT_H
- #include <ip_fil_compat.h>
- #elif HAVE_NETINET_IP_FIL_COMPAT_H
-@@ -2606,6 +2611,9 @@ parseHttpRequest(ConnStateData * conn, m
-     static int natfd = -1;
-     static int siocgnatl_cmd = SIOCGNATL & 0xff;
-     int x;
-+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
-+    struct ipfobj obj;
-+#endif
- #endif
- #if PF_TRANSPARENT
-     struct pfioc_natlook nl;
-@@ -2748,6 +2756,13 @@ parseHttpRequest(ConnStateData * conn, m
- 	if (vhost_mode) {
- #if IPF_TRANSPARENT
- 	    static time_t last_reported = 0;
-+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
-+	    obj.ipfo_rev = IPFILTER_VERSION;
-+	    obj.ipfo_size = sizeof(natLookup);
-+	    obj.ipfo_ptr = &natLookup;
-+	    obj.ipfo_type = IPFOBJ_NATLOOKUP;
-+	    obj.ipfo_offset = 0;
-+#endif
- 	    natLookup.nl_inport = http->conn->me.sin_port;
- 	    natLookup.nl_outport = http->conn->peer.sin_port;
- 	    natLookup.nl_inip = http->conn->me.sin_addr;
-@@ -2756,8 +2771,8 @@ parseHttpRequest(ConnStateData * conn, m
- 	    if (natfd < 0) {
- 		int save_errno;
- 		enter_suid();
--#ifdef IPL_NAME
--		natfd = open(IPL_NAME, O_RDONLY, 0);
-+#ifdef IPNAT_NAME
-+		natfd = open(IPNAT_NAME, O_RDONLY, 0);
- #else
- 		natfd = open(IPL_NAT, O_RDONLY, 0);
- #endif
-@@ -2771,6 +2786,9 @@ parseHttpRequest(ConnStateData * conn, m
- 		    last_reported = squid_curtime;
- 		}
- 	    } else {
-+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
-+		x = ioctl(natfd, SIOCGNATL, &obj);
-+#else
- 		/*
- 		 * IP-Filter changed the type for SIOCGNATL between
- 		 * 3.3 and 3.4.  It also changed the cmd value for
-@@ -2784,6 +2802,7 @@ parseHttpRequest(ConnStateData * conn, m
- 		} else {
- 		    x = ioctl(natfd, SIOCGNATL, &natLookup);
- 		}
-+#endif
- 		if (x < 0) {
- 		    if (errno != ESRCH) {
- 			if (squid_curtime - last_reported > 60) {