Update squid package to squid-2.5.4nb5, including six official patches.

o Repeated POST requests causes number of persistent connections to grow

	synopsis	If responses to POST or other non-indempotent
			requests allows the connection to be kept
			persistently open then this can lead to a
			increased connection usage by Squid.  This
			patch changes the behaviour to keep the number
			of connections stable by closing a persistent
			connection before opening the new connection.

	severity	Minor
	date		2003-12-13 16:13
	bugzilla	#862
	versions	Squid-2.5
	platforms	All
	workaround	Disable server-side persistent connections by
			setting "server_persistent_connections off" in
			squid.conf.

o Segmentation fault on aborted FTP PUT requests

	synopsis	If a FTP PUT request is aborted while Squid is
			writing data to the server then Squid may
			abort with a segmentation fault.
	severity	Major
	date		2003-12-14 12:14
	bugzilla	#853
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	If this plauges you a lot then you can deny
			the use of FTP PUT until the server can be
			patched.  But please note that this will limit
			the functionality of the proxy by not allowing
			FTP uploads via the proxy.

			acl FTP protocol FTP
			acl PUT method PUT
			http_access deny FTP PUT

o Limit use of persistent connections when filedescriptor usage is high

	synopsis	Under high usage a lot of filedescriptors may
			be idle persistent connections, causing a
			shortage of filedescriptors for handling new
			requests.
	severity	Minor
	date		2003-12-14 12:14
	bugzilla	#571
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	Disable the use of persistent connections in
			squid.conf.  But pleae note that disabling
			persistent connections will cause a networking
			performance penalty unless you are actually
			short on filedescriptors.  Alternatively
			rebuild Squid with support for more
			filedescriptors.

o Icon URLs are uneededly complex

	synopsis	The URL syntax used by Squid for FTP/Gopher
			icons are uneededly complex and often causes
			problems.  This patch adds a "short_icon_urls"
			directive which can be used to enable a less
			complex URL syntax for icons.
	severity	Cosmetic
	date		2003-12-14 13:14
	bugzilla	#856
	versions	Squid-2.5 and earlier
	platforms	All

o redirector_access does not handle slow acls such as dst or external correctly

	synopsis	redirector_access was a "fast" acl lookup and
			did not handle "slow" acls requiring external
			lookups such as	dst or external correcly.
	severity	Minor
	date		2003-12-14 13:14
	bugzilla	#860
	versions	Squid-2.5 and earlier
	platforms	All

o Persistent connection usage too high after sudden burst of traffic

	synopsis	Persistent server connections are reused in a
			round-robin fashion which may cause the number
			of connections to stay artificially high after
			a sudden burst of requests.

			This patch changes persistent connection
			management to use a LIFO order reusing the
			most recently used connection first, thereby
			allowing unneeded connections to close down by
			idle timeout.
	severity	Minor
	date		2003-12-15 23:15
	bugzilla	#865
	versions	Squid-2.5 and earlier
	platforms	All
	workaround	This usually is not a significant problem, but
			if you are plauged by this you can try
			disabling server-side persistent connections
			in squid.conf.

2 files changed, 22 insertions, 4 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 3c81278b9ed..c3f575e3230 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2003/12/10 04:03:02 taca Exp $
+# $NetBSD: Makefile,v 1.98 2003/12/17 16:48:27 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE4
 PKGNAME=	squid-2.5.4
-PKGREVISION=	4
+PKGREVISION=	5
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
@@ -28,7 +28,13 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-netroute.patch \
 		squid-2.5.STABLE4-synflood.patch \
 		squid-2.5.STABLE4-fqdn.patch \
-		squid-2.5.STABLE4-connect_cleanup.patch
+		squid-2.5.STABLE4-connect_cleanup.patch \
+		squid-2.5.STABLE4-pconn_post.patch \
+		squid-2.5.STABLE4-ftp_put.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
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 09d45e823e5..c09095ecd50 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2003/12/10 04:03:02 taca Exp $
+$NetBSD: distinfo,v 1.44 2003/12/17 16:48:27 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
@@ -38,6 +38,18 @@ SHA1 (squid-2.5.4/squid-2.5.STABLE4-fqdn.patch) = fc0113ebef713234ec9905359a57c1
 Size (squid-2.5.4/squid-2.5.STABLE4-fqdn.patch) = 713 bytes
 SHA1 (squid-2.5.4/squid-2.5.STABLE4-connect_cleanup.patch) = 20eba739b2fd16a6149c942ff9ca54607dd1b547
 Size (squid-2.5.4/squid-2.5.STABLE4-connect_cleanup.patch) = 32516 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-pconn_post.patch) = ded777e72f4c0a96569751b23a0da18f651277e3
+Size (squid-2.5.4/squid-2.5.STABLE4-pconn_post.patch) = 1231 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-ftp_put.patch) = 1fdaeaedee29ca7093441044dc53802cd02423cb
+Size (squid-2.5.4/squid-2.5.STABLE4-ftp_put.patch) = 584 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-pconn-load.patch) = f11a89722d4808dc30c131854a9b7e80d2df95c8
+Size (squid-2.5.4/squid-2.5.STABLE4-pconn-load.patch) = 2397 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-icon_urls.patch) = 3a4e3cfe9f1678c5dd4ed6a1e474bb4da89a2a74
+Size (squid-2.5.4/squid-2.5.STABLE4-icon_urls.patch) = 2399 bytes
+SHA1 (squid-2.5.4/squid-2.5.STABLE4-redirector_access.patch) = ffb18533c312f35b8ac1bc2ce615b0bfd6a7f3c8
+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 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0