Update squid package to 2.5.4nb6.

- Remove --disable-internal-dns.  It could be still enabled by adding to
  SQUID_CONFIGURE_ARGS in /etc/mk.conf.  It found that external dnsserver
  has some problem, performance disadvantage on Solaris 8.

- Apply eight official patches.

o Incomplete objects may appear stuck in the cache

	synopsis	Under certain conditions incomplete objects
			may appear stuck in the cache, not even reload
			giving a new fresh copy.
	severity	Major
	date		2003-12-23 01:23
	bugzilla	#876
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	Compiling squid with --disable-http-violations
			completely avoids the issue.  Setting
			"half_closed_clients off" and making
			quick_abort as aggressively aborting as
			possible by "quick_abort_min 0 KB" and
			"quick_abort_max 0 KB" mostly hides the
			problem.

o assertion failed: pinger.c:187: "icmp_pktsize <= MAX_PKT_SZ"

	synopsis	In Squids built with --enable-icmp the pinger
			helper may exit with the above assertion
			failure if Squid receives a request with a
			very long host name.
	severity	Minor
	date		2003-12-23 01:23
	bugzilla	#865
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	Don't build squid with --enable-icmp.  This is
			generally recommended anyway unless you are
			absolutely sure you want to ICMP PING random
			sites all over the Internet to measure RTT
			information even if this may trigger IDS
			systems etc.

o 000 status code being logged for redirects (should be 302)

	synopsis	Redirects initiated by redirector helpers was
			logged as TCP_MISS/000 instead of the expected
			TCP_MISS/302.  This patch corrects this and should
			also correct log_mime_hdrs output for the same.
	severity	Minor
	date		2003-12-21 16:21
	bugzilla	#869
	versions	Squid-2.5 and earlier
	platforms	All

o Update of Russian error pages

	synopsis	In a current version threre is a problem.  The
			absence of "yo" letter. ("e" with 2 dots ).
			People prefer to write "E" instead "yo", that is
			not quite correct, like "How r u" intstead "How
			are you?"
	severity	Cosmetic
	date		2003-12-21 15:21
	bugzilla	#864
	versions	Squid-2.5 and earlier
	platforms	All

o Added 'urllogin' ACL type

	synopsis	This is not a fix for a Squid bug.  It is a new
			feature to workaround an MSIE6 bug that uses
			control characters to obfuscate the true origin
			server hostname.  You can use the 'urllogin' acl
			TYPE to deny HTTP requests that contain certain
			characters in the URL login field.
	severity	Medium
	date		2003-12-19 16:19
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	Patch MSIE6, if/when the patch becomes available.

o DNS resolver has too short MAXHOSTNAME

	synopsis	Squid would not process hostnames longer than 128
			characters.  This affects few hosts on the
			internet, but with the growing use of iDNA it's
			becoming an issue.
	severity	Minor
	date		2003-12-18 01:18
	bugzilla	#842
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	None.

o Squid refuses to start if "pid_filename none" is specified

	synopsis	Contrary to the documentation "pid_filename none"
			is not accepted and Squid refuses to start.
	severity	Minor
	date		2003-12-17 21:17
	bugzilla	#868
	versions	Squid-2.5 and earlier
	platforms	All

o cache_peer max-conn=.. option does not work

	synopsis	Due to the a accounting mismatch in the number of
			open connections to peers the cache_peer
			max-conn=.. option does not work.  This issue is
			also seen as very high numbers in the OPEN CONN
			peer statistics via cachemgr.
	severity	Minor
	date		2003-12-20 20:20
	bugzilla	#867
	versions	Squid-2.5 and earlier
	platforms	All

- Separate MESSAGE files into each platform.

7 files changed, 98 insertions, 6 deletions

diff --git a/www/squid/MESSAGE.FreeBSD b/www/squid/MESSAGE.FreeBSD
new file mode 100644
index 00000000000..a1fc932c61f
--- /dev/null
+++ b/www/squid/MESSAGE.FreeBSD
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE.FreeBSD,v 1.1 2003/12/25 16:28:14 taca Exp $
+
+The following parameters should work for FreeBSD:
+
+options         SYSVMSG         # System V-like message queues
+options         SYSVSEM         # System V-like semaphores
+options         SYSVSHM         # System V-like memory sharing
+
+options         SHMMAXPGS=8192
+options         MSGMNB=8192
+options         MSGSSZ=64
+options         MSGTQL=2048
+
+===========================================================================
diff --git a/www/squid/MESSAGE.NetBSD b/www/squid/MESSAGE.NetBSD
new file mode 100644
index 00000000000..464a8db6f3a
--- /dev/null
+++ b/www/squid/MESSAGE.NetBSD
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2003/12/25 16:28:14 taca Exp $
+
+The following parameters should work for NetBSD:
+
+options         SYSVMSG         # System V-like message queues
+options         SYSVSEM         # System V-like semaphores
+options         SYSVSHM         # System V-like memory sharing
+
+options         SHMMAXPGS=8192
+options         MSGMNB=16384
+options         MSGSSZ=64
+options         MSGTQL=512
+
+===========================================================================
diff --git a/www/squid/MESSAGE.OpenBSD b/www/squid/MESSAGE.OpenBSD
new file mode 100644
index 00000000000..9a32d148a80
--- /dev/null
+++ b/www/squid/MESSAGE.OpenBSD
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE.OpenBSD,v 1.1 2003/12/25 16:28:14 taca Exp $
+
+The following parameters should work for OpenBSD:
+
+options         SYSVMSG         # System V-like message queues
+options         SYSVSEM         # System V-like semaphores
+options         SYSVSHM         # System V-like memory sharing
+
+options         SHMMAXPGS=8192
+options         MSGMNB=16384
+options         MSGSSZ=64
+options         MSGTQL=1024
+
+===========================================================================
diff --git a/www/squid/MESSAGE.Solaris b/www/squid/MESSAGE.Solaris
new file mode 100644
index 00000000000..db2322a5a6f
--- /dev/null
+++ b/www/squid/MESSAGE.Solaris
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE.Solaris,v 1.1 2003/12/25 16:28:14 taca Exp $
+
+The following parameters in /etc/system should work for Solaris:
+
+set shmsys:shminfo_shmmax=2097152
+set shmsys:shminfo_shmmni=32
+set shmsys:shminfo_shmseg=16
+
+===========================================================================
diff --git a/www/squid/MESSAGE.common b/www/squid/MESSAGE.common
new file mode 100644
index 00000000000..dbe4c68f98a
--- /dev/null
+++ b/www/squid/MESSAGE.common
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE.common,v 1.1 2003/12/25 16:28:14 taca Exp $
+
+You DO need running nameservice to start and run ${PKGNAME}.
+
+Use the ${PKGNAME} proxy and caching WWW Server by
+configuring your WWW Navigator (Netscape, Mosaic, ...)
+to use it as a proxy server.
+
+Please note that to use the diskd storage method, you'll likely have to
+change SYSV-IPC parameters in the kernel config file (see
+http://www.squid-cache.org/Doc/FAQ/FAQ-22.html for details).
+
+===========================================================================
diff --git a/www/squid/Makefile b/www/squid/Makefile
index c3f575e3230..d8a0ba01ed3 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2003/12/17 16:48:27 taca Exp $
+# $NetBSD: Makefile,v 1.99 2003/12/25 16:28:14 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE4
 PKGNAME=	squid-2.5.4
-PKGREVISION=	5
+PKGREVISION=	6
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -34,7 +34,15 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pconn-load.patch \
 		squid-2.5.STABLE4-icon_urls.patch \
 		squid-2.5.STABLE4-redirector_access.patch \
-		squid-2.5.STABLE4-pconn-lifo.patch
+		squid-2.5.STABLE4-pconn-lifo.patch \
+		squid-2.5.STABLE4-cache_peer_maxconn.patch \
+		squid-2.5.STABLE4-pid_filename_none.patch \
+		squid-2.5.STABLE4-dns_namelength.patch \
+		squid-2.5.STABLE4-urllogin_acl.patch \
+		squid-2.5.STABLE4-russian.patch \
+		squid-2.5.STABLE4-redirlog.patch \
+		squid-2.5.STABLE4-pinger.patch \
+		squid-2.5.STABLE4-partial_reload.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
@@ -71,8 +79,7 @@ CONF_FILES+=		${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=		${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
 
 # Configuration options which can be overwritten by the user.
-SQUID_CONFIGURE_ARGS?=	--disable-internal-dns \
-			--enable-auth=basic,digest,ntlm \
+SQUID_CONFIGURE_ARGS?=	--enable-auth=basic,digest,ntlm \
 			--enable-cachemgr-hostname=localhost \
 			--enable-delay-pools \
 			--enable-removal-policies=lru,heap \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index c09095ecd50..f1b5191eb39 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2003/12/17 16:48:27 taca Exp $
+$NetBSD: distinfo,v 1.45 2003/12/25 16:28:14 taca Exp $
 
 SHA1 (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 470a2697625cf6edb83ad6fe59af2e147f557e24
 Size (squid-2.5.4/squid-2.5.STABLE4.tar.bz2) = 1036704 bytes
@@ -50,6 +50,22 @@ SHA1 (squid-2.5.4/squid-2.5.STABLE4-redirector_access.patch) = ffb18533c312f35b8
 Size (squid-2.5.4/squid-2.5.STABLE4-redirector_access.patch) = 3498 bytes
 SHA1 (squid-2.5.4/squid-2.5.STABLE4-pconn-lifo.patch) = 0cb1ea50d42a08c4e852367924ad8cb0f8ee6b6e
 Size (squid-2.5.4/squid-2.5.STABLE4-pconn-lifo.patch) = 1350 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-cache_peer_maxconn.patch) = 95d0c5d7f279a8afbbfd20706ba42ce1d22678a7
+Size (squid-2.5.4/squid-2.5.STABLE4-cache_peer_maxconn.patch) = 3603 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-pid_filename_none.patch) = b5cd27fb366d368e47d61cd626723aa6e8796484
+Size (squid-2.5.4/squid-2.5.STABLE4-pid_filename_none.patch) = 508 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-dns_namelength.patch) = 9935272c3ce447cd62e58d699623426a0872cc1e
+Size (squid-2.5.4/squid-2.5.STABLE4-dns_namelength.patch) = 603 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-urllogin_acl.patch) = 727f701c439a1c56520dbdbbde0efb047497a921
+Size (squid-2.5.4/squid-2.5.STABLE4-urllogin_acl.patch) = 3064 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-russian.patch) = c0f2803e535050dc7e0757761ac566c3c653f815
+Size (squid-2.5.4/squid-2.5.STABLE4-russian.patch) = 20731 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-redirlog.patch) = 6904429ce0bdb169dd0dbea58feefcf95323338a
+Size (squid-2.5.4/squid-2.5.STABLE4-redirlog.patch) = 762 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-pinger.patch) = a11373dc135f03c7b9a6f96400da10cb0d69c772
+Size (squid-2.5.4/squid-2.5.STABLE4-pinger.patch) = 738 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-partial_reload.patch) = 8d7d1bba09ba674e41f635e80c51bd7d78c105c7
+Size (squid-2.5.4/squid-2.5.STABLE4-partial_reload.patch) = 751 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0