Update www/squid pacakge to 2.6.3 (squid 2.6.STABLE3).

Too may changes to mention here.
Please refer ${PREFIX}/share/doc/squid/RELEASENOTES.html.

19 files changed, 256 insertions, 215 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index a511cd8ffeb..299428b671e 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.181 2006/07/09 12:23:22 taca Exp $
+# $NetBSD: Makefile,v 1.182 2006/09/13 14:41:58 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE14
-PKGNAME=	squid-2.5.14
-PKGREVISION=	3
+DISTNAME=	squid-2.6.STABLE3
+PKGNAME=	squid-2.6.3
+#PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.6/ \
 		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.STABLE14-httpReplyDestroy.patch \
-		squid-2.5.STABLE14-hierarchy_tag.patch
-PATCH_DIST_STRIP= -p1
+#
+#PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.6/bugs/
+#PATCHFILES=
+#PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
@@ -42,6 +41,7 @@ PKG_USERS=	${SQUID_USER}:${SQUID_GROUP}
 
 PKG_GECOS.${SQUID_USER}=	Squid Web-Cache pseudo-user
 
+CONF_FILES+=	${EXAMPLESDIR}/cachemgr.conf ${PKG_SYSCONFDIR}/cachemgr.conf
 CONF_FILES+=	${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=	${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
 CONF_FILES+=	${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
@@ -49,7 +49,8 @@ OWN_DIRS=	${DATADIR}
 OWN_DIRS_PERMS+= ${DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
 		 ${DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
 EXAMPLES_FILES=	src/mime.conf.default src/squid.conf.default \
-		helpers/basic_auth/MSNT/msntauth.conf.default
+		helpers/basic_auth/MSNT/msntauth.conf.default \
+		tools/cachemgr.conf
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -57,7 +58,7 @@ PKG_SYSCONFSUBDIR?=	squid
 
 SQUID_USER?=	squid
 SQUID_GROUP?=	squid
-BUILD_DEFS+=	SQUID_USER SQUID_GROUP
+BUILD_DEFS+=	SQUID_USER SQUID_GROUP VARBASE
 
 CONFIGURE_ARGS+=	--enable-auth=basic,digest,ntlm \
 			--enable-cachemgr-hostname=localhost \
@@ -70,13 +71,14 @@ CONFIGURE_ARGS+=	--enable-auth=basic,digest,ntlm \
 #
 # generic helpers
 #
-OPTIONAL_FILES+= libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
+OPTIONAL_FILES+= libexec/diskd-daemon libexec/dnsserver
+OPTIONAL_FILES+= libexec/pinger libexec/unlinkd
 #
 # basic auth helpers (except LDAP, multi-domain-NTLM and SASL)
 #
 OPTIONAL_FILES+= libexec/getpwname_auth libexec/msnt_auth libexec/ncsa_auth
-OPTIONAL_FILES+= libexec/pam_auth man/man8/pam_auth.8 libexec/smb_auth
-OPTIONAL_FILES+= libexec/yp_auth libexec/wb_auth
+OPTIONAL_FILES+= libexec/pam_auth man/man8/ncsa_auth.8 man/man8/pam_auth.8
+OPTIONAL_FILES+= libexec/smb_auth libexec/yp_auth libexec/wb_auth
 #
 # digest auth helpers
 #
@@ -105,8 +107,7 @@ pre-install:
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 .for f in ${EXAMPLES_FILES}
-	cd ${WRKSRC} && \
-	${INSTALL_DATA}	${f} ${EXAMPLESDIR}/`basename ${f} .default`
+	${INSTALL_DATA}	${WRKSRC}/${f} ${EXAMPLESDIR}/`basename ${f} .default`
 .endfor
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/www/squid/PLIST b/www/squid/PLIST
index 636a20e1daf..83434a4bbef 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.19 2005/08/09 15:48:29 taca Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/09/13 14:41:58 taca Exp $
+bin/cossdump
 bin/squidclient
 libexec/cachemgr.cgi
 man/man8/cachemgr.cgi.8
 man/man8/squid.8
-sbin/RunAccel
 sbin/RunCache
 sbin/squid
 share/doc/squid/ChangeLog
 share/doc/squid/RELEASENOTES.html
 share/doc/squid/debug-sections.txt
 share/examples/rc.d/squid
+share/examples/squid/cachemgr.conf
 share/examples/squid/mime.conf
 share/examples/squid/msntauth.conf
 share/examples/squid/squid.conf
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 77f61cc62ec..148fdd87de0 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,26 +1,20 @@
-$NetBSD: distinfo,v 1.119 2006/07/09 12:23:22 taca Exp $
+$NetBSD: distinfo,v 1.120 2006/09/13 14:41:58 taca Exp $
 
-SHA1 (squid-2.5.14/squid-2.5.STABLE14.tar.bz2) = ca7837c222800e25def1b6aad7d26245cb365960
-RMD160 (squid-2.5.14/squid-2.5.STABLE14.tar.bz2) = 4af6b7c034e8b5aa19d8f95ec5a19f5780569224
-Size (squid-2.5.14/squid-2.5.STABLE14.tar.bz2) = 1073745 bytes
-SHA1 (squid-2.5.14/squid-2.5.STABLE14-httpReplyDestroy.patch) = dd67bf8cc229134012f2df3eb85e2cd1e0469def
-RMD160 (squid-2.5.14/squid-2.5.STABLE14-httpReplyDestroy.patch) = cbba4d9bc67ee30be19e2c774aa1dc038b72245f
-Size (squid-2.5.14/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 bytes
-SHA1 (squid-2.5.14/squid-2.5.STABLE14-hierarchy_tag.patch) = a3bfca773c9b0a9437064c709c8fb9974dd09ec8
-RMD160 (squid-2.5.14/squid-2.5.STABLE14-hierarchy_tag.patch) = 06f989912b5897de7e451ddf53eb0ebbcb5f1ee9
-Size (squid-2.5.14/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319 bytes
-SHA1 (patch-aa) = 49032ad1c2ece5c88805276ddd76d0f9ac09cd02
-SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
+SHA1 (squid-2.6.3/squid-2.6.STABLE3.tar.bz2) = d28ee77de9f118ab5d09d5f8e5b1f23974ab9b37
+RMD160 (squid-2.6.3/squid-2.6.STABLE3.tar.bz2) = 0f3fdc54e8b0bc740f5124e2a54245afceea24ac
+Size (squid-2.6.3/squid-2.6.STABLE3.tar.bz2) = 1231527 bytes
+SHA1 (patch-aa) = bcbe4e0bf3cd632497dc8045c1b8d86842edf90c
+SHA1 (patch-ab) = e4b9213dcbae32b65d0fe69b9cf9cff49aae504e
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 3c1bce9266818b676b7cce4c2ef1f18e1edf9dd6
-SHA1 (patch-ae) = 2f9857bde5606d412276cb88ba28a38b9a67bd8e
-SHA1 (patch-af) = 9a93e1b98ade2b52089773bd8533586b0cd76925
-SHA1 (patch-ag) = 560f3a2a571cb988a1080e8d45f29a9eafef959e
-SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
-SHA1 (patch-ak) = 590fc6e981c3b95e1a77a2d801747f328ca31a2e
-SHA1 (patch-al) = 931108431486868cdb714dd9fb1f11b27d092b20
-SHA1 (patch-an) = e96eaf094579208da58e3777dfad7e58b5933101
-SHA1 (patch-ap) = e0b7a203f6e299c6e103aaf50aed611a0670bb14
-SHA1 (patch-aq) = c3cd4f6b8da435912e1054cd47161cab8260344d
-SHA1 (patch-bb) = dd9de273a1c1d49ec64ad79c49fad9ac862650d7
-SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
+SHA1 (patch-ad) = 8dc230430b9030951232c6881100234caffdd0d9
+SHA1 (patch-ae) = 5af05ae0ec09b7a6f3af61201f60357909b9e6c8
+SHA1 (patch-af) = a78e762c1ad928eef66b12395d48bc69542e32d9
+SHA1 (patch-ag) = 086b9f27b8a8eb892880be84c0485d72020b9ff0
+SHA1 (patch-aj) = e19317d35da85ad7481fdcd154c42706b605dc75
+SHA1 (patch-ak) = cec28eee3366b43ac574df6591a73a2d33be1a67
+SHA1 (patch-al) = 8f9ede6e80ba6950bf351fc75bbca8dbfbf110b6
+SHA1 (patch-an) = eb91d86926d5d25b92ec93e09c2b2da1d6f6389f
+SHA1 (patch-ap) = bf2223ea0ab660b2fdb6043845cedac5907bd1f0
+SHA1 (patch-ar) = a80477b24d02688f1f55ba1d4967bf340b5c04cb
+SHA1 (patch-bb) = 6711186c3e3e7992f9874eb47df7c0d3690649c2
+SHA1 (patch-bc) = 87d67c6d00c0734eebc1d7c6a9bcd1e3331400d9
diff --git a/www/squid/options.mk b/www/squid/options.mk
index 8a7ce9260ed..8da67929342 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/12/23 15:37:41 taca Exp $
+# $NetBSD: options.mk,v 1.8 2006/09/13 14:41:58 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS=	aufs carp icmp pam-helper snmp ssl unlinkd
@@ -43,7 +43,7 @@ PKG_SUPPORTED_OPTIONS+=	arp-acl
 .include "../../mk/bsd.options.mk"
 
 SQUID_BACKENDS?=		ufs null
-SQUID_BASIC_AUTH_HELPERS?=	getpwnam MSNT NCSA YP winbind
+SQUID_BASIC_AUTH_HELPERS?=	getpwnam MSNT NCSA YP
 SQUID_DIGEST_AUTH_HELPERS?=	password
 SQUID_NTLM_AUTH_HELPERS?=	fakeauth SMB
 SQUID_EXTERNAL_ACL_HELPERS?=	ip_user unix_group
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 49c99f95d05..1b212e9f17d 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-aa,v 1.19 2006/09/13 14:41:58 taca Exp $
 
---- src/Makefile.in.orig	2005-09-29 05:57:21.000000000 +0900
+--- src/Makefile.in.orig	2006-07-30 17:56:18.000000000 +0900
 +++ src/Makefile.in
-@@ -388,14 +388,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -590,14 +590,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
@@ -11,61 +11,62 @@ $NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
  DEFAULT_SWAP_DIR = $(localstatedir)/cache
  DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
  DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
 -DEFAULT_ICON_DIR = $(datadir)/icons
 -DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 -DEFAULT_MIB_PATH = $(datadir)/mib.txt
 +DEFAULT_ICON_DIR = $(datadir)/squid/icons
 +DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
 +DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
+ DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
  
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
-@@ -860,20 +860,20 @@ CCDEPMODE = @CCDEPMODE@
+ # Don't automatically uninstall config files
+@@ -842,20 +842,20 @@ distclean-compile:
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
  	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/squid
+-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
++	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)/squid"
  	@list='$(data_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
+-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
++	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/squid/$$f'"; \
++	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/squid/$$f"; \
  	done
  
  uninstall-dataDATA:
  	@$(NORMAL_UNINSTALL)
  	@list='$(data_DATA)'; for p in $$list; do \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
--	  rm -f $(DESTDIR)$(datadir)/$$f; \
-+	  echo " rm -f $(DESTDIR)$(datadir)/squid/$$f"; \
-+	  rm -f $(DESTDIR)$(datadir)/squid/$$f; \
+ 	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(datadir)/squid/$$f'"; \
++	  rm -f "$(DESTDIR)$(datadir)/squid/$$f"; \
  	done
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
-@@ -1072,7 +1072,7 @@ info-am:
+@@ -1108,8 +1108,7 @@ info-am:
+ 
  install-data-am: install-data-local install-dataDATA
  
- install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
--	install-sbinPROGRAMS install-sysconfDATA
-+	install-sbinPROGRAMS
+-install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
+-	install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS
  
  install-info: install-info-recursive
  
-@@ -1090,7 +1090,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1136,7 +1135,7 @@ ps-am:
  
- uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
+ uninstall-am: uninstall-dataDATA uninstall-info-am \
  	uninstall-libexecPROGRAMS uninstall-local \
 -	uninstall-sbinPROGRAMS uninstall-sysconfDATA
 +	uninstall-sbinPROGRAMS
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1175,26 +1175,7 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1220,20 +1219,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
  
@@ -82,12 +83,6 @@ $NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
 -	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
 -	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 -	fi
--	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
--	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
--	else \
--	        echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \
--	        $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \
--	fi
 -	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 +install-data-local: install-dataDATA
  
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
index 95420dc15e8..bd6a4f2c508 100644
--- a/www/squid/patches/patch-ab
+++ b/www/squid/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-ab,v 1.7 2006/09/13 14:41:58 taca Exp $
 
---- scripts/Makefile.in.orig	Fri Jul 12 17:38:25 2002
+--- scripts/Makefile.in.orig	2006-06-12 15:10:08.000000000 +0900
 +++ scripts/Makefile.in
-@@ -26,7 +26,7 @@ VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- 
+@@ -198,7 +198,7 @@ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
 -bindir = @bindir@
 +bindir = @sbindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index a9e236bb080..8ace6189bb9 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.8 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-ad,v 1.9 2006/09/13 14:41:58 taca Exp $
 
---- errors/Makefile.in.orig	2006-03-11 07:51:47.000000000 +0900
+--- errors/Makefile.in.orig	2006-06-12 15:09:43.000000000 +0900
 +++ errors/Makefile.in
-@@ -121,7 +121,7 @@ am__quote = @am__quote@
- install_sh = @install_sh@
- makesnmplib = @makesnmplib@
- 
+@@ -221,7 +221,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -errordir = $(datadir)/errors
 +errordir = $(datadir)/squid/errors
- 
  DEFAULT_ERROR_DIR = $(errordir)
- 
+ INSTALL_LANGUAGES = @ERR_LANGUAGES@
+ LANGUAGES = \
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index fbc4d3bc0de..50df351e122 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.8 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-ae,v 1.9 2006/09/13 14:41:58 taca Exp $
 
---- icons/Makefile.in.orig	2005-09-29 05:57:20.000000000 +0900
+--- icons/Makefile.in.orig	2006-06-12 15:10:08.000000000 +0900
 +++ icons/Makefile.in
-@@ -149,7 +149,7 @@ ICON2 = anthony-bomb.gif \
+@@ -258,7 +258,7 @@ ICON2 = anthony-bomb.gif \
+ 		anthony-xbm.gif \
  		anthony-xpm.gif
  
- 
 -icondir = $(datadir)/icons
 +icondir = $(datadir)/squid/icons
  icon_DATA = $(ICON1) $(ICON2)
diff --git a/www/squid/patches/patch-af b/www/squid/patches/patch-af
index a9e0f63631b..f197c837961 100644
--- a/www/squid/patches/patch-af
+++ b/www/squid/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.5 2005/12/30 14:37:38 joerg Exp $
+$NetBSD: patch-af,v 1.6 2006/09/13 14:41:58 taca Exp $
 
---- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	2005-12-30 14:26:23.000000000 +0000
+--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig	2005-05-18 01:56:33.000000000 +0900
 +++ helpers/ntlm_auth/SMB/smbval/smblib-util.c
-@@ -62,6 +62,7 @@ static char *SMB_Prots[] =
+@@ -60,6 +60,7 @@ static char *SMB_Prots[] =
+     "NT LANMAN 1.0",
+     NULL};
  
++#if 0
  /* Print out an SMB pkt in all its gory detail ... */
  
-+#if 0
  void
- SMB_Print_Pkt(FILE fd, RFCNB_Pkt * pkt, BOOL command, int Offset, int Len)
- {
 @@ -78,6 +79,7 @@ SMB_Print_Pkt(FILE fd, RFCNB_Pkt * pkt, 
      /* etc                                                 */
  
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index e89d5239193..857b3c9417f 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,92 +1,135 @@
-$NetBSD: patch-ag,v 1.23 2005/10/23 22:32:32 taca Exp $
+$NetBSD: patch-ag,v 1.24 2006/09/13 14:41:58 taca Exp $
 
---- configure.orig	2005-10-22 18:56:01.000000000 +0900
+--- configure.orig	2006-07-31 11:53:51.000000000 +0900
 +++ configure
-@@ -2249,7 +2238,7 @@ if test "${enable_snmp+set}" = set; then
+@@ -3970,7 +3970,7 @@ cat >>confdefs.h <<\_ACEOF
  #define SQUID_SNMP 1
- EOF
+ _ACEOF
  
 -    SNMPLIB='-L../snmplib -lsnmp'
 +    SNMPLIB='../snmplib/libsnmp.a'
-     
+ 
  
  if true; then
-@@ -4070,6 +4059,7 @@ for ac_hdr in \
+@@ -7057,6 +7057,7 @@ for ac_header in sys/types.h \
  	libc.h \
- 	limits.h \
  	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
 + 	machine/byte_swap.h \
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -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
--#define mode_t u_short
-+#define mode_t unsigned short
- EOF
+@@ -13512,9 +13513,9 @@ _ACEOF
  
  fi
  
--echo $ac_n "checking for fd_mask""... $ac_c" 1>&6
--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: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
+-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 <<EOF
--#line 6332 "configure"
-+#line 6324 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -13523,46 +13524,64 @@ _ACEOF
+ 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() {
++int
++main ()
++{
 +fd_mask fds;
-+; return 0; }
- EOF
++  ;
++  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
-+if { (eval echo configure:6333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
+-  $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
-+  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"
- fi
- rm -f conftest*
+-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 "$ac_t""$ac_cv_type_fd_mask" 1>&6
+-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 <<\EOF
+ 
+-cat >>confdefs.h <<\_ACEOF
 -#define fd_mask int
--EOF
--
--fi
+-_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-+echo "$ac_t""$ac_cv_have_fd_mask" 1>&6
+ fi
+-
++{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
++echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; }
  
- echo $ac_n "checking size of off_t""... $ac_c" 1>&6
--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
+ echo "$as_me:$LINENO: checking size of off_t" >&5
+ echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
+@@ -15530,8 +15549,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-aj b/www/squid/patches/patch-aj
index 41c667c962d..e91b9f83e18 100644
--- a/www/squid/patches/patch-aj
+++ b/www/squid/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.6 2002/10/13 16:43:21 taca Exp $
+$NetBSD: patch-aj,v 1.7 2006/09/13 14:41:58 taca Exp $
 
---- src/access_log.c.orig	Sun Jun 16 20:25:40 2002
+--- src/access_log.c.orig	2006-07-27 05:21:16.000000000 +0900
 +++ src/access_log.c
-@@ -120,6 +120,8 @@ log_quote(const char *header)
+@@ -117,6 +117,8 @@ log_quote(const char *header)
  {
      int c;
      int i;
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.6 2002/10/13 16:43:21 taca Exp $
      char *buf;
      char *buf_cursor;
      if (header == NULL) {
-@@ -129,13 +131,41 @@ log_quote(const char *header)
+@@ -126,13 +128,41 @@ log_quote(const char *header)
      }
      buf = xcalloc(1, (strlen(header) * 3) + 1);
      buf_cursor = buf;
@@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.6 2002/10/13 16:43:21 taca Exp $
  #if !OLD_LOG_MIME
  	if (c == '\r') {
  	    *buf_cursor++ = '\\';
-@@ -143,6 +173,7 @@ log_quote(const char *header)
+@@ -140,6 +170,7 @@ log_quote(const char *header)
  	} else if (c == '\n') {
  	    *buf_cursor++ = '\\';
  	    *buf_cursor++ = 'n';
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
index c613f42fa56..204f5e21f2d 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.9 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-ak,v 1.10 2006/09/13 14:41:58 taca Exp $
 
---- src/cf.data.pre.orig	2006-02-26 08:01:45.000000000 +0900
+--- src/cf.data.pre.orig	2006-07-31 10:31:18.000000000 +0900
 +++ src/cf.data.pre
-@@ -953,6 +953,23 @@ DOC_START
+@@ -1349,6 +1349,23 @@ DOC_START
  DOC_END
  
  
@@ -26,3 +26,18 @@ $NetBSD: patch-ak,v 1.9 2006/03/12 12:12:19 taca Exp $
  NAME: useragent_log
  TYPE: string
  LOC: Config.Log.useragent
+@@ -3245,12 +3262,12 @@ DOC_END
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: @USER@
+ LOC: Config.effectiveUser
+ DOC_START
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the user specified below.  The default is to change
+-	to UID to nobody.  If you define cache_effective_user, but not
++	to UID to @USER@.  If you define cache_effective_user, but not
+ 	cache_effective_group, Squid sets the GID to the effective
+ 	user's default group ID (taken from the password file) and
+ 	supplementary group list from the from groups membership of
diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al
index cc441e61562..d894061ec2c 100644
--- a/www/squid/patches/patch-al
+++ b/www/squid/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.7 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-al,v 1.8 2006/09/13 14:41:58 taca Exp $
 
---- src/structs.h.orig	2006-03-11 07:54:38.000000000 +0900
+--- src/structs.h.orig	2006-07-31 08:27:03.000000000 +0900
 +++ src/structs.h
-@@ -540,6 +540,7 @@ struct _SquidConfig {
+@@ -597,6 +597,7 @@ struct _SquidConfig {
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 4dd8e891133..c349c49f2a5 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,31 +1,29 @@
-$NetBSD: patch-an,v 1.10 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-an,v 1.11 2006/09/13 14:41:58 taca Exp $
 
---- configure.in.orig	2006-03-12 20:29:22.000000000 +0900
+--- configure.in.orig	2006-07-31 11:53:51.000000000 +0900
 +++ configure.in
-@@ -496,7 +496,7 @@ AC_ARG_ENABLE(snmp,
+@@ -586,7 +586,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
      echo "SNMP monitoring enabled"
-     AC_DEFINE(SQUID_SNMP)
+     AC_DEFINE(SQUID_SNMP, 1, [Define to enable SNMP monitoring of Squid])
 -    SNMPLIB='-L../snmplib -lsnmp'
 +    SNMPLIB='../snmplib/libsnmp.a'
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1305,6 +1305,7 @@ AC_CHECK_HEADERS( \
+@@ -1534,6 +1534,7 @@ AC_CHECK_HEADERS(
  	libc.h \
- 	limits.h \
  	linux/netfilter_ipv4.h \
+ 	linux/netfilter_ipv4/ip_tproxy.h \
 + 	machine/byte_swap.h \
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1532,8 +1533,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)
--AC_CHECK_TYPE(mode_t, u_short)
--AC_CHECK_TYPE(fd_mask, int)
-+AC_CHECK_TYPE(mode_t, unsigned short)
+@@ -1888,7 +1889,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)
+-AC_CHECK_SYSTYPE(fd_mask, int)
 +
 +dnl Check for type fd_mask
 +AC_CACHE_CHECK(for fd_set,ac_cv_have_fd_mask, [
@@ -39,7 +37,7 @@ $NetBSD: patch-an,v 1.10 2006/03/12 12:12:19 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1741,8 +1751,8 @@ if test "$GCC" = "yes"; then
+@@ -2167,8 +2177,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 b590b79db8a..e6884d2e4cc 100644
--- a/www/squid/patches/patch-ap
+++ b/www/squid/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-ap,v 1.4 2006/09/13 14:41:58 taca Exp $
 
---- helpers/basic_auth/MSNT/Makefile.in.orig	2005-09-29 05:57:18.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2006-06-12 15:09:45.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -385,9 +385,9 @@ info: info-am
+@@ -516,9 +516,9 @@ info: info-am
  
  info-am:
  
diff --git a/www/squid/patches/patch-aq b/www/squid/patches/patch-aq
deleted file mode 100644
index bc3c55f9974..00000000000
--- a/www/squid/patches/patch-aq
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/05/16 05:47:53 taca Exp $
-
---- src/cf.data.pre.orig	2006-05-16 12:31:15.000000000 +0900
-+++ src/cf.data.pre
-@@ -2499,12 +2499,12 @@ DOC_END
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: @USER@
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
- 	UID/GID to the user specified below.  The default is to change
--	to UID to nobody.  If you define cache_effective_user, but not
-+	to UID to @USER@.  If you define cache_effective_user, but not
- 	cache_effective_group, Squid sets the GID to the effective
- 	user's default group ID (taken from the password file) and
- 	supplementary group list from the from groups membership of
diff --git a/www/squid/patches/patch-ar b/www/squid/patches/patch-ar
new file mode 100644
index 00000000000..910589e7790
--- /dev/null
+++ b/www/squid/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2006/09/13 14:41:58 taca Exp $
+
+--- tools/Makefile.in.orig	2006-07-06 17:35:32.000000000 +0900
++++ tools/Makefile.in
+@@ -720,7 +720,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+ 
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index a590bba0a07..9bb081fa966 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,14 +1,14 @@
-$NetBSD: patch-bb,v 1.9 2006/03/12 12:12:19 taca Exp $
+$NetBSD: patch-bb,v 1.10 2006/09/13 14:41:58 taca Exp $
 
---- include/autoconf.h.in.orig	2005-09-13 09:12:34.000000000 +0900
+--- include/autoconf.h.in.orig	2006-07-13 00:00:31.000000000 +0900
 +++ include/autoconf.h.in
-@@ -671,6 +671,9 @@
- /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
- #undef HAVE_LINUX_NETFILTER_IPV4_H
+@@ -231,6 +231,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 if you have the <malloc.h> header file.  */
- #undef HAVE_MALLOC_H
+ /* Define to 1 if you have the `mallinfo' function. */
+ #undef HAVE_MALLINFO
  
diff --git a/www/squid/patches/patch-bc b/www/squid/patches/patch-bc
index c2d38286ffc..472f5f423c7 100644
--- a/www/squid/patches/patch-bc
+++ b/www/squid/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2002/10/13 16:43:22 taca Exp $
+$NetBSD: patch-bc,v 1.2 2006/09/13 14:41:58 taca Exp $
 
---- include/ntlmauth.h.orig	Wed Nov 14 06:12:36 2001
+--- include/ntlmauth.h.orig	2005-05-18 01:56:35.000000000 +0900
 +++ include/ntlmauth.h
 @@ -70,10 +70,14 @@
  #define bswap16(x) bswap_16(x)
@@ -8,12 +8,12 @@ $NetBSD: patch-bc,v 1.1 2002/10/13 16:43:22 taca Exp $
  #else	 /* HAVE_BISTWAP_H */
 +#ifdef HAVE_MACHINE_BYTE_SWAP_H
 +#include <machine/byte_swap.h>
-+#else
++#else	/* HAVE_MACHINE_BYTE_SWAP_H */
  #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8))
  #define bswap32(x) \
      (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >>  8) | \
       ((((u_int32_t)x) & 0x0000ff00) <<  8) | ((((u_int32_t)x) & 0x000000ff) << 24))
-+#endif
++#endif	/* HAVE_MACHINE_BYTE_SWAP_H */
  #endif /* HAVE_BITSWAP_H */
  
  /* Used internally. Microsoft seems to think this is right, I believe them.