Update squid to 2.5.1 with several patches from

http://www.squid-cache.org/Versions/v2/2.5/bugs/.

Now try to install more authentication modules, but those modules
should be handled by proper frame work (Curretly, SASL modules
aren't handled).

Changes to squid-2.5 ():

	- Major rewrite of proxy authentication to support other schemes
	  than basic. First in the line is NTLM support but others can
	  easily be added (minimal digest is present). See Programmers Guide.
	  (Robert Collins & Francesco Chemolli)
	- Reworked how request bodies are passed down to the protocols.
	  Now all client side processing is inside client_side.c, and
	  the pass and pump modules is no longer used.
	- Optimized searching in proxy_auth and ident ACL types. Squid should
	  now handle large access lists a lot more efficiently.
	  (Francesco Chemolli)
	- Fixed forwarding/peer loop detection code (Brian Degenhardt) -
	  now a peer is ignored if it turns out to be us, rather than
	  committing suicide
	- Changed the internal URL code to obey appendDomain for internal
	  objects if it needs appending. This fixes weirdnesses where
	  a machine can think it is "foo.bar.com", and "foo" is requested.
	  (Brian Degenhardt)
	- Added the use of Automake to create the Makefile.in's in the squid
	  source tree. This will allow libtool in the future, and immediately
	  allows better dependency tracking - with or without gcc - as well
	  as the dist-all and distcheck targets for developers which respectively
	  build a tar.gz and a tar.bz2 distribution, and check that what will be
	  distributed builds.
	- Added TOS and source address selection based on ACLs,
	  written by Roger Venning. This allows administrators to set
	  the TOS precedence bits and/or the source IP from a set of
	  available IPs based upon some ACLs, generally to map different
	  users to different outgoing links and traffic profiles.
	- Added 'max-conn' option to 'cache_peer'
	- Added SSL gatewaying support, allowing Squid to act as a SSL server
	  in accelerator setups.
	- SASL authentication helper by Ian Castle
	- msntauth updated to v2.0.3
	- no_cache now applies to cache hits as well as cache misses
	- the Gopher client in Squid has been significantly improved
	- Squid now sanity checks FTP data connections to ensure the
	  connection is from the requested server. Can be disabled if
	  needed by turning off the ftp_sanitycheck option.
	- external acl support. A mechanism where flexible ACL checks
	  can be driven by external helpers. See the external_acl_type
	  and acl external directives.
	- Countless other small things and fixes
	- HTML pages generated by Squid or CacheMgr as well as the
	  ERR documents now contain a doctype declaration so that
	  browsers know which HTML specification the document uses.
	  In addition to that they have a new look (background-color, font)
	  and are valid according to the HTML standards at www.w3.org.
	  (Clemens Löser)
	- Login and password send to Basic auth helpers is now URL escaped
	  to allow for spaces and other "odd" characters in logins and
	  passwords
	- Proxy Authentication is no longer blindly forwarded to peer
	  caches if not used locally. If forwarding of proxy authentication
	  is desired then it must now be configured with the login=PASS
	  cache_peer option.
	- Responses with Vary: in the header are now cached by squid.
	  (Henrik Nordstrom).
	- Removed unused 'siteselect_timeout' directive.

16 files changed, 320 insertions, 1110 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 6c9c20053dd..46a7612f375 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,11 +1,21 @@
-# $NetBSD: Makefile,v 1.68 2002/09/19 09:04:32 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2002/10/13 16:43:20 taca Exp $
 
-DISTNAME=	squid-2.4.STABLE7-src
-PKGNAME=	squid-2.4.7
+DISTNAME=	squid-2.5.STABLE1
+PKGNAME=	squid-2.5.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.4/ \
+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.STABLE1-disable-ident-lookups.patch \
+		squid-2.5.STABLE1-disable-http-violations.patch \
+		squid-2.5.STABLE1-proxy_auth.patch \
+		squid-2.5.STABLE1-max_user_ip.patch \
+		squid-2.5.STABLE1-cache_dir_docs.patch \
+		squid-2.5.STABLE1-load_icons.patch
+PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
@@ -25,7 +35,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
 CONFIGURE_ENV+=	PERL=${PERL5}
 
 BUILD_DEFS+=	SQUID_CONFIGURE_ARGS
-MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
 PLIST_SRC=	${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
@@ -38,15 +47,28 @@ CONF_FILES+=	${PREFIX}/share/examples/squid/squid.conf \
 
 # Configuration options which can be overwritten by the user.
 SQUID_CONFIGURE_ARGS?=	--disable-internal-dns \
+			--enable-auth=basic,digest,ntlm \
 			--enable-cachemgr-hostname=localhost \
 			--enable-delay-pools \
+			--enable-removal-policies=lru,heap \
 			--enable-icmp \
 			--enable-ipf-transparent \
+			--enable-poll \
 			--enable-snmp \
+			--enable-ssl \
+			--with-openssl=${SSLBASE} \
 			--enable-underscores \
-			--enable-storeio=ufs,diskd
+			--enable-storeio=ufs,diskd,null \
+			--enable-basic-auth-helpers=getpwnam,winbind,SMB \
+			--enable-digest-auth-helpers=password \
+			--enable-external-acl-helpers=unix_group,ip_user,winbind_group \
+			--enable-ntlm-auth-helpers=winbind
 
-OPTIONAL_FILES=	libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
+OPTIONAL_FILES+= libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
+OPTIONAL_FILES+= libexec/digest_pw_auth libexec/getpwname_auth
+OPTIONAL_FILES+= libexec/ip_user_check libexec/smb_auth libexec/smb_auth.sh
+OPTIONAL_FILES+= libexec/wb_auth libexec/wb_group
+OPTIONAL_FILES+= libexec/wb_ntlmauth
 
 pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid
@@ -55,14 +77,18 @@ pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
 
 post-install:
-	cd ${WRKSRC}/src; ${TEST} ! -x pinger || ${MAKE} install-pinger
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(							\
 	for FILE in ${OPTIONAL_FILES}; do			\
 	  ${TEST} ! -e ${PREFIX}/$$FILE || ${ECHO} $$FILE;	\
 	done;							\
-	cd ${WRKSRC}/errors/English;				\
-	ls ERR_* | ${SED} -e 's@^@share/squid/errors/@';	\
+	cd ${WRKSRC}/errors;					\
+	for i in *; do \
+		${TEST} -d $$i &&				\
+		(${LS} $$i/ERR_* |				\
+		${SED} -e 's@^@share/squid/errors/@';		\
+		${ECHO} "@dirrm share/squid/errors/$$i");	\
+	done; 							\
 	${ECHO} "@dirrm share/squid/errors";			\
 	cd ${WRKSRC}/icons;					\
 	ls anthony-*.gif | ${SED} -e 's@^@share/squid/icons/@';	\
@@ -71,5 +97,7 @@ post-install:
 	${ECHO} "@dirrm share/squid"				\
 	) >>${PLIST_SRC}
 
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squid/PLIST b/www/squid/PLIST
index 2cf36e3e673..18f5f0d7abb 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2002/09/15 14:39:51 grant Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/10/13 16:43:20 taca Exp $
+bin/squidclient
 etc/rc.d/squid
 @unexec ${RMDIR} %D/etc/squid 2>/dev/null || ${TRUE}
 libexec/cachemgr.cgi
+libexec/squid_unix_group
+man/man8/squid.8
+man/man8/squid_unix_group.8
 share/examples/squid/mime.conf
 share/examples/squid/squid.conf
 sbin/RunAccel
 sbin/RunCache
-sbin/client
 sbin/squid
 @dirrm share/examples/squid
 @exec ${MKDIR} ${PKG_SYSCONFDIR}
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 38a404eeab6..a9c6d659540 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,18 +1,30 @@
-$NetBSD: distinfo,v 1.16 2002/07/04 06:11:44 tron Exp $
+$NetBSD: distinfo,v 1.17 2002/10/13 16:43:20 taca Exp $
 
-SHA1 (squid-2.4.STABLE7-src.tar.gz) = 91d05fbfd07545c7f11a997e988f8412b259a902
-Size (squid-2.4.STABLE7-src.tar.gz) = 1087532 bytes
-SHA1 (patch-aa) = f78e4aa062ff3df0ba3c66b5b6d98db8733ba5c3
-SHA1 (patch-ab) = afb0c443c708d03fc7ab39120ae9a3c68d9e9b88
+SHA1 (squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62
+Size (squid-2.5.STABLE1.tar.bz2) = 1006600 bytes
+SHA1 (squid-2.5.STABLE1-disable-ident-lookups.patch) = 8b21d1c40c85a86c575e039021b10010e0ab55a8
+Size (squid-2.5.STABLE1-disable-ident-lookups.patch) = 695 bytes
+SHA1 (squid-2.5.STABLE1-disable-http-violations.patch) = 16c24d98ca41a0aaa15c4f58fafc3b5adfd3d375
+Size (squid-2.5.STABLE1-disable-http-violations.patch) = 405 bytes
+SHA1 (squid-2.5.STABLE1-proxy_auth.patch) = acbe54df4e2f6f00ac17d20e8b65a33c8fb27c32
+Size (squid-2.5.STABLE1-proxy_auth.patch) = 6507 bytes
+SHA1 (squid-2.5.STABLE1-max_user_ip.patch) = fcab373dc21c2b79e397a594469e18a308c13f41
+Size (squid-2.5.STABLE1-max_user_ip.patch) = 12639 bytes
+SHA1 (squid-2.5.STABLE1-cache_dir_docs.patch) = 3795590991c447b1f4b3bc78db78722f4c1709df
+Size (squid-2.5.STABLE1-cache_dir_docs.patch) = 960 bytes
+SHA1 (squid-2.5.STABLE1-load_icons.patch) = 960858c6d8ada1d70c20d740148de42ddb3c93a0
+Size (squid-2.5.STABLE1-load_icons.patch) = 1254 bytes
+SHA1 (patch-aa) = a15b9ccca79a8eeaacbf035f392f251ef98e0470
+SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd
-SHA1 (patch-ad) = 03f76c2a781bff4b3a8680ee815f8c5dcbdd70d0
-SHA1 (patch-ae) = 5189de99c6f453ef58b97a4df54c065c87cf7e21
-SHA1 (patch-ag) = 9f7e81052d8134d3da970148dbfe51a7be072e62
+SHA1 (patch-ad) = 23a906011ffef78d070cc49c94c4f4837eb319ec
+SHA1 (patch-ae) = 33888cf772b3fb3b7c4352cc29551a2dadfb12fa
+SHA1 (patch-ag) = 7a0aa328d18374a4a954f66ac1431779a303f395
 SHA1 (patch-ah) = c80f9d8ce5fae7f399583607aa7f7153824465b7
-SHA1 (patch-aj) = 2a8a7df72d0e978c069a8f273a0ee91ac31aa985
-SHA1 (patch-ak) = a3f3000dbab7ba6f08904008ccf9e08bc70b3e3f
-SHA1 (patch-al) = d0741a93a4df8bf94b07e65680b50c294243c728
-SHA1 (patch-am) = c844378a03ae27ae52eb454958fb9ed7bc0ce21e
-SHA1 (patch-an) = 1db7caccce45fa29d61f6341a22ac29e02ee4b93
-SHA1 (patch-ba) = c29829c4f1fcd094102188e1ef4fd28bb73ba2ce
-SHA1 (patch-bb) = d6d3cc0ddfcda9c36e95d37b7986a7a5c1e89486
+SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
+SHA1 (patch-ak) = 19861281d8a9ece352ce9e881e1e60f6787933e3
+SHA1 (patch-al) = 534f273ec63f6de0818f1f86a2b655eac4564213
+SHA1 (patch-an) = 8748cfb50e0acb6588228b87b424f87b0c48cc59
+SHA1 (patch-ba) = c91bc26e4b6df2cb4b7042591efb4afd7c989462
+SHA1 (patch-bb) = 70e92462230ac3b9920946b089290d9ec814fade
+SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 2e2e212e8c2..574da23c154 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,129 +1,95 @@
-$NetBSD: patch-aa,v 1.9 2002/03/23 17:16:50 kim Exp $
+$NetBSD: patch-aa,v 1.10 2002/10/13 16:43:21 taca Exp $
 
---- src/Makefile.in.orig	Wed Apr  4 03:01:12 2001
-+++ src/Makefile.in	Sat Mar 23 12:10:02 2002
-@@ -12,6 +12,8 @@
- cgi_suffix	= @cgi_suffix@
- top_srcdir	= @top_srcdir@
- bindir		= @bindir@
-+sbindir		= @sbindir@
-+datadir		= @datadir@
- libexecdir      = @libexecdir@
- sysconfdir	= @sysconfdir@
- localstatedir   = @localstatedir@
-@@ -40,14 +42,14 @@
- DEFAULT_CACHE_LOG       = $(localstatedir)/logs/cache.log
- DEFAULT_ACCESS_LOG      = $(localstatedir)/logs/access.log
- DEFAULT_STORE_LOG       = $(localstatedir)/logs/store.log
--DEFAULT_PID_FILE        = $(localstatedir)/logs/squid.pid
-+DEFAULT_PID_FILE        = /var/run/squid.pid
- DEFAULT_SWAP_DIR        = $(localstatedir)/cache
- DEFAULT_PINGER		= $(libexecdir)/$(PINGER_EXE)
- DEFAULT_UNLINKD		= $(libexecdir)/$(UNLINKD_EXE)
- DEFAULT_DISKD		= $(libexecdir)/$(DISKD_EXE)
--DEFAULT_ICON_DIR	= $(sysconfdir)/icons
--DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
--DEFAULT_MIB_PATH	= $(sysconfdir)/mib.txt
-+DEFAULT_ICON_DIR	= $(datadir)/squid/icons
-+DEFAULT_ERROR_DIR	= $(datadir)/squid/errors
-+DEFAULT_MIB_PATH	= $(datadir)/squid/mib.txt
+--- src/Makefile.in.orig	Sat Jul 13 00:10:04 2002
++++ src/Makefile.in
+@@ -380,14 +380,15 @@ 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
+-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
++DEFAULT_PID_FILE = /var/run/squid.pid
+ DEFAULT_SWAP_DIR = $(localstatedir)/cache
+ DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@
+ DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
+ DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@
+-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
++EXAMPLES_DIR = $(datadir)/examples/squid
  
- CC		= @CC@
- MAKEDEPEND	= @MAKEDEPEND@
-@@ -310,9 +312,9 @@
- 		echo "mkdir $(exec_prefix)"; \
- 		mkdir -p $(exec_prefix); \
- 	fi
--	-@if test ! -d $(bindir); then \
--		echo "mkdir $(bindir)"; \
--		mkdir -p $(bindir); \
-+	-@if test ! -d $(sbindir); then \
-+		echo "mkdir $(sbindir)"; \
-+		mkdir -p $(sbindir); \
- 	fi
- 	-@if test ! -d $(libexecdir); then \
- 		echo "mkdir $(libexecdir)"; \
-@@ -322,14 +324,14 @@
- 		echo "mkdir $(sysconfdir)"; \
- 		mkdir -p $(sysconfdir); \
- 	fi
--	-@if test ! -d $(localstatedir); then \
--		echo "mkdir $(localstatedir)"; \
--		mkdir -p $(localstatedir); \
--	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir -p $(localstatedir)/logs; \
--	fi
-+#	-@if test ! -d $(localstatedir); then \
-+#		echo "mkdir $(localstatedir)"; \
-+#		mkdir -p $(localstatedir); \
-+#	fi
-+#	-@if test ! -d $(localstatedir)/logs; then \
-+#		echo "mkdir $(localstatedir)/logs"; \
-+#		mkdir -p $(localstatedir)/logs; \
-+#	fi
+ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
  
- # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
- # to the install target.
-@@ -339,15 +341,15 @@
- 		(cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \
- 	done
- 	@for f in $(PROGS); do \
--		if test -f $(bindir)/$$f; then \
--			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
--			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
-+		if test -f $(sbindir)/$$f; then \
-+			echo $(MV) $(sbindir)/$$f $(sbindir)/-$$f; \
-+			$(MV) $(sbindir)/$$f $(sbindir)/-$$f; \
- 		fi; \
--		echo $(INSTALL_BIN) $$f $(bindir); \
--		$(INSTALL_BIN) $$f $(bindir); \
--		if test -f $(bindir)/-$$f; then \
--			echo $(RM) -f $(bindir)/-$$f; \
--			$(RM) -f $(bindir)/-$$f; \
-+		echo $(INSTALL_BIN) $$f $(sbindir); \
-+		$(INSTALL_BIN) $$f $(sbindir); \
-+		if test -f $(sbindir)/-$$f; then \
-+			echo $(RM) -f $(sbindir)/-$$f; \
-+			$(RM) -f $(sbindir)/-$$f; \
- 		fi; \
+@@ -819,20 +820,20 @@ CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
+ install-dataDATA: $(data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkinstalldirs) $(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; \
  	done
- 	@if test -n "$(UTILS)"; then \
-@@ -377,21 +379,21 @@
- 		fi; \
+ 
+ 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; \
  	done
- 	$(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH)
--	$(INSTALL_FILE) squid.conf $(sysconfdir)/squid.conf.default
--	@if test -f $(sysconfdir)/squid.conf ; then \
--		echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+@@ -1031,7 +1032,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-info: install-info-recursive
+ 
+@@ -1049,7 +1050,7 @@ mostlyclean-am: mostlyclean-compile most
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
+ 	uninstall-libexecPROGRAMS uninstall-local \
+-	uninstall-sbinPROGRAMS uninstall-sysconfDATA
++	uninstall-sbinPROGRAMS
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+@@ -1132,19 +1133,13 @@ repl_modules.c: repl_modules.sh Makefile
+ auth_modules.c: auth_modules.sh Makefile
+ 	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
+ 
+-install-data-local: install-sysconfDATA install-dataDATA
+-	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
+-	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
 -	else \
--		echo "$(INSTALL_FILE) squid.conf $(sysconfdir)"; \
--		$(INSTALL_FILE) squid.conf $(sysconfdir); \
+-	        echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
+-	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
 -	fi
--
--	$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default
--	@if test -f $(sysconfdir)/mime.conf ; then \
--		echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
+-	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+-	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
 -	else \
--		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
--		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
+-	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+-	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
 -	fi
-+	$(INSTALL_FILE) squid.conf $(prefix)/share/examples/squid
-+#	@if test -f $(DEFAULT_CONFIG_FILE) ; then \
-+#		echo "$@ will not overwrite existing $(DEFAULT_CONFIG_FILE)" ; \
-+#	else \
-+#		echo "$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE)"; \
-+#		$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE); \
-+#	fi
++install-data-local: install-dataDATA
++	@mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
++	@echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
++	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf; \
++	@echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
++	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf; \
 +
-+	$(INSTALL_FILE) $(srcdir)/mime.conf $(prefix)/share/examples/squid
-+#	@if test -f $(DEFAULT_MIME_TABLE) ; then \
-+#		echo "$@ will not overwrite existing $(DEFAULT_MIME_TABLE)" ; \
-+#	else \
-+#		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE)"; \
-+#		$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE); \
-+#	fi
+ 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
  
- install-pinger:
- 	@f=$(PINGER_EXE); \
+ uninstall-local:
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
index d92eb9842f5..95420dc15e8 100644
--- a/www/squid/patches/patch-ab
+++ b/www/squid/patches/patch-ab
@@ -1,30 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2001/05/01 18:07:49 wennmach Exp $
+$NetBSD: patch-ab,v 1.6 2002/10/13 16:43:21 taca Exp $
 
---- scripts/Makefile.in.orig	Sat Apr 14 11:45:19 2001
-+++ scripts/Makefile.in	Sat Apr 14 11:46:07 2001
-@@ -7,6 +7,7 @@
- exec_prefix     = @exec_prefix@
- top_srcdir      = @top_srcdir@
- bindir          = @bindir@
-+sbindir         = @sbindir@
- sysconfdir      = @sysconfdir@
- srcdir          = @srcdir@
- VPATH           = @srcdir@
-@@ -25,12 +26,12 @@
- 		echo "mkdir $(exec_prefix)"; \
- 		mkdir -p $(exec_prefix); \
- 	fi
--	@if test ! -d $(bindir); then \
--		echo "mkdir $(bindir)"; \
--		mkdir -p $(bindir); \
-+	@if test ! -d $(sbindir); then \
-+		echo "mkdir $(sbindir)"; \
-+		mkdir -p $(sbindir); \
- 	fi
--	$(INSTALL_BIN) RunCache $(bindir)
--	$(INSTALL_BIN) RunAccel $(bindir)
-+	$(INSTALL_SCRIPT) RunCache $(sbindir)
-+	$(INSTALL_SCRIPT) RunAccel $(sbindir)
- 
- clean:
+--- scripts/Makefile.in.orig	Fri Jul 12 17:38:25 2002
++++ scripts/Makefile.in
+@@ -26,7 +26,7 @@ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
  
+-bindir = @bindir@
++bindir = @sbindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index 7e4d8c9bc48..e7d278a627f 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,21 +1,13 @@
-$NetBSD: patch-ad,v 1.3 1998/12/06 12:42:00 tron Exp $
+$NetBSD: patch-ad,v 1.4 2002/10/13 16:43:21 taca Exp $
 
---- errors/Makefile.in.orig	Fri Apr 24 01:26:39 1998
-+++ errors/Makefile.in	Thu Oct  1 16:25:32 1998
-@@ -4,6 +4,7 @@
- exec_prefix	= @exec_prefix@
- top_srcdir	= @top_srcdir@
- bindir		= @bindir@
-+datadir		= @datadir@
- libexecdir      = @libexecdir@
- sysconfdir	= @sysconfdir@
- localstatedir   = @localstatedir@
-@@ -15,7 +16,7 @@
+--- errors/Makefile.in.orig	Fri Jul 12 17:38:03 2002
++++ errors/Makefile.in
+@@ -119,7 +119,7 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
+ makesnmplib = @makesnmplib@
  
- INSTALL         	= @INSTALL@
- INSTALL_FILE    	= @INSTALL_DATA@
--DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
-+DEFAULT_ERROR_DIR	= $(datadir)/squid/errors
+-errordir = $(datadir)/errors
++errordir = $(datadir)/squid/errors
  
- LANGUAGE		= @ERR_LANGUAGE@
+ DEFAULT_ERROR_DIR = $(errordir)
  
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index d10c33c35b5..933a3804076 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,21 +1,13 @@
-$NetBSD: patch-ae,v 1.4 1999/11/12 16:25:30 rh Exp $
+$NetBSD: patch-ae,v 1.5 2002/10/13 16:43:21 taca Exp $
 
---- icons/Makefile.in.orig	Mon Apr 19 03:24:10 1999
-+++ icons/Makefile.in	Fri Nov 12 17:20:06 1999
-@@ -4,6 +4,7 @@
- exec_prefix	= @exec_prefix@
- top_srcdir	= @top_srcdir@
- bindir		= @bindir@
-+datadir		= @datadir@
- libexecdir      = @libexecdir@
- sysconfdir	= @sysconfdir@
- localstatedir   = @localstatedir@
-@@ -15,7 +16,7 @@
+--- icons/Makefile.in.orig	Fri Jul 12 17:38:22 2002
++++ icons/Makefile.in
+@@ -147,7 +147,7 @@ ICON2 = anthony-bomb.gif \
+ 		anthony-xpm.gif
  
- INSTALL         	= @INSTALL@
- INSTALL_FILE    	= @INSTALL_DATA@
--DEFAULT_ICON_DIR        = $(sysconfdir)/icons
-+DEFAULT_ICON_DIR        = $(datadir)/squid/icons
  
- ICONS		= anthony-binhex.gif \
- 		  anthony-bomb.gif \
+-icondir = $(datadir)/icons
++icondir = $(datadir)/squid/icons
+ icon_DATA = $(ICON1) $(ICON2)
+ EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+ DISTCLEANFILES = $(ICON1) $(ICON2)
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 12b05f5c981..d4546764217 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,33 +1,55 @@
-$NetBSD: patch-ag,v 1.11 2002/02/24 12:25:41 veego Exp $
+$NetBSD: patch-ag,v 1.12 2002/10/13 16:43:21 taca Exp $
 
---- configure.orig	Thu Nov 29 00:56:25 2001
-+++ configure	Sun Feb 24 12:49:20 2002
-@@ -1428,7 +1428,7 @@
+--- configure.orig	Wed Sep 25 05:00:03 2002
++++ configure
+@@ -2150,7 +2150,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
  EOF
  
 -    SNMPLIB='-L../snmplib -lsnmp'
 +    SNMPLIB='../snmplib/libsnmp.a'
-     SNMP_OBJS='$(SNMP_OBJS)'
-     SNMP_MAKEFILE=./snmplib/Makefile
-     makesnmplib=snmplib
-@@ -3668,48 +3668,46 @@
+     
+ 
+ if true; then
+@@ -3710,6 +3710,7 @@ for ac_hdr in \
+ 	libc.h \
+ 	limits.h \
+ 	linux/netfilter_ipv4.h \
++	machine/byte_swap.h \
+ 	malloc.h \
+ 	math.h \
+ 	memory.h \
+@@ -3760,6 +3761,7 @@ for ac_hdr in \
+ 	syslog.h \
+ 	time.h \
+ 	unistd.h \
++	util.h \
+ 	utime.h \
+ 	varargs.h \
+ 	byteswap.h \
+@@ -5955,44 +5957,42 @@ 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
  
  fi
  
 -echo $ac_n "checking for fd_mask""... $ac_c" 1>&6
--echo "configure:3673: checking for fd_mask" >&5
+-echo "configure:5965: 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:3674: checking for fd_set" >&5
++echo "configure:5968: 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 3678 "configure"
-+#line 3680 "configure"
+-#line 5970 "configure"
++#line 5974 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
 -#if STDC_HEADERS
@@ -42,7 +64,7 @@ $NetBSD: patch-ag,v 1.11 2002/02/24 12:25:41 veego 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:3689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5983: \"$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"
@@ -66,432 +88,9 @@ $NetBSD: patch-ag,v 1.11 2002/02/24 12:25:41 veego Exp $
  
 +echo "$ac_t""$ac_cv_have_fd_mask" 1>&6
  
- echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
--echo "configure:3707: checking for socklen_t" >&5
-+echo "configure:3705: checking for socklen_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-   cat > conftest.$ac_ext <<EOF
--#line 3713 "configure"
-+#line 3711 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -3740,13 +3738,13 @@
- fi
- 
- echo $ac_n "checking for mtyp_t""... $ac_c" 1>&6
--echo "configure:3744: checking for mtyp_t" >&5
-+echo "configure:3742: checking for mtyp_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_mtyp_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-   cat > conftest.$ac_ext <<EOF
--#line 3750 "configure"
-+#line 3748 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ipc.h>
-@@ -3774,7 +3772,7 @@
-  fi
- 
- echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
--echo "configure:3778: checking for main in -lnsl" >&5
-+echo "configure:3776: checking for main in -lnsl" >&5
- ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3782,14 +3780,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3786 "configure"
-+#line 3784 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3817,7 +3815,7 @@
- fi
- 
- echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
--echo "configure:3821: checking for main in -lsocket" >&5
-+echo "configure:3819: checking for main in -lsocket" >&5
- ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3825,14 +3823,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3829 "configure"
-+#line 3827 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3864,7 +3862,7 @@
-   echo "skipping libmalloc check (--enable-dlmalloc specified)"
- else
-   echo $ac_n "checking for main in -lgnumalloc""... $ac_c" 1>&6
--echo "configure:3868: checking for main in -lgnumalloc" >&5
-+echo "configure:3866: checking for main in -lgnumalloc" >&5
- ac_lib_var=`echo gnumalloc'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3872,14 +3870,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgnumalloc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3876 "configure"
-+#line 3874 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3922,7 +3920,7 @@
- 			*)
-   
- 				echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6
--echo "configure:3926: checking for main in -lmalloc" >&5
-+echo "configure:3924: checking for main in -lmalloc" >&5
- ac_lib_var=`echo malloc'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3930,14 +3928,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmalloc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3934 "configure"
-+#line 3932 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3970,7 +3968,7 @@
- fi
- 
- echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
--echo "configure:3974: checking for main in -lbsd" >&5
-+echo "configure:3972: checking for main in -lbsd" >&5
- ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3978,14 +3976,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lbsd  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3982 "configure"
-+#line 3980 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4013,7 +4011,7 @@
- fi
- 
- echo $ac_n "checking for main in -lregex""... $ac_c" 1>&6
--echo "configure:4017: checking for main in -lregex" >&5
-+echo "configure:4015: checking for main in -lregex" >&5
- ac_lib_var=`echo regex'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4021,14 +4019,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lregex  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4025 "configure"
-+#line 4023 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4049,7 +4047,7 @@
- fi
- 
- echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
--echo "configure:4053: checking for gethostbyname in -lbind" >&5
-+echo "configure:4051: checking for gethostbyname in -lbind" >&5
- ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4057,7 +4055,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lbind  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4061 "configure"
-+#line 4059 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4068,7 +4066,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4102,7 +4100,7 @@
- 		;;
- 	*)
- 		echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
--echo "configure:4106: checking for inet_aton in -lresolv" >&5
-+echo "configure:4104: checking for inet_aton in -lresolv" >&5
- ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4110,7 +4108,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lresolv  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4114 "configure"
-+#line 4112 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4121,7 +4119,7 @@
- inet_aton()
- ; return 0; }
- EOF
--if { (eval echo configure:4125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4137,7 +4135,7 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6
--echo "configure:4141: checking for inet_aton in -l44bsd" >&5
-+echo "configure:4139: checking for inet_aton in -l44bsd" >&5
- ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4145,7 +4143,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-l44bsd  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4149 "configure"
-+#line 4147 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4156,7 +4154,7 @@
- inet_aton()
- ; return 0; }
- EOF
--if { (eval echo configure:4160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4188,7 +4186,7 @@
- fi
- 
- 		echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
--echo "configure:4192: checking for main in -lresolv" >&5
-+echo "configure:4190: checking for main in -lresolv" >&5
- ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4196,14 +4194,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lresolv  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4200 "configure"
-+#line 4198 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4234,7 +4232,7 @@
-     esac
- fi
- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--echo "configure:4238: checking for main in -lm" >&5
-+echo "configure:4236: checking for main in -lm" >&5
- ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4242,14 +4240,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4246 "configure"
-+#line 4244 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4278,7 +4276,7 @@
- 
- 
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:4282: checking for crypt in -lcrypt" >&5
-+echo "configure:4280: checking for crypt in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4286,7 +4284,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4290 "configure"
-+#line 4288 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4297,7 +4295,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:4301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4320,7 +4318,7 @@
- 
- 
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:4324: checking for dlopen in -ldl" >&5
-+echo "configure:4322: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4328,7 +4326,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4332 "configure"
-+#line 4330 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4339,7 +4337,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4362,7 +4360,7 @@
- 
- 
- echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
--echo "configure:4366: checking for main in -lpthread" >&5
-+echo "configure:4364: checking for main in -lpthread" >&5
- ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4370,14 +4368,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4374 "configure"
-+#line 4372 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4402,7 +4400,7 @@
- case "$host" in
- 	*-pc-sco3.2*)
- 		echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
--echo "configure:4406: checking for strftime in -lintl" >&5
-+echo "configure:4404: checking for strftime in -lintl" >&5
- ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4410,7 +4408,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4414 "configure"
-+#line 4412 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4421,7 +4419,7 @@
- strftime()
- ; return 0; }
- EOF
--if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4501,8 +4499,8 @@
+ echo $ac_n "checking size of off_t""... $ac_c" 1>&6
+ echo "configure:5999: checking size of off_t" >&5
+@@ -7246,8 +7246,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	2.95.[123])
@@ -502,7 +101,7 @@ $NetBSD: patch-ag,v 1.11 2002/02/24 12:25:41 veego Exp $
  		;;
  	esac
  fi
-@@ -4592,6 +4590,7 @@
+@@ -7338,6 +7338,7 @@ for ac_func in \
  	setrlimit \
  	getrlimit \
  	setsid \
@@ -510,404 +109,3 @@ $NetBSD: patch-ag,v 1.11 2002/02/24 12:25:41 veego Exp $
  	sigaction \
  	snprintf \
  	srand48 \
-@@ -4604,12 +4603,12 @@
- 
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4608: checking for $ac_func" >&5
-+echo "configure:4607: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4613 "configure"
-+#line 4612 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4632,7 +4631,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4658,7 +4657,7 @@
- 
- 
- echo $ac_n "checking if setresuid is implemented""... $ac_c" 1>&6
--echo "configure:4662: checking if setresuid is implemented" >&5
-+echo "configure:4661: checking if setresuid is implemented" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setresuid'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4666,7 +4665,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4670 "configure"
-+#line 4669 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -4679,7 +4678,7 @@
-   }
-   
- EOF
--if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_setresuid="yes"
- else
-@@ -4704,7 +4703,7 @@
- 
- if test "$IPF_TRANSPARENT" ; then
-     echo $ac_n "checking if IP-Filter header files are installed""... $ac_c" 1>&6
--echo "configure:4708: checking if IP-Filter header files are installed" >&5
-+echo "configure:4707: checking if IP-Filter header files are installed" >&5
-     # hold on to your hats...
-     if test "$ac_cv_header_ip_compat_h" = "yes" ||
-         test "$ac_cv_header_ip_fil_compat_h" = "yes" ||
-@@ -4745,7 +4744,7 @@
- 
- if test "$LINUX_NETFILTER" ; then
-     echo $ac_n "checking if Linux 2.4 kernel header files are installed""... $ac_c" 1>&6
--echo "configure:4749: checking if Linux 2.4 kernel header files are installed" >&5
-+echo "configure:4748: checking if Linux 2.4 kernel header files are installed" >&5
-     # hold on to your hats...
-     if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes"; then
-         LINUX_NETFILTER="yes"
-@@ -4779,13 +4778,13 @@
-     esac
- fi
- echo $ac_n "checking if GNUregex needs to be compiled""... $ac_c" 1>&6
--echo "configure:4783: checking if GNUregex needs to be compiled" >&5
-+echo "configure:4782: checking if GNUregex needs to be compiled" >&5
- if test -z "$USE_GNUREGEX"; then
- if test "$ac_cv_func_regcomp" = "no" || test "$USE_GNUREGEX" = "yes" ; then
- 	USE_GNUREGEX="yes"
- else
- 	cat > conftest.$ac_ext <<EOF
--#line 4789 "configure"
-+#line 4788 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <regex.h>
-@@ -4793,7 +4792,7 @@
- regex_t t; regcomp(&t,"",0);
- ; return 0; }
- EOF
--if { (eval echo configure:4797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   USE_GNUREGEX="no"
- else
-@@ -4824,12 +4823,12 @@
- 
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4828: checking for $ac_func" >&5
-+echo "configure:4827: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4833 "configure"
-+#line 4832 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4852,7 +4851,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4880,12 +4879,12 @@
- 
- 
- echo $ac_n "checking Default FD_SETSIZE value""... $ac_c" 1>&6
--echo "configure:4884: checking Default FD_SETSIZE value" >&5
-+echo "configure:4883: checking Default FD_SETSIZE value" >&5
- if test "$cross_compiling" = yes; then
-   DEFAULT_FD_SETSIZE=256
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4889 "configure"
-+#line 4888 "configure"
- #include "confdefs.h"
- 
- #if HAVE_STDIO_H
-@@ -4910,7 +4909,7 @@
- }
- 
- EOF
--if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   DEFAULT_FD_SETSIZE=`cat conftestval`
- else
-@@ -4929,7 +4928,7 @@
- 
- 
- echo $ac_n "checking Maximum number of filedescriptors we can open""... $ac_c" 1>&6
--echo "configure:4933: checking Maximum number of filedescriptors we can open" >&5
-+echo "configure:4932: checking Maximum number of filedescriptors we can open" >&5
- TLDFLAGS="$LDFLAGS"
- case $host in
- i386-unknown-freebsd*)
-@@ -4941,7 +4940,7 @@
-   SQUID_MAXFD=256
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4945 "configure"
-+#line 4944 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -5001,7 +5000,7 @@
- }
- 
- EOF
--if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   SQUID_MAXFD=`cat conftestval`
- else
-@@ -5028,12 +5027,12 @@
- LDFLAGS="$TLDFLAGS"
- 
- echo $ac_n "checking Default UDP send buffer size""... $ac_c" 1>&6
--echo "configure:5032: checking Default UDP send buffer size" >&5
-+echo "configure:5031: checking Default UDP send buffer size" >&5
- if test "$cross_compiling" = yes; then
-   SQUID_UDP_SO_SNDBUF=16384
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5037 "configure"
-+#line 5036 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5054,7 +5053,7 @@
- }
- 
- EOF
--if { (eval echo configure:5058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   SQUID_UDP_SO_SNDBUF=`cat conftestval`
- else
-@@ -5073,12 +5072,12 @@
- 
- 
- echo $ac_n "checking Default UDP receive buffer size""... $ac_c" 1>&6
--echo "configure:5077: checking Default UDP receive buffer size" >&5
-+echo "configure:5076: checking Default UDP receive buffer size" >&5
- if test "$cross_compiling" = yes; then
-   SQUID_UDP_SO_RCVBUF=16384
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5082 "configure"
-+#line 5081 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5099,7 +5098,7 @@
- }
- 
- EOF
--if { (eval echo configure:5103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   SQUID_UDP_SO_RCVBUF=`cat conftestval`
- else
-@@ -5118,12 +5117,12 @@
- 
- 
- echo $ac_n "checking Default TCP send buffer size""... $ac_c" 1>&6
--echo "configure:5122: checking Default TCP send buffer size" >&5
-+echo "configure:5121: checking Default TCP send buffer size" >&5
- if test "$cross_compiling" = yes; then
-   SQUID_TCP_SO_SNDBUF=16384
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5127 "configure"
-+#line 5126 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5144,7 +5143,7 @@
- }
- 
- EOF
--if { (eval echo configure:5148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   SQUID_TCP_SO_SNDBUF=`cat conftestval`
- else
-@@ -5163,12 +5162,12 @@
- 
- 
- echo $ac_n "checking Default TCP receive buffer size""... $ac_c" 1>&6
--echo "configure:5167: checking Default TCP receive buffer size" >&5
-+echo "configure:5166: checking Default TCP receive buffer size" >&5
- if test "$cross_compiling" = yes; then
-   SQUID_TCP_SO_RCVBUF=16384
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5172 "configure"
-+#line 5171 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5189,7 +5188,7 @@
- }
- 
- EOF
--if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   SQUID_TCP_SO_RCVBUF=`cat conftestval`
- else
-@@ -5208,19 +5207,19 @@
- 
- 
- echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
--echo "configure:5212: checking if sys_errlist is already defined" >&5
-+echo "configure:5211: checking if sys_errlist is already defined" >&5
- if eval "test \"`echo '$''{'ac_cv_needs_sys_errlist'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5217 "configure"
-+#line 5216 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- char *s = sys_errlist;
- ; return 0; }
- EOF
--if { (eval echo configure:5224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_needs_sys_errlist="no"
- else
-@@ -5242,16 +5241,16 @@
- fi
- 
- echo $ac_n "checking for libresolv _dns_ttl_ hack""... $ac_c" 1>&6
--echo "configure:5246: checking for libresolv _dns_ttl_ hack" >&5
-+echo "configure:5245: checking for libresolv _dns_ttl_ hack" >&5
- cat > conftest.$ac_ext <<EOF
--#line 5248 "configure"
-+#line 5247 "configure"
- #include "confdefs.h"
- extern int _dns_ttl_;
- int main() {
- return _dns_ttl_;
- ; return 0; }
- EOF
--if { (eval echo configure:5255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-@@ -5267,12 +5266,12 @@
- rm -f conftest*
- 
- echo $ac_n "checking if inet_ntoa() actually works""... $ac_c" 1>&6
--echo "configure:5271: checking if inet_ntoa() actually works" >&5
-+echo "configure:5270: checking if inet_ntoa() actually works" >&5
- if test "$cross_compiling" = yes; then
-   INET_NTOA_RESULT="broken"
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5276 "configure"
-+#line 5275 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5291,7 +5290,7 @@
- }
- 
- EOF
--if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   INET_NTOA_RESULT=`cat conftestval`
- else
-@@ -5317,9 +5316,9 @@
- 
- if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then
- echo $ac_n "checking for working statvfs() interface""... $ac_c" 1>&6
--echo "configure:5321: checking for working statvfs() interface" >&5
-+echo "configure:5320: checking for working statvfs() interface" >&5
- cat > conftest.$ac_ext <<EOF
--#line 5323 "configure"
-+#line 5322 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5336,7 +5335,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_func_statvfs=yes
- else
-@@ -5356,12 +5355,12 @@
- fi
- 
- echo $ac_n "checking for _res.nsaddr_list""... $ac_c" 1>&6
--echo "configure:5360: checking for _res.nsaddr_list" >&5
-+echo "configure:5359: checking for _res.nsaddr_list" >&5
- if eval "test \"`echo '$''{'ac_cv_have_res_nsaddr_list'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5365 "configure"
-+#line 5364 "configure"
- #include "confdefs.h"
- 
- #if HAVE_SYS_TYPES_H
-@@ -5384,7 +5383,7 @@
- _res.nsaddr_list[0];
- ; return 0; }
- EOF
--if { (eval echo configure:5388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_res_nsaddr_list="yes"
- else
-@@ -5406,12 +5405,12 @@
- 
- if test $ac_cv_have_res_nsaddr_list = "no" ; then
- echo $ac_n "checking for _res.ns_list""... $ac_c" 1>&6
--echo "configure:5410: checking for _res.ns_list" >&5
-+echo "configure:5409: checking for _res.ns_list" >&5
- if eval "test \"`echo '$''{'ac_cv_have_res_ns_list'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5415 "configure"
-+#line 5414 "configure"
- #include "confdefs.h"
- 
- #if HAVE_SYS_TYPES_H
-@@ -5434,7 +5433,7 @@
- _res.ns_list[0].addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_have_res_ns_list="yes"
- else
diff --git a/www/squid/patches/patch-aj b/www/squid/patches/patch-aj
index 37b19b1c37b..41c667c962d 100644
--- a/www/squid/patches/patch-aj
+++ b/www/squid/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2001/12/12 17:06:20 taca Exp $
+$NetBSD: patch-aj,v 1.6 2002/10/13 16:43:21 taca Exp $
 
---- src/access_log.c.orig	Fri Jan 12 09:51:44 2001
+--- src/access_log.c.orig	Sun Jun 16 20:25:40 2002
 +++ src/access_log.c
-@@ -120,6 +120,8 @@
+@@ -120,6 +120,8 @@ log_quote(const char *header)
  {
      int c;
      int i;
@@ -11,9 +11,9 @@ $NetBSD: patch-aj,v 1.5 2001/12/12 17:06:20 taca Exp $
      char *buf;
      char *buf_cursor;
      if (header == NULL) {
-@@ -129,13 +131,41 @@
+@@ -129,13 +131,41 @@ log_quote(const char *header)
      }
-     buf = xcalloc((strlen(header) * 3) + 1, 1);
+     buf = xcalloc(1, (strlen(header) * 3) + 1);
      buf_cursor = buf;
 +
 +    /* if empty or first keyword is "all", log all mime headers */
@@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.5 2001/12/12 17:06:20 taca Exp $
  #if !OLD_LOG_MIME
  	if (c == '\r') {
  	    *buf_cursor++ = '\\';
-@@ -143,6 +173,7 @@
+@@ -143,6 +173,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 119d0a8f4f4..9034321cb52 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2001/04/14 10:05:01 tron Exp $
+$NetBSD: patch-ak,v 1.6 2002/10/13 16:43:21 taca Exp $
 
---- src/cf.data.pre.orig	Sat Apr 14 11:54:41 2001
-+++ src/cf.data.pre	Sat Apr 14 11:56:42 2001
-@@ -858,6 +858,23 @@
+--- src/cf.data.pre.orig	Sat Oct 12 23:14:04 2002
++++ src/cf.data.pre
+@@ -923,6 +923,23 @@ DOC_START
  DOC_END
  
  
diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al
index c839ff65759..7b29e4ac744 100644
--- a/www/squid/patches/patch-al
+++ b/www/squid/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2001/12/12 17:06:20 taca Exp $
+$NetBSD: patch-al,v 1.4 2002/10/13 16:43:21 taca Exp $
 
---- src/structs.h.orig	Tue Oct  9 00:22:03 2001
+--- src/structs.h.orig	Sat Oct 12 23:14:04 2002
 +++ src/structs.h
-@@ -368,6 +368,7 @@
+@@ -525,6 +525,7 @@ struct _SquidConfig {
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff --git a/www/squid/patches/patch-am b/www/squid/patches/patch-am
deleted file mode 100644
index e4359b1ae3e..00000000000
--- a/www/squid/patches/patch-am
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-am,v 1.1 2001/12/12 17:06:20 taca Exp $
-
---- src/client_side.c.orig	Sat Apr 21 08:21:41 2001
-+++ src/client_side.c
-@@ -2441,8 +2441,15 @@
- 	    natLookup.nl_inip = http->conn->me.sin_addr;
- 	    natLookup.nl_outip = http->conn->peer.sin_addr;
- 	    natLookup.nl_flags = IPN_TCP;
--	    if (natfd < 0)
-+	    if (natfd < 0) {
-+		int save_errno;
-+
-+		enter_suid();
- 		natfd = open(IPL_NAT, O_RDONLY, 0);
-+		save_errno = errno;
-+		leave_suid();
-+		errno = save_errno;
-+	    }
- 	    if (natfd < 0) {
- 		debug(50, 1) ("parseHttpRequest: NAT open failed: %s\n",
- 		    xstrerror());
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 507ac9917d2..dc0e03b7555 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,21 +1,39 @@
-$NetBSD: patch-an,v 1.2 2002/02/24 12:25:41 veego Exp $
+$NetBSD: patch-an,v 1.3 2002/10/13 16:43:22 taca Exp $
 
---- configure.in.orig	Wed Sep 12 11:46:43 2001
-+++ configure.in	Sun Feb 24 12:48:39 2002
-@@ -438,7 +438,7 @@
+--- configure.in.orig	Wed Sep 25 05:00:03 2002
++++ configure.in
+@@ -497,7 +497,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
      echo "SNMP monitoring enabled"
      AC_DEFINE(SQUID_SNMP)
 -    SNMPLIB='-L../snmplib -lsnmp'
 +    SNMPLIB='../snmplib/libsnmp.a'
-     SNMP_OBJS='$(SNMP_OBJS)'
+     AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -976,7 +976,16 @@
+@@ -1153,6 +1153,7 @@ AC_CHECK_HEADERS( \
+ 	libc.h \
+ 	limits.h \
+ 	linux/netfilter_ipv4.h \
++	machine/byte_swap.h \
+ 	malloc.h \
+ 	math.h \
+ 	memory.h \
+@@ -1203,6 +1204,7 @@ AC_CHECK_HEADERS( \
+ 	syslog.h \
+ 	time.h \
+ 	unistd.h \
++	util.h \
+ 	utime.h \
+ 	varargs.h \
+ 	byteswap.h \
+@@ -1378,8 +1380,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(mode_t, u_short)
 -AC_CHECK_TYPE(fd_mask, int)
++AC_CHECK_TYPE(mode_t, unsigned short)
 +
 +dnl Check for type fd_mask
 +AC_CACHE_CHECK(for fd_set,ac_cv_have_fd_mask, [
@@ -27,9 +45,9 @@ $NetBSD: patch-an,v 1.2 2002/02/24 12:25:41 veego Exp $
 +    ac_cv_have_fd_mask="no")
 +])
  
- dnl Check for type in sys/socket.h
- AC_CACHE_CHECK(for socklen_t, ac_cv_type_socklen_t, [
-@@ -1123,8 +1132,8 @@
+ AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
+ AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
+@@ -1560,8 +1571,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
@@ -40,7 +58,7 @@ $NetBSD: patch-an,v 1.2 2002/02/24 12:25:41 veego Exp $
  		;;
  	esac
  fi
-@@ -1216,6 +1225,7 @@
+@@ -1654,6 +1665,7 @@ AC_CHECK_FUNCS(\
  	setrlimit \
  	getrlimit \
  	setsid \
diff --git a/www/squid/patches/patch-ba b/www/squid/patches/patch-ba
index 8aef12abad1..9138c13ee51 100644
--- a/www/squid/patches/patch-ba
+++ b/www/squid/patches/patch-ba
@@ -1,39 +1,39 @@
-$NetBSD: patch-ba,v 1.2 2002/02/24 12:25:41 veego Exp $
+$NetBSD: patch-ba,v 1.3 2002/10/13 16:43:22 taca Exp $
 
---- src/dnsserver.c.orig	Fri Jan 12 01:51:47 2001
-+++ src/dnsserver.c	Sun Feb 24 12:44:12 2002
-@@ -135,6 +135,7 @@
+--- src/dnsserver.c.orig	Mon Jul  1 17:55:46 2002
++++ src/dnsserver.c
+@@ -138,6 +138,9 @@
  #if HAVE_RESOLV_H
  #include <resolv.h>
  #endif
++#if HAVE_UTIL_H
 +#include <util.h>
++#endif
  
  #include "util.h"
  #include "snprintf.h"
-@@ -258,8 +259,10 @@
- {
-     char request[512];
+@@ -263,6 +266,9 @@ main(int argc, char *argv[])
      char *t = NULL;
--    int c;
-+    int c, count = 0;
-+#if HAVE_RES_INIT
+     int c;
      int opt_s = 0;
++#if HAVE_SETPROCTITLE
++    int count = 0;
 +#endif
      extern char *optarg;
  
      safe_inet_addr("255.255.255.255", &no_addr);
-@@ -333,6 +336,10 @@
+@@ -336,6 +342,10 @@ main(int argc, char *argv[])
  	}
      }
  
 +#if HAVE_SETPROCTITLE
-+    setproctitle("(%d requests)", count);
++    setproctitle("(no requests)");
 +#endif
 +
      for (;;) {
  	memset(request, '\0', REQ_SZ);
  	if (fgets(request, REQ_SZ, stdin) == NULL)
-@@ -345,6 +352,10 @@
+@@ -348,6 +358,10 @@ main(int argc, char *argv[])
  	    *t = '\0';		/* strip CR */
  	lookup(request);
  	fflush(stdout);
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 8323b4df40e..b25a673cc93 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2002/03/03 15:44:48 taca Exp $
+$NetBSD: patch-bb,v 1.2 2002/10/13 16:43:22 taca Exp $
 
---- include/autoconf.h.in.orig	Tue Jan  2 07:37:02 2001
+--- include/autoconf.h.in.orig	Tue Jul 16 06:29:47 2002
 +++ include/autoconf.h.in
-@@ -415,6 +415,9 @@
+@@ -537,6 +537,9 @@
  /* Define if you have the setpgrp function.  */
  #undef HAVE_SETPGRP
  
@@ -12,3 +12,23 @@ $NetBSD: patch-bb,v 1.1 2002/03/03 15:44:48 taca Exp $
  /* Define if you have the setrlimit function.  */
  #undef HAVE_SETRLIMIT
  
+@@ -645,6 +648,9 @@
+ /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
+ #undef HAVE_LINUX_NETFILTER_IPV4_H
+ 
++/* 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
+ 
+@@ -812,6 +818,9 @@
+ 
+ /* Define if you have the <unistd.h> header file.  */
+ #undef HAVE_UNISTD_H
++
++/* Define if you have the <util.h> header file.  */
++#undef HAVE_UTIL_H
+ 
+ /* Define if you have the <utime.h> header file.  */
+ #undef HAVE_UTIME_H
diff --git a/www/squid/patches/patch-bc b/www/squid/patches/patch-bc
new file mode 100644
index 00000000000..c2d38286ffc
--- /dev/null
+++ b/www/squid/patches/patch-bc
@@ -0,0 +1,19 @@
+$NetBSD: patch-bc,v 1.1 2002/10/13 16:43:22 taca Exp $
+
+--- include/ntlmauth.h.orig	Wed Nov 14 06:12:36 2001
++++ include/ntlmauth.h
+@@ -70,10 +70,14 @@
+ #define bswap16(x) bswap_16(x)
+ #define bswap32(x) bswap_32(x)
+ #else	 /* HAVE_BISTWAP_H */
++#ifdef HAVE_MACHINE_BYTE_SWAP_H
++#include <machine/byte_swap.h>
++#else
+ #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_BITSWAP_H */
+ 
+ /* Used internally. Microsoft seems to think this is right, I believe them.