Update squid pacakge to 2.6.14 (2.6.STABLE14).

pkgsrc chagnes

  o Add "coss" option which enable COSS (Cyclic Object storage system).
    Noted by Chris Ross on pkgsrc-users.

Changes to squid-2.6.STABLE14 (15 Jul 2007)

	- squid.conf.default cleanup to have options in their proper sections.
	- documentation correction in the refresh_pattern ignore-auth option
	- URI-escaping not uses the recommended upper-case hex codes
	- refresh_pattern min-age 0 correted to really mean 0, and not 1 second
	- Always use xisxxxx() Squid defined macros instead of ctype
	  functions.
	- Kerberos SPNEGO/Negotiate helper for the negotiate scheme
	- Database basic auth helper using Perl DBI to connect to most SQL DBs
	- Solaris /dev/poll network I/O support
	- configure fixes to make cross compilation somewhat easier
	- Removed incorrect -a reference from http_port documentation
	- Bug #1900: Double "squid -k shutdown" makes Squid restart again
	- Bug #1968: Squid hangs occasionally when using DNS search paths
	- Novell eDirectory digest auth helper (digest_edir_auth)
	- Bug #1130: min-size option for cache_dir
	- POP3 basic auth helper querying a POP3 server
	- Cosmetic squid_ldap_auth fixes from Squid-3
	- Bug #1085: Add no-wrap to cache manager HTML tables
	- Automatically restart if number of available filedescriptors becomes
	  alarmingly low, preventing a situation where Squid would otherwise
	  permanently stop processing requests.
	- Bug #2010: snmp_core.cc:828: warning: array subscript is above
	  array bounds
	- Deal better with forwarding loops

14 files changed, 185 insertions, 184 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 3d6e4134ca9..38caf59f15e 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.193 2007/07/04 20:55:05 jlam Exp $
+# $NetBSD: Makefile,v 1.194 2007/08/02 15:45:09 taca Exp $
 
-DISTNAME=	squid-2.6.STABLE13
+DISTNAME=	squid-2.6.STABLE14
 PKGNAME=	${DISTNAME:S/STABLE//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.6/ \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index bda0eb97c30..ecc8bf3652f 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.132 2007/05/13 16:45:44 taca Exp $
+$NetBSD: distinfo,v 1.133 2007/08/02 15:45:09 taca Exp $
 
-SHA1 (squid-2.6.STABLE13.tar.bz2) = e7e3cc93dadbfe2bdfa4d711a40259d45e360bd1
-RMD160 (squid-2.6.STABLE13.tar.bz2) = bfe7cdc6194bba93158441aaccaca3a0b0fad75d
-Size (squid-2.6.STABLE13.tar.bz2) = 1263229 bytes
-SHA1 (patch-aa) = fb8c4b6262215f2b7e7cca0e3bf9c60e7c4a3ee3
-SHA1 (patch-ab) = 68343a5094d4e333166a2404896e3370e369f0e1
+SHA1 (squid-2.6.STABLE14.tar.bz2) = ff4801955707ff8a6bba69275951071d6ce55d33
+RMD160 (squid-2.6.STABLE14.tar.bz2) = 40037786e6b6af40904aa8d4252eb7234046687c
+Size (squid-2.6.STABLE14.tar.bz2) = 1291509 bytes
+SHA1 (patch-aa) = 9aa971e21de833b13f81ef04939c5e29e03e2e37
+SHA1 (patch-ab) = 28e7bf58edbcd504bc4c780370a7bd402e66c6b0
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 0d37aaf5047fc38ea99192c3273bb2f72391d44c
-SHA1 (patch-ae) = 58cd3fda2578dccd64cb638be5829c736c489c8c
+SHA1 (patch-ad) = 2a09337fdf74b855a21cb41636d28f018cd1218b
+SHA1 (patch-ae) = d01c35059f34c4c0fa2cae547ddffbc635d6af94
 SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
-SHA1 (patch-ag) = 43c9ff0284367f05a667575ad8c5055294ff872b
 SHA1 (patch-aj) = fab8076c24a4e134b193fcdacc5240dfe7aa5504
-SHA1 (patch-ak) = c154f0e61f0d7874e16d595dcb4305c489bd31fa
+SHA1 (patch-ak) = 60e199e591dc6c4e2a93e67ba53b8cf75ae49631
 SHA1 (patch-al) = d0a3b639147842ca5d07114b561d2431d8800971
-SHA1 (patch-an) = 92d4b1e3018c06d0d7e40bc7d6e5e1fdde56e13e
-SHA1 (patch-ap) = 697092772e52e75dd1128790ea04a6902a5622e4
-SHA1 (patch-ar) = cb5f7100851112cf574c3002d5c6cecafb44611d
-SHA1 (patch-as) = a59f1242d2d386c019f59758db18e4f0ef52131f
+SHA1 (patch-an) = cb2ced35d368a33cdd6c51bdd0f02b4383f0ada6
+SHA1 (patch-ap) = 636475a33d69589485704fb99315862c52552323
+SHA1 (patch-ar) = 39a8d47d5a4d9cb325e58fb81eb20d2d7745a38c
+SHA1 (patch-as) = b1e7c6c8ab7f36a4a772b327dac58ba5a1edbf39
 SHA1 (patch-at) = 7ce72c964345203876d56d003353a5213c327252
+SHA1 (patch-au) = db41c3fc1b7ec6dd020559aa767d488738cd4747
 SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
 SHA1 (patch-bc) = 0b87eb5f4ccc06a0e59ed298fc3203b1b2641969
diff --git a/www/squid/options.mk b/www/squid/options.mk
index 3fd7ee295b4..3722f0ace18 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2007/02/25 07:34:45 taca Exp $
+# $NetBSD: options.mk,v 1.13 2007/08/02 15:45:10 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
-PKG_SUPPORTED_OPTIONS=	aufs carp icmp pam-helper snmp ssl unlinkd
+PKG_SUPPORTED_OPTIONS=	aufs carp coss icmp pam-helper snmp ssl unlinkd
 #
 # most of options are enabled by default except aufs.  aufs backend isn't
 # tested well.
@@ -95,6 +95,13 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mcoss)
+SQUID_BACKENDS+=	coss
+.if empty(PKG_OPTIONS:Maufs)
+PKG_FAIL_REASON+=	"The option needs aufs option, too."
+.endif
+.endif
+
 .if !empty(PKG_OPTIONS:Mdiskd)
 SQUID_BACKENDS+=	diskd
 .endif
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 2925878a3a6..d3b84f3c595 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-aa,v 1.21 2007/08/02 15:45:10 taca Exp $
 
---- src/Makefile.in.orig	2007-05-06 07:06:55.000000000 +0900
+--- src/Makefile.in.orig	2007-06-23 09:14:56.000000000 +0900
 +++ src/Makefile.in
-@@ -617,14 +617,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -622,14 +622,14 @@ 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
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
  DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
  
  # Don't automatically uninstall config files
-@@ -871,20 +871,20 @@ distclean-compile:
+@@ -877,20 +877,20 @@ distclean-compile:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
  	@$(NORMAL_INSTALL)
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
  	done
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
-@@ -1137,8 +1137,7 @@ info-am:
+@@ -1143,8 +1143,7 @@ info-am:
  
  install-data-am: install-data-local install-dataDATA
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
  
  install-info: install-info-recursive
  
-@@ -1165,7 +1164,7 @@ ps-am:
+@@ -1171,7 +1170,7 @@ ps-am:
  
  uninstall-am: uninstall-dataDATA uninstall-info-am \
  	uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.20 2007/05/13 16:45:44 taca Exp $
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1249,20 +1248,7 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1255,20 +1254,7 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
  	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
index 55bbe0b3ad0..906969e5b5b 100644
--- a/www/squid/patches/patch-ab
+++ b/www/squid/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-ab,v 1.9 2007/08/02 15:45:10 taca Exp $
 
---- scripts/Makefile.in.orig	2006-11-05 08:20:03.000000000 +0900
+--- scripts/Makefile.in.orig	2007-06-23 09:14:56.000000000 +0900
 +++ scripts/Makefile.in
-@@ -206,7 +206,7 @@ am__leading_dot = @am__leading_dot@
+@@ -208,7 +208,7 @@ am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index b086f8b38c8..bb035f3b166 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-ad,v 1.11 2007/08/02 15:45:10 taca Exp $
 
---- errors/Makefile.in.orig	2006-11-05 08:19:47.000000000 +0900
+--- errors/Makefile.in.orig	2007-06-23 09:14:40.000000000 +0900
 +++ errors/Makefile.in
-@@ -229,7 +229,7 @@ sbindir = @sbindir@
+@@ -231,7 +231,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index 583c2dbfd47..fd51b80ec4a 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-ae,v 1.11 2007/08/02 15:45:10 taca Exp $
 
---- icons/Makefile.in.orig	2006-11-05 08:20:02.000000000 +0900
+--- icons/Makefile.in.orig	2007-06-23 09:14:55.000000000 +0900
 +++ icons/Makefile.in
-@@ -266,7 +266,7 @@ ICON2 = anthony-bomb.gif \
+@@ -268,7 +268,7 @@ ICON2 = anthony-bomb.gif \
  		anthony-xbm.gif \
  		anthony-xpm.gif
  
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
deleted file mode 100644
index 0f9e2989624..00000000000
--- a/www/squid/patches/patch-ag
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-ag,v 1.27 2007/05/13 16:45:44 taca Exp $
-
---- configure.orig	2007-05-11 08:59:36.000000000 +0900
-+++ configure
-@@ -7324,6 +7324,7 @@ for ac_header in sys/types.h \
- 	linux/netfilter_ipv4.h \
- 	linux/netfilter_ipv4/ip_tproxy.h \
- 	malloc.h \
-+  	machine/byte_swap.h \
- 	math.h \
- 	memory.h \
- 	mount.h \
-@@ -13793,9 +13794,9 @@ _ACEOF
- 
- fi
- 
--echo "$as_me:$LINENO: checking for fd_mask" >&5
--echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6
--if test "${ac_cv_type_fd_mask+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for fd_set" >&5
-+echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; }
-+if test "${ac_cv_have_fd_mask+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -13824,26 +13825,63 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <sys/bitypes.h>
- #endif
- 
-+#include <sys/time.h>
-+#include <sys/unistd.h>
-+int
-+main ()
-+{
-+fd_mask fds;
-+  ;
-+  return 0;
-+}
- _ACEOF
--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
--  ac_cv_type_fd_mask=yes
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_have_fd_mask="yes"
- else
--  ac_cv_type_fd_mask=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+	ac_cv_have_fd_mask="no"
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
--echo "${ECHO_T}$ac_cv_type_fd_mask" >&6
--if test $ac_cv_type_fd_mask = no; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define fd_mask int
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
-+echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; }
- 
- echo "$as_me:$LINENO: checking size of off_t" >&5
- echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
-@@ -15811,8 +15849,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
-@@ -16863,7 +16901,7 @@ if test "$PF_TRANSPARENT" ; then
-     echo "$as_me:$LINENO: checking if PF header file is installed" >&5
- echo $ECHO_N "checking if PF header file is installed... $ECHO_C" >&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 -f /usr/include/net/pf/pfvar.h; then
- 	PF_TRANSPARENT="yes"
- 
- cat >>confdefs.h <<\_ACEOF
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
index 0a2912d20e9..1f4ac9a6e1a 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,32 +1,27 @@
-$NetBSD: patch-ak,v 1.11 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-ak,v 1.12 2007/08/02 15:45:10 taca Exp $
 
---- src/cf.data.pre.orig	2007-04-25 06:30:03.000000000 +0900
+--- src/cf.data.pre.orig	2007-06-26 08:34:57.000000000 +0900
 +++ src/cf.data.pre
-@@ -1414,6 +1414,23 @@ DOC_START
+@@ -1409,6 +1409,18 @@ DOC_START
+ 	formats).  To enable this logging set log_mime_hdrs to 'on'.
  DOC_END
  
- 
 +NAME: log_mime_hdrs_list
 +TYPE: wordlist
 +LOC: Config.log_mime_hdrs_list
-+DEFAULT: none
++DEFAULT: all
 +DOC_START
-+	The Cache can record both the request and the response MIME
-+	headers for each HTTP transaction.  The headers are encoded
-+	safely and will appear as two bracketed fields at the end of
-+	the access log (for either the native or httpd-emulated log
-+	formats). This list specifies which headers should be passed.
-+	Note header logging need to be enabled by 'log_mime_hdrs on'
-+	first.
++	This list specifies which headers should be passed when
++	header logging is enabled by 'log_mime_hdrs on'.  You can
++	specify list of header names or 'all'.
 +
 +log_mime_hdrs_list all
 +DOC_END
 +
-+
  NAME: useragent_log
  TYPE: string
  LOC: Config.Log.useragent
-@@ -3311,12 +3328,12 @@ DOC_END
+@@ -3275,12 +3287,12 @@ DOC_END
  
  NAME: cache_effective_user
  TYPE: string
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 2beff19abb0..ec6b64bf62e 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.13 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-an,v 1.14 2007/08/02 15:45:10 taca Exp $
 
---- configure.in.orig	2007-05-11 08:59:36.000000000 +0900
+--- configure.in.orig	2007-07-15 23:21:59.000000000 +0900
 +++ configure.in
-@@ -1593,6 +1593,7 @@ AC_CHECK_HEADERS(
+@@ -1609,11 +1609,13 @@ AC_CHECK_HEADERS(
  	linux/netfilter_ipv4.h \
  	linux/netfilter_ipv4/ip_tproxy.h \
  	malloc.h \
@@ -10,7 +10,13 @@ $NetBSD: patch-an,v 1.13 2007/05/13 16:45:44 taca Exp $
  	math.h \
  	memory.h \
  	mount.h \
-@@ -1958,7 +1959,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
+ 	net/if.h \
+ 	net/pfvar.h \
++	net/pf/pfvar.h \
+ 	netdb.h \
+ 	netinet/if_ether.h \
+ 	netinet/tcp.h \
+@@ -1974,7 +1976,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int)
  AC_CHECK_SYSTYPE(ssize_t, int)
  AC_CHECK_SYSTYPE(off_t, int)
  AC_CHECK_SYSTYPE(mode_t, unsigned short)
@@ -28,7 +34,7 @@ $NetBSD: patch-an,v 1.13 2007/05/13 16:45:44 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -2237,8 +2247,8 @@ if test "$GCC" = "yes"; then
+@@ -2253,8 +2264,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
@@ -39,3 +45,12 @@ $NetBSD: patch-an,v 1.13 2007/05/13 16:45:44 taca Exp $
  		;;
  	esac
  fi
+@@ -2648,7 +2659,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, [Enable support for Transparent Proxy on systems using PF address
+ 	redirection. This provides "masquerading" support for OpenBSD.])
diff --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap
index 646b9052470..1359d440115 100644
--- a/www/squid/patches/patch-ap
+++ b/www/squid/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.5 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-ap,v 1.6 2007/08/02 15:45:10 taca Exp $
 
---- helpers/basic_auth/MSNT/Makefile.in.orig	2006-11-05 08:19:50.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2007-06-23 09:14:44.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -524,9 +524,9 @@ info: info-am
+@@ -526,9 +526,9 @@ info: info-am
  
  info-am:
  
diff --git a/www/squid/patches/patch-ar b/www/squid/patches/patch-ar
index 044a8c40853..dd22e02c99f 100644
--- a/www/squid/patches/patch-ar
+++ b/www/squid/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.2 2007/05/13 16:45:44 taca Exp $
+$NetBSD: patch-ar,v 1.3 2007/08/02 15:45:11 taca Exp $
 
---- tools/Makefile.in.orig	2006-11-05 08:20:05.000000000 +0900
+--- tools/Makefile.in.orig	2007-06-23 09:14:59.000000000 +0900
 +++ tools/Makefile.in
-@@ -731,7 +731,7 @@ info: info-recursive
+@@ -733,7 +733,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/www/squid/patches/patch-as b/www/squid/patches/patch-as
index 86232434fc0..00a5ed65727 100644
--- a/www/squid/patches/patch-as
+++ b/www/squid/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.2 2007/05/13 16:45:45 taca Exp $
+$NetBSD: patch-as,v 1.3 2007/08/02 15:45:11 taca Exp $
 
---- Makefile.in.orig	2006-11-05 08:19:44.000000000 +0900
+--- Makefile.in.orig	2007-06-23 09:14:34.000000000 +0900
 +++ Makefile.in
-@@ -720,7 +720,7 @@ dist-hook:
+@@ -722,7 +722,7 @@ dist-hook:
  
  install-pinger:
  	chown root $(DEFAULT_PINGER) 
diff --git a/www/squid/patches/patch-au b/www/squid/patches/patch-au
new file mode 100644
index 00000000000..ba2133e992b
--- /dev/null
+++ b/www/squid/patches/patch-au
@@ -0,0 +1,106 @@
+$NetBSD: patch-au,v 1.1 2007/08/02 15:45:11 taca Exp $
+
+--- configure.orig	2007-07-15 23:21:59.000000000 +0900
++++ configure
+@@ -7342,11 +7342,13 @@ for ac_header in sys/types.h \
+ 	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
+ 	malloc.h \
++  	machine/byte_swap.h \
+ 	math.h \
+ 	memory.h \
+ 	mount.h \
+ 	net/if.h \
+ 	net/pfvar.h \
++	net/pf/pfvar.h \
+ 	netdb.h \
+ 	netinet/if_ether.h \
+ 	netinet/tcp.h \
+@@ -21058,11 +21060,13 @@ _ACEOF
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for fd_mask" >&5
+-echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6
+-if test "${ac_cv_type_fd_mask+set}" = set; then
++
++{ echo "$as_me:$LINENO: checking for fd_set" >&5
++echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; }
++if test "${ac_cv_have_fd_mask+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21070,34 +21074,13 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* What a mess.. many systems have added the (now standard) bit types
+- * in their own ways, so we need to scan a wide variety of headers to
+- * find them..
+- */
+ #include <sys/types.h>
+-#if STDC_HEADERS
+-#include <stdlib.h>
+-#include <stddef.h>
+-#endif
+-#if HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-#if HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#if HAVE_SYS_BITYPES_H
+-#include <sys/bitypes.h>
+-#endif
+-
+-
++#include <sys/time.h>
++#include <sys/unistd.h>
+ int
+ main ()
+ {
+-if ((fd_mask *) 0)
+-  return 0;
+-if (sizeof (fd_mask))
+-  return 0;
+-  ;
++fd_mask fds;
+   return 0;
+ }
+ _ACEOF
+@@ -21123,28 +21106,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_type_fd_mask=yes
++  ac_cv_have_fd_mask=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_fd_mask=no
++ac_cv_have_fd_mask=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
+-echo "${ECHO_T}$ac_cv_type_fd_mask" >&6
+-if test $ac_cv_type_fd_mask = yes; then
+-  :
+-else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define fd_mask int
+-_ACEOF
+ 
+ fi
+-
+-
++{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
++echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; }
+ 
+ 
+ echo "$as_me:$LINENO: checking for off_t" >&5