Update squid20 package to 3.0.15 (squid-2.0.STABLE15).

Changes to squid-3.0.STABLE15 (06 May 2009):

	- Regression Bug 2635: Incorrect Max-Forwards header type
	- Bug 2652: 'Success' error on CONNECT requests
	- Bug 2625: IDENT receiving errors
	- Bug 2610: ipfilter support detection
	- Bug 2578: FTP download resume failure
	- Bug 2536: %H on HTTPS error pages
	- Bug 2491: assertion "age >= 0"
	- Bug 2276: too many NTLM helpers running
	- Endian system and compiler fixes provided by the NetBSD project
	- documentation fixes provided by the Debian project

14 files changed, 41 insertions, 231 deletions

diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 1475b2da7a8..46ad5da9673 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2009/04/11 14:04:15 taca Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/08 13:39:09 taca Exp $
 
-DISTNAME=	squid-3.0.STABLE14
+DISTNAME=	squid-3.0.STABLE15
 PKGNAME=	${DISTNAME:S/STABLE//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/3.0/
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index fdbd1c9034d..051124e9593 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,17 +1,10 @@
-$NetBSD: distinfo,v 1.7 2009/04/11 14:04:15 taca Exp $
+$NetBSD: distinfo,v 1.8 2009/05/08 13:39:09 taca Exp $
 
-SHA1 (squid-3.0.STABLE14.tar.bz2) = 54689ef7c83e9ca2eeceb3e1552419cbf7338986
-RMD160 (squid-3.0.STABLE14.tar.bz2) = 2e04ca778bf61e09b21097e4d2c148c491ee9000
-Size (squid-3.0.STABLE14.tar.bz2) = 1811878 bytes
-SHA1 (patch-aa) = 5f040d8e35cc1640633e0997363a6a615ae769b2
-SHA1 (patch-ab) = 9c731290248e1172a3cdf2d467494b5912b6358a
-SHA1 (patch-ac) = ba26f475d1b9f19c4e5eb6eb9295b2d976e72e59
-SHA1 (patch-ad) = 6e67574732b38d2ddf8b351854abfd78a5903420
-SHA1 (patch-ae) = 11ef61a2154bd6841ee438531de7faf02d36709d
-SHA1 (patch-af) = 4f584a053df4f59c55af7f06a31787c9e36c8aa6
-SHA1 (patch-ag) = 1d4172d406d3e34a9582d60ebab649dbe369d985
-SHA1 (patch-ah) = e4cb16cbd65f558146204e450e794ab247c7b617
-SHA1 (patch-ai) = aa16d2a17518ebbccc5350cf08469a4e31a4cc29
-SHA1 (patch-aj) = f223e4fa57a85cc2b8ebbb2ca0f80554f53d8c83
-SHA1 (patch-ak) = 8cb0aaa7ea9d2241096cf82cf3640eea060ae85c
-SHA1 (patch-al) = cd8eca5a945de8901d84beb432c3be59a6814e9c
+SHA1 (squid-3.0.STABLE15.tar.bz2) = f01697bee0af0084db62b87b0646298775f53c28
+RMD160 (squid-3.0.STABLE15.tar.bz2) = e8e54377672de849cfd7c5bd687ff0c97f68c961
+Size (squid-3.0.STABLE15.tar.bz2) = 1782217 bytes
+SHA1 (patch-ad) = 5e126ffb1427f986484c3c32baf5ae3da409262d
+SHA1 (patch-ae) = bc38307f8039a7bc63f1e1572df30d20ee161b8a
+SHA1 (patch-ah) = ab3b9add2a8836a5d5307645eb547d732e6496d0
+SHA1 (patch-aj) = 08ec1ecb59733c27e88dacfbc81b1b84da3eddab
+SHA1 (patch-al) = 871e16d2cbec55822121ca70c77bd2bd7c909325
diff --git a/www/squid30/patches/patch-aa b/www/squid30/patches/patch-aa
deleted file mode 100644
index 36b65ab8180..00000000000
--- a/www/squid30/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/04/11 14:04:15 taca Exp $
-
-Add DESTDIR support.
-
---- Makefile.in.orig	2009-01-21 10:59:00.000000000 +0900
-+++ Makefile.in
-@@ -770,8 +770,8 @@ dist-hook:
- 	fi
- 
- install-pinger:
--	chown root $(DEFAULT_PINGER) 
--	chmod 4711 $(DEFAULT_PINGER)
-+	chown root $(DESTDIR)$(DEFAULT_PINGER) 
-+	chmod 4711 $(DESTDIR)$(DEFAULT_PINGER)
- 
- all-am:
- 	@echo "Build Successful."
diff --git a/www/squid30/patches/patch-ab b/www/squid30/patches/patch-ab
deleted file mode 100644
index 6da68e95707..00000000000
--- a/www/squid30/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/04/11 14:04:16 taca Exp $
-
-Detect more header files: machine/byte_swap.h and net/pf/pfvar.h.
-Prevent optimization with GCC 2.95.[123].
-
---- configure.in.orig	2008-06-22 12:35:54.000000000 +0900
-+++ configure.in
-@@ -1868,6 +1868,7 @@ AC_CHECK_HEADERS( \
- 	ipl.h \
- 	libc.h \
- 	limits.h \
-+  	machine/byte_swap.h \
- 	malloc.h \
- 	math.h \
- 	memory.h \
-@@ -1949,6 +1950,7 @@ dnl *BSD dont include the depenencies fo
- dnl We must include a few basic type headers for them to work.
- AC_CHECK_HEADERS( \
- 	net/if.h \
-+	net/pf/pfvar.h \
- 	net/pfvar.h \
- 	netinet/if_ether.h\
- 	netinet/ip.h\
-@@ -2434,8 +2444,8 @@ if test "$GCC" = "yes"; then
- 	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
- 	case "$GCCVER" in
- 	[2.95.[123]])
--		echo "Removing -O for gcc on $host with GCC $GCCVER"
--		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
-+		echo "Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER"
-+		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`"
- 		;;
- 	esac
- fi
-@@ -2819,7 +2829,7 @@ dnl PF support requires a header file.
- if test "$PF_TRANSPARENT" ; then
-     AC_MSG_CHECKING(if PF header file is installed)
-     # hold on to your hats...
--    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
-+    if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
-         PF_TRANSPARENT="yes"
-         AC_DEFINE(PF_TRANSPARENT, 1)
-     else
diff --git a/www/squid30/patches/patch-ac b/www/squid30/patches/patch-ac
deleted file mode 100644
index e55a288c745..00000000000
--- a/www/squid30/patches/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/04/11 14:04:16 taca Exp $
-
-Detect more header files: machine/byte_swap.h and net/pf/pfvar.h.
-Prevent optimization with GCC 2.95.[123].
-
---- configure.orig	2008-12-23 13:19:34.000000000 +0900
-+++ configure
-@@ -25026,6 +25026,7 @@ for ac_header in \
- 	ipl.h \
- 	libc.h \
- 	limits.h \
-+  	machine/byte_swap.h \
- 	malloc.h \
- 	math.h \
- 	memory.h \
-@@ -25348,6 +25349,7 @@ done
- 
- for ac_header in \
- 	net/if.h \
-+	net/pf/pfvar.h \
- 	net/pfvar.h \
- 	netinet/if_ether.h\
- 	netinet/ip.h\
-@@ -44563,8 +44565,8 @@ if test "$GCC" = "yes"; then
- 	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
- 	case "$GCCVER" in
- 	2.95.[123])
--		echo "Removing -O for gcc on $host with GCC $GCCVER"
--		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
-+		echo "Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER"
-+		CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`"
- 		;;
- 	esac
- fi
-@@ -45894,7 +45896,7 @@ if test "$PF_TRANSPARENT" ; then
-     { $as_echo "$as_me:$LINENO: checking if PF header file is installed" >&5
- $as_echo_n "checking if PF header file is installed... " >&6; }
-     # hold on to your hats...
--    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
-+    if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
-         PF_TRANSPARENT="yes"
-         cat >>confdefs.h <<\_ACEOF
- #define PF_TRANSPARENT 1
diff --git a/www/squid30/patches/patch-ad b/www/squid30/patches/patch-ad
index 8eb10194c4b..e6de667fe6f 100644
--- a/www/squid30/patches/patch-ad
+++ b/www/squid30/patches/patch-ad
@@ -1,18 +1,20 @@
-$NetBSD: patch-ad,v 1.2 2009/04/11 14:04:16 taca Exp $
+$NetBSD: patch-ad,v 1.3 2009/05/08 13:39:09 taca Exp $
 
 Don't install configuration files.
 
---- helpers/basic_auth/MSNT/Makefile.in.orig	2008-06-22 12:35:48.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2009-05-06 20:11:32.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -590,9 +590,9 @@ info: info-am
+@@ -534,11 +534,11 @@ info: info-am
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
+ install-dvi: install-dvi-am
+ 
 -install-exec-am: install-libexecPROGRAMS install-sysconfDATA
 +install-exec-am: install-libexecPROGRAMS
  
- install-info: install-info-am
+ install-html: install-html-am
  
diff --git a/www/squid30/patches/patch-ae b/www/squid30/patches/patch-ae
index 228fe9881a5..28b754274c5 100644
--- a/www/squid30/patches/patch-ae
+++ b/www/squid30/patches/patch-ae
@@ -1,6 +1,10 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+$NetBSD: patch-ae,v 1.2 2009/05/08 13:39:09 taca Exp $
 
---- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	2008-06-22 12:35:49.000000000 +0900
+Unused and no-op function which passing FILE as parameter not pointer
+to FILE.  It cause compile problem on FILE is defined as opaque data
+structure.
+
+--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	2009-05-06 20:11:36.000000000 +0900
 +++ helpers/ntlm_auth/SMB/smbval/smblib-util.c
 @@ -61,6 +61,7 @@ static char *SMB_Prots[] =
      "NT LANMAN 1.0",
diff --git a/www/squid30/patches/patch-af b/www/squid30/patches/patch-af
deleted file mode 100644
index c82d50236d3..00000000000
--- a/www/squid30/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.2 2009/04/11 14:04:16 taca Exp $
-
-Add support of existence of header files:
-	machine/byte_swap.h and net/pf/pfvar.h.
-
---- include/autoconf.h.in.orig	2009-04-11 17:35:37.000000000 +0900
-+++ include/autoconf.h.in
-@@ -306,6 +306,9 @@
- /* Define to 1 if you have the `lrand48' function. */
- #undef HAVE_LRAND48
- 
-+/* Define if you have the <machine/byte_swap.h> header file.  */
-+#undef HAVE_MACHINE_BYTE_SWAP_H
-+
- /* Define to 1 if you have the `mallinfo' function. */
- #undef HAVE_MALLINFO
- 
-@@ -393,6 +396,9 @@
- /* Define to 1 if you have the <net/pfvar.h> header file. */
- #undef HAVE_NET_PFVAR_H
- 
-+/* Define to 1 if you have the <net/pf/pfvar.h> header file. */
-+#undef HAVE_NET_PF_PFVAR_H
-+
- /* off_t is defined by the system headers */
- #undef HAVE_OFF_T
- 
diff --git a/www/squid30/patches/patch-ag b/www/squid30/patches/patch-ag
deleted file mode 100644
index 5819f120531..00000000000
--- a/www/squid30/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2009/04/11 14:04:16 taca Exp $
-
-Add support of machine/byte_swap.h.
-
---- include/squid_endian.h.orig	2008-06-22 12:35:50.000000000 +0900
-+++ include/squid_endian.h
-@@ -68,6 +68,9 @@
- #if HAVE_BYTESWAP_H
- #  include <byteswap.h>
- #endif /* HAVE_BYTESWAP_H */
-+#ifdef HAVE_MACHINE_BYTE_SWAP_H
-+#include <machine/byte_swap.h>
-+#endif	/* HAVE_MACHINE_BYTE_SWAP_H */
- #if HAVE_SYS_BSWAP_H
- #  include <sys/bswap.h>
- #endif /* HAVE_MACHINE_BSWAP_H */
diff --git a/www/squid30/patches/patch-ah b/www/squid30/patches/patch-ah
index 1cfb057ab3e..8cfa12d02a9 100644
--- a/www/squid30/patches/patch-ah
+++ b/www/squid30/patches/patch-ah
@@ -1,15 +1,15 @@
-$NetBSD: patch-ah,v 1.2 2009/04/11 14:04:16 taca Exp $
+$NetBSD: patch-ah,v 1.3 2009/05/08 13:39:09 taca Exp $
 
 Don't install startup scripts.
 
---- scripts/Makefile.in.orig	2008-07-18 19:02:51.000000000 +0900
+--- scripts/Makefile.in.orig	2009-05-06 20:11:38.000000000 +0900
 +++ scripts/Makefile.in
-@@ -431,7 +431,7 @@ info-am:
+@@ -377,7 +377,7 @@ install-data-am:
  
- install-data-am:
+ install-dvi: install-dvi-am
  
 -install-exec-am: install-binSCRIPTS
 +install-exec-am:
  
- install-info: install-info-am
+ install-html: install-html-am
  
diff --git a/www/squid30/patches/patch-ai b/www/squid30/patches/patch-ai
deleted file mode 100644
index 210bcc0dd09..00000000000
--- a/www/squid30/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2009/04/11 14:04:16 taca Exp $
-
-Add support of net/pf/pfvar.h.
-
---- src/IPInterception.cc.orig	2008-06-22 12:35:52.000000000 +0900
-+++ src/IPInterception.cc
-@@ -81,7 +81,12 @@
- #include <sys/fcntl.h>
- #include <net/if.h>
- #include <netinet/in.h>
-+#ifdef HAVE_NET_PF_PFVAR_H
-+#include <net/pf/pfvar.h>
-+#endif /* HAVE_NET_PF_PFVAR_H */
-+#ifdef HAVE_NET_PFVAR_H
- #include <net/pfvar.h>
-+#endif /* HAVE_NET_PFVAR_H */
- #endif
- 
- #if LINUX_NETFILTER
diff --git a/www/squid30/patches/patch-aj b/www/squid30/patches/patch-aj
index 53364886459..68ee83fb2ee 100644
--- a/www/squid30/patches/patch-aj
+++ b/www/squid30/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.2 2009/04/11 14:04:16 taca Exp $
+$NetBSD: patch-aj,v 1.3 2009/05/08 13:39:09 taca Exp $
 
 Change pid file's directory and don't install configuration files.
 
---- src/Makefile.in.orig	2008-06-22 12:35:52.000000000 +0900
+--- src/Makefile.in.orig	2009-05-06 20:11:40.000000000 +0900
 +++ src/Makefile.in
-@@ -2616,7 +2616,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -2636,7 +2636,7 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -13,16 +13,18 @@ Change pid file's directory and don't install configuration files.
  DEFAULT_SWAP_DIR = $(localstatedir)/cache
  DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
  DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -5366,10 +5366,10 @@ info: info-recursive
+@@ -5397,12 +5397,12 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local install-dataDATA
 +install-data-am: install-dataDATA
  
+ install-dvi: install-dvi-recursive
+ 
  install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
 -	install-sbinPROGRAMS install-sysconfDATA
 +	install-sbinPROGRAMS
  
- install-info: install-info-recursive
+ install-html: install-html-recursive
  
diff --git a/www/squid30/patches/patch-ak b/www/squid30/patches/patch-ak
deleted file mode 100644
index 9b90dd89af9..00000000000
--- a/www/squid30/patches/patch-ak
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2008/09/16 03:27:19 taca Exp $
-
---- src/ssl_support.cc.orig	2008-09-10 01:06:45.000000000 +0900
-+++ src/ssl_support.cc
-@@ -535,7 +535,11 @@ SSL_CTX *
- sslCreateServerContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *clientCA, const char *CAfile, const char *CApath, const char *CRLfile, const char *dhfile, const char *context)
- {
-     int ssl_error;
-+#if OPENSSL_VERSION_NUMBER < 0x00909000L
-     SSL_METHOD *method;
-+#else
-+    const SSL_METHOD *method;
-+#endif
-     SSL_CTX *sslContext;
-     long fl = ssl_parse_flags(flags);
- 
-@@ -732,7 +736,11 @@ SSL_CTX *
- sslCreateClientContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *CAfile, const char *CApath, const char *CRLfile)
- {
-     int ssl_error;
-+#if OPENSSL_VERSION_NUMBER < 0x00909000L
-     SSL_METHOD *method;
-+#else
-+    const SSL_METHOD *method;
-+#endif
-     SSL_CTX *sslContext;
-     long fl = ssl_parse_flags(flags);
- 
diff --git a/www/squid30/patches/patch-al b/www/squid30/patches/patch-al
index ad10a722349..f0d6492efcd 100644
--- a/www/squid30/patches/patch-al
+++ b/www/squid30/patches/patch-al
@@ -1,13 +1,15 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+$NetBSD: patch-al,v 1.2 2009/05/08 13:39:09 taca Exp $
 
---- tools/Makefile.in.orig	2008-06-22 12:35:54.000000000 +0900
+Don't install a configuration file.
+
+--- tools/Makefile.in.orig	2009-05-06 20:11:43.000000000 +0900
 +++ tools/Makefile.in
-@@ -794,7 +794,7 @@ info: info-recursive
+@@ -747,7 +747,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
- install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+ install-dvi: install-dvi-recursive