Update "squid" package to version 2.4STABLE1. Changes since 2.3STABLE4:

- Fixed a bug in and cleaned up class 2/3 delay pools incrementing.
- Fixed a coredump bug when using external dnsservers that become overloaded.
- Fixed some NULL pointer bugs for NULL storage system when reconfiguring.
- Fixed a bug with useragent logging that caused Squid to think the logfile
  never got opened.
- Fixed a compiling bug with --disable-unlinkd.
- Changed src/squid.h to always use O_NONBLOCK on Solaris if it is defined.
- Fixed a bug with signed/unsigned bitfield flag variables that caused
  problems on Solaris.
- Fixed a bug in clientBuildReplyHeader() that could add an Age: header with
  a negative value, causing an assertion later.
- Fixed an SNMP reporting bug.   cacheCurrentResFileDescrCnt was returning
  the number of FDs in use, rather than the number of reserved FDs.
- Added the 'pipeline_prefetch' configuration option.
- cache_dir syntax changed to use options instead of many arguments. This
  means that the max_objsize argument now is an optional option, and that
  the syntax for how to specify the diskd magics is slightly different.
- Various fixes for CYGWIN
- Upgraded MSNT auth module to version 2.0.
- Fixed potential problems with HTML by making sure all HTML output is
  properly encoded.
- Fixed a memory initialization problem with resource records in
  lib/rfc1035.c.
- Rewrote date parsing in lib/rfc1123.c and made it a little more lenient.
- Added Cache-control: max-stale support.
- Fixed 'range_offset_limit' again.  The problem this time is that
  client_side.c wouldn't set the we_dont_do_ranges flag for normal cache
  misses.  It was only being set for requests that might have been hits,
  but we decided to change to a miss.
- Added the Authenticate-Info and Proxy-Authenticate-Info headers from
  RFC 2617.
- HTTP header lines longer than 64K could cause an assertion.
  Now they get ignored.
- Fixed an IP address scanning bug that caused "123.foo.com" to be
  interpreted as an IP address.
- Converted many structure allocations to use mem pools.
- Changed proxy authentication to strip leading whitespace from usernames
  after decoding.
- Prevented NULL pointer access in aclMatchAcl(). Some ACL types require
  checklist->request_t, but it won't be available in some cases (like
  snmp_access).  Warn the admin that the ACL can't be checked and that
  we're denying it.
- Allow zero-size disk caches.
- The actual filesystem blocksize is now used to account
  for space overheads when calculating on-disk cache size.
- Made the maximum memory cache object size configurable.
- Added 'minimum_direct_rtt' configuration option.
- Added 'ie_refresh' configuration option, which is a hack
  to turn IMS requests into no-cache requests.
- Added Linux netfilter support for intercepted connections.
- Fixed a bug with clientAccessCheck() that allowed proxy
  requests in accel mode.
- Fixed a bug with 301/302 replies from redirectors.  Now
  we force them to be cache misses.
- Accommodated changes to the IP-Filter ioctl() interface
  for intercepted connections.
- Fixed handling of client lifetime timeouts.
- Fixed a buffer overflow bug with internal DNS replies
  by truncating received packets to 512 bytes, as per
  RFC 1035.
- Added "forward.log" support, but its work in progress.
- Rewrote much of the IP and FQDN cache implementation.
  This change gets rid of pending hits.
- Changed peerWouldBePinged() to return false if our
  ICP/HTCP port is zero (i.e. disabled).
- Changed src/net_db.c to use src/logfile.c routines,
  rather than stdio, because of solaris stdio filedescriptor
  limits.
- Made netdbReloadState() more robust in case of corrupted
  data.
- Rewrote some freshness/staleness functions in src/refresh.c,
  partially inspired to support cache-control max-stale.
- Fixed status code logging for SSL/CONNECT requests.
- Added a hack to subtract cache digest network traffic
  from statistics so that byte hit ratio stays positive
  and more closely reflects what people expect it to be.
- Fixed a bug with storeCheckTooSmall() that caused
  internal icons and cache digests to always be released.
- Added statfs(2) support for displaying actual filesystem
  usage in the cache manager 'storedir' output.
- Changed status reporting for storage rebuilding.  Now it
  prints percentage complete instead of number of entries
  parsed.
- Use mkstemp() rather than problem-prone tempnam().
- Changed urlParse() to condense multiple dots in hostnames.
- Major rewrite of async-io (src/fs/aufs) to make it behave
  a bit more sane with substantially less overhead.  Some
  tuning work still remains to make it perform optimal.
  See the start of store_asyncufs.h for all the knobs.
- Fixed storage FS modules to use individual swap space
  high/low values rather than the global ones.
- Fixed storage FS bugs with calling file_map_bit_reset()
  before checking the bit value.  Calling with an invalid
  value caused memory corruption in random places.
- Prevent NULL pointer access in store_repl_lru.c for
  entries that exist in the hash but not the LRU list.
- Added --enable-auth-modules=... configure option
- Improved ICP dead peer detection to also work when the workload
  is low
- Improved TCP dead peer detection and recovery
- Squid is now a bit more persistent in trying to find a alive
  parent when never_direct is used.
- nonhierarchical_direct squid.conf directive to make non-ICP
  peer selection behave a bit more like ICP selection with respect
  to hierarchy.
- Bugfix where netdb selection could override never_direct
- ICP timeout selection now prefers to use parents only when
  calculating the dynamic timeout to compensate for common RTT
  differences between parents and siblings.
- No longer starts to swap out objects which are known to be above
  the maximum allowed size.
- allow-miss cache_peer option disabling the use of "only-if-cached".
  Meant to be used in conjunction with icp_hit_stale.
- Delay pools tuned to allow large initial pool values
- cachemgr filesystem space information changed to show useable space
  rather than raw space, and platform support somewhat extended.
- Logs destination IP in the hierarchy log tag when going direct.
  (can be disabled by turning log_ip_on_direct off)
- Async-IO on linux now makes proper use of mutexes. This fixes some
  odd pthread segfaults on SMP Linux machines, at a slight performance
  penalty.
- %s can now be used in cache_swap_log and will be substituded with
  the last path component of cache_dir.
- no_cache is now a full ACL check without, allowing most ACL types
  to be used.
- The CONNECT method now obeys miss_access requirements
- proxy_auth_regex and ident_regex ACL types
- Fixed a StoreEntry memory leak during "dirty" rebuild
- Helper processes no longer hold unrelated filedescriptors open
- Helpers are now restarted when the logs are rotated
- Negatively cached DNS entries are now purged on "reload".
- PURGE now also purges the DNS cache
- HEAD on FTP objects no longer retreives the whole object
- More cleanups of the dstdomain ACL type
- Squid no longer tries to do Range internally if it is not supported
  by the origin server. Doing so could cause bandwidth spikes and/or
  negative hit ratio.
- httpd_accel_single_host squid.conf directive
- "round-robin" cache_peer counters are reset every 5 minutes to
  compensate previously dead peers
- DNS retransmit parameters
- Show all FTP server messages
- squid.conf.default now indicates if a directive isn't enabled in
  the installed binary, and what configure option to use for enabling it
- Fixed a temporary memory leak on persistent POSTs
- Fixed a temporary memory leak when the server response headers
  includes NULL characters
- authenticate_ip_ttl_is_strict squid.conf option
- req_mime_type ACL type
- A reworked storage system that supports storage directories in
  a more modular fashion. The object replacement and IO is now
  responsibility of the storage directory, and not of the storage
  manager.
- Fixed a bogous MD5 mismatch warning sometimes seen when using
  aufs or diskd stores
- Added --enable-stacktraces configure option to set PRINT_STACK_TRACE,
  and extended support for this to Linux/GNU libc.
- Disabled the "request timeout" error message sent if the user agent
  did not provide a request in a timely manner after opening the
  connection. Now the connection is silently closed. The error message
  was confusing user agents utilizing persistent connections.
- Fixed configure --enable descriptions to match the arg names.
- Eliminated compile warnings from auth_modules/MSNT code.
- Require first character of hostnames to be alphanumeric.
- Made ARP ACL work for Solaris.
- Removed storeClientListSearch().
- Added counters to track diskd operation success and
  failures.
- Fixed range_offset_limit.
- Added code to retry ServFail replies for internal DNS
  lookups.
- Added referer header logging (Jens-S. Voeckler).
- Added "multi-domain-NTLM" authentication module, a Perl
  script from Thomas Jarosch.
- Added configurable warning messages for high memory usage,
  high response time, and high page faults.
- Made store dir selection algorithm configurable.
- Added support for admin-definable extension methods,
  up to 20.
- Added 'maximum_object_size_in_memory' as a configuration option -
  this defines the watermark where objects transit from being true
  hot objects to being in-transit objects in memory. It currently
  defaults to 8 KB.
- Change to the fqdn code which changes how pending DNS requests
  are treated as private and only become public once they are
  completed. This can add extra load on DNS servers but prevents
  all the pending clients blocking if one of the queries got
  stuck. (Duane Wessels)
- Converted more code to use MemPools, from Andres Kroonmaa.
- Added more CYGWIN patches from Robert Collins.
- Added Logfile module.
- Added DISKD stats via cachemgr.
- Added squid.conf options for DISKD magic constants.

10 files changed, 92 insertions, 131 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index cc1fb6b211f..4c3a1170344 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.43 2001/03/27 03:20:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.44 2001/04/14 10:05:00 tron Exp $
 
-DISTNAME=	squid-2.3.STABLE4-src
-PKGNAME=	squid-2.3s4nb3
+DISTNAME=	squid-2.4.STABLE1-src
+PKGNAME=	squid-2.4.1
 CATEGORIES=	www
-MASTER_SITES=	\
-	http://www.squid-cache.org/Versions/v2/2.3/ \
-	ftp://ftp.gw.com/pub/unix/squid/squid-2/STABLE/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ \
-	ftp://ftp.kpnqwest.de/pub/mirror.squid/squid-2/STABLE/
-
-PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
-PATCHFILES=	squid-2.3.stable4-invalid_ip_acl_entry.patch \
-		squid-2.3.stable4-ipfw_configure.patch \
-		squid-2.3.stable4-internal_dns_rcode_table_formatting.patch \
-		squid-2.3.stable4-ftp_icon_not_found.patch \
-		squid-2.3.stable4-accel_only_access.patch \
-		squid-2.3.stable4-html_quoting.patch \
-		squid-2.3.stable4-carp-assertion.patch
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.4/ \
+		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/
 
+PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
+PATCHFILES=	squid-2.4.stable1-diskd_fixed_path.patch \
+		squid-2.4.stable1-force_valid_blksize.patch \
+		squid-2.4.stable1-high_cpu_with_peers.patch \
+		squid-2.4.stable1-htcp_assertion_fix.patch \
+		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
+		squid-2.4.stable1-wrong_sign_on_timestamp_check.patch
+		
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index 7ac8a9d32a9..c328eb426c2 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,10 +1,9 @@
-$NetBSD: md5,v 1.15 2000/12/13 16:03:40 taca Exp $
+$NetBSD: md5,v 1.16 2001/04/14 10:05:01 tron Exp $
 
-MD5 (squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f
-MD5 (squid-2.3.stable4-invalid_ip_acl_entry.patch) = 436eb77056bed5d45547c739d1123bd3
-MD5 (squid-2.3.stable4-ipfw_configure.patch) = 4453c53a712280a26fdca42c950bc94f
-MD5 (squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5
-MD5 (squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa
-MD5 (squid-2.3.stable4-accel_only_access.patch) = db8e4eb9c1712a4adde7e9aaed0b5249
-MD5 (squid-2.3.stable4-html_quoting.patch) = 68228709d011c93c2cccd9ac723fb462
-MD5 (squid-2.3.stable4-carp-assertion.patch) = c3d48a2b4fc26c0d90eb4c30ae34d3d6
+SHA1 (squid-2.4.STABLE1-src.tar.gz) = 584eb15080f52ef406e3f66511dba406ec1a40c5
+SHA1 (squid-2.4.stable1-diskd_fixed_path.patch) = 1ec289b37d0640a8d16e691659acc3776632b321
+SHA1 (squid-2.4.stable1-force_valid_blksize.patch) = 1282c7cb5b7e367f04867b9658e002dd51f00313
+SHA1 (squid-2.4.stable1-high_cpu_with_peers.patch) = 759f713faad31d13a3492ae814b2cdcba0f5fbe4
+SHA1 (squid-2.4.stable1-htcp_assertion_fix.patch) = afdbe390453cc65b375c6616be583ee84299260b
+SHA1 (squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = c94ba4c220d31ea1612e5b1a84970de2c058f7a9
+SHA1 (squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = cde4530d0c9cd184b0d4c6774e4c20f81ab7179f
diff --git a/www/squid/files/patch-sum b/www/squid/files/patch-sum
index d19a3de9846..6e75dbc7ec7 100644
--- a/www/squid/files/patch-sum
+++ b/www/squid/files/patch-sum
@@ -1,14 +1,12 @@
-$NetBSD: patch-sum,v 1.9 2000/11/09 12:39:38 wiz Exp $
+$NetBSD: patch-sum,v 1.10 2001/04/14 10:05:01 tron Exp $
 
-MD5 (patch-aa) = 6befb071002fb7ced0fb9f388d039cd9
-MD5 (patch-ab) = 05ef29847c539ee53d056061ab21ebcf
-MD5 (patch-ac) = 3bb7a6c638dbbe91042ea52149dbc18e
-MD5 (patch-ad) = e29e0dbd58b2838964d4135d730dfc5b
-MD5 (patch-ae) = fa1d2532d75b8e409f225063e6589f4a
-MD5 (patch-af) = ec14792120b479d910a2a9f2f183564c
-MD5 (patch-ag) = c29b4cd5e47bcd56c8b63c97ddd135b2
-MD5 (patch-ah) = 971f5268e79bd6a7b266baa3e5b87ca0
-MD5 (patch-ai) = f4e4dbed017331c46df688543c98fec8
-MD5 (patch-aj) = 7385c5a5bf0d22721a99ea5859461947
-MD5 (patch-ak) = 5ee4d2edc93b53bc13cdc37eff570a71
-MD5 (patch-al) = 86be122c05b39e35dd81e7d20f934246
+SHA1 (patch-aa) = 3722daecfb5da7368860af51383759b20fbe1481
+SHA1 (patch-ab) = 5c742a358c5d13e6517b47d04adf9e52c93699d4
+SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd
+SHA1 (patch-ad) = 03f76c2a781bff4b3a8680ee815f8c5dcbdd70d0
+SHA1 (patch-ae) = 5189de99c6f453ef58b97a4df54c065c87cf7e21
+SHA1 (patch-ag) = e6c225d0c5a1e2bd595437ea0d2cff5d2ea214af
+SHA1 (patch-ah) = c80f9d8ce5fae7f399583607aa7f7153824465b7
+SHA1 (patch-aj) = c50f9474870c0ada822db2345a05dc1d81192cd3
+SHA1 (patch-ak) = a3f3000dbab7ba6f08904008ccf9e08bc70b3e3f
+SHA1 (patch-al) = 83198acc0accb358075500d4b71486b3f401c449
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index c4766590812..4de0f73941b 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1998/12/06 12:42:00 tron Exp $
+$NetBSD: patch-aa,v 1.5 2001/04/14 10:05:01 tron Exp $
 
---- src/Makefile.in.orig	Mon Aug 17 19:27:15 1998
-+++ src/Makefile.in	Thu Oct  1 17:00:53 1998
+--- src/Makefile.in.orig	Sat Apr 14 11:38:49 2001
++++ src/Makefile.in	Sat Apr 14 11:42:36 2001
 @@ -12,6 +12,8 @@
  cgi_suffix	= @cgi_suffix@
  top_srcdir	= @top_srcdir@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 1998/12/06 12:42:00 tron Exp $
  libexecdir      = @libexecdir@
  sysconfdir	= @sysconfdir@
  localstatedir   = @localstatedir@
-@@ -29,18 +31,18 @@
+@@ -35,19 +37,19 @@
  
  DEFAULT_PREFIX		= $(prefix)
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
@@ -26,6 +26,7 @@ $NetBSD: patch-aa,v 1.4 1998/12/06 12:42:00 tron Exp $
  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
@@ -35,43 +36,45 @@ $NetBSD: patch-aa,v 1.4 1998/12/06 12:42:00 tron Exp $
  
  CC		= @CC@
  MAKEDEPEND	= @MAKEDEPEND@
-@@ -264,9 +266,9 @@
+@@ -310,9 +312,9 @@
  		echo "mkdir $(exec_prefix)"; \
- 		mkdir $(exec_prefix); \
+ 		mkdir -p $(exec_prefix); \
  	fi
 -	-@if test ! -d $(bindir); then \
 -		echo "mkdir $(bindir)"; \
--		mkdir $(bindir); \
+-		mkdir -p $(bindir); \
 +	-@if test ! -d $(sbindir); then \
 +		echo "mkdir $(sbindir)"; \
-+		mkdir $(sbindir); \
++		mkdir -p $(sbindir); \
  	fi
  	-@if test ! -d $(libexecdir); then \
  		echo "mkdir $(libexecdir)"; \
-@@ -276,28 +278,28 @@
+@@ -322,14 +324,14 @@
  		echo "mkdir $(sysconfdir)"; \
- 		mkdir $(sysconfdir); \
+ 		mkdir -p $(sysconfdir); \
  	fi
 -	-@if test ! -d $(localstatedir); then \
 -		echo "mkdir $(localstatedir)"; \
--		mkdir $(localstatedir); \
+-		mkdir -p $(localstatedir); \
 -	fi
 -	-@if test ! -d $(localstatedir)/logs; then \
 -		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
+-		mkdir -p $(localstatedir)/logs; \
 -	fi
 +#	-@if test ! -d $(localstatedir); then \
 +#		echo "mkdir $(localstatedir)"; \
-+#		mkdir $(localstatedir); \
++#		mkdir -p $(localstatedir); \
 +#	fi
 +#	-@if test ! -d $(localstatedir)/logs; then \
 +#		echo "mkdir $(localstatedir)/logs"; \
-+#		mkdir $(localstatedir)/logs; \
++#		mkdir -p $(localstatedir)/logs; \
 +#	fi
  
  # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
  # to the install target.
- install: all install-mkdirs
+@@ -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; \
@@ -92,8 +95,8 @@ $NetBSD: patch-aa,v 1.4 1998/12/06 12:42:00 tron Exp $
 +			$(RM) -f $(sbindir)/-$$f; \
  		fi; \
  	done
- 	@for f in $(UTILS); do \
-@@ -325,20 +327,20 @@
+ 	@if test -n "$(UTILS)"; then \
+@@ -377,20 +379,20 @@
  		fi; \
  	done
  	$(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH)
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
index b3d3e745469..d98f4e4322e 100644
--- a/www/squid/patches/patch-ab
+++ b/www/squid/patches/patch-ab
@@ -1,15 +1,28 @@
-$NetBSD: patch-ab,v 1.3 1998/12/06 12:42:00 tron Exp $
-
---- scripts/Makefile.in.orig	Sat May  4 00:56:18 1996
-+++ scripts/Makefile.in	Sat May 23 21:36:03 1998
-@@ -29,8 +29,8 @@
- 		echo "mkdir $(bindir)"; \
- 		mkdir $(bindir); \
+--- 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 $(bindir)
-+	$(INSTALL_SCRIPT) RunAccel $(bindir)
++	$(INSTALL_SCRIPT) RunCache $(sbindir)
++	$(INSTALL_SCRIPT) RunAccel $(sbindir)
  
  clean:
  
diff --git a/www/squid/patches/patch-af b/www/squid/patches/patch-af
deleted file mode 100644
index 7be3ac95b11..00000000000
--- a/www/squid/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.3 1998/12/06 12:42:01 tron Exp $
-
---- scripts/Makefile.in.orig	Thu Oct  1 16:06:14 1998
-+++ scripts/Makefile.in	Thu Oct  1 16:29:14 1998
-@@ -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 $(exec_prefix); \
- 	fi
--	@if test ! -d $(bindir); then \
--		echo "mkdir $(bindir)"; \
--		mkdir $(bindir); \
-+	@if test ! -d $(sbindir); then \
-+		echo "mkdir $(sbindir)"; \
-+		mkdir $(sbindir); \
- 	fi
--	$(INSTALL_SCRIPT) RunCache $(bindir)
--	$(INSTALL_SCRIPT) RunAccel $(bindir)
-+	$(INSTALL_SCRIPT) RunCache $(sbindir)
-+	$(INSTALL_SCRIPT) RunAccel $(sbindir)
- 
- clean:
- 
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 5bebf7e523d..f426dddde44 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,27 +1,25 @@
-$NetBSD: patch-ag,v 1.7 2000/10/15 20:17:46 veego Exp $
+$NetBSD: patch-ag,v 1.8 2001/04/14 10:05:01 tron Exp $
 
---- configure.orig	Tue Sep 12 13:20:11 2000
-+++ configure	Tue Sep 12 13:17:48 2000
-@@ -676,12 +676,12 @@
+--- configure.orig	Thu Jan 18 18:58:25 2001
++++ configure	Sat Apr 14 11:49:08 2001
+@@ -711,11 +711,11 @@
  REGEXLIB=''	# -lregex
  LIBREGEX=''	# libregex.a
  
 -if test "$libexecdir" = '${exec_prefix}/libexec' &&
 -   test "$localstatedir" = '${prefix}/var'; then
--	libexecdir='${bindir}'
+-	libexecdir='${prefix}/libexec/squid'
 -	localstatedir='${prefix}'
--
 -fi
 +#if test "$libexecdir" = '${exec_prefix}/libexec' &&
 +#   test "$localstatedir" = '${prefix}/var'; then
-+#	libexecdir='${bindir}'
++#	libexecdir='${prefix}/libexec/squid'
 +#	localstatedir='${prefix}'
-+#
 +#fi
  
  case "$host_os" in
- cygwin32|os2)
-@@ -1287,7 +1287,7 @@
+ cygwin|cygwin32|os2)
+@@ -1428,7 +1428,7 @@
  #define SQUID_SNMP 1
  EOF
  
diff --git a/www/squid/patches/patch-ai b/www/squid/patches/patch-ai
deleted file mode 100644
index 1d1f589b0c3..00000000000
--- a/www/squid/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/11/12 22:32:22 tron Exp $
-
---- src/main.c.orig	Mon May 10 18:30:37 1999
-+++ src/main.c	Fri Nov 12 22:22:20 1999
-@@ -351,10 +351,10 @@
- {
-     icmpClose();
-     _db_rotate_log();		/* cache.log */
--    storeDirWriteCleanLogs(1);
-     storeLogRotate();		/* store.log */
-     accessLogRotate();		/* access.log */
-     useragentRotateLog();	/* useragent.log */
-+    storeDirWriteCleanLogs(1);
-     icmpOpen();
- }
- 
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
index d91d5ce2f33..119d0a8f4f4 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,11 +1,11 @@
-$NetBSD: patch-ak,v 1.4 2000/11/02 10:41:45 jdolecek Exp $
+$NetBSD: patch-ak,v 1.5 2001/04/14 10:05:01 tron Exp $
 
---- src/cf.data.pre.orig	Thu Nov  2 09:56:18 2000
-+++ src/cf.data.pre	Thu Nov  2 10:48:58 2000
-@@ -773,6 +773,21 @@ DOC_START
- log_mime_hdrs off
+--- 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 @@
  DOC_END
  
+ 
 +NAME: log_mime_hdrs_list
 +TYPE: wordlist
 +LOC: Config.log_mime_hdrs_list
@@ -21,6 +21,8 @@ $NetBSD: patch-ak,v 1.4 2000/11/02 10:41:45 jdolecek Exp $
 +
 +log_mime_hdrs_list all
 +DOC_END
- 
++
++
  NAME: useragent_log
  TYPE: string
+ LOC: Config.Log.useragent
diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST
index 20e09bdd32a..d9df267e0ce 100644
--- a/www/squid/pkg/PLIST
+++ b/www/squid/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/26 04:56:14 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/04/14 10:05:02 tron Exp $
 etc/rc.d/squid
 libexec/cachemgr.cgi
-libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel