Pullup ticket 292 - requested by Takahiro Kambe

DoS fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile 1.135
- pkgsrc/www/squid/PLIST    1.16
- pkgsrc/www/squid/distinfo 1.81

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Thu Feb 17 15:04:12 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile PLIST distinfo

   Log Message:
   Update squid package to 2.5.8nb1.

   Apply four official fixes.

   * 2005-02-15 02:14 (Cosmetic) FTP URL cleanups
   * 2005-02-15 01:07 (Cosmetic) Allow high characters in generated FTP and
   				Gopher directory listings
   * 2005-02-15 00:03 (Cosmetic) Cross-platform format fixes
   * 2005-02-13 05:58 (Major) Assertion failure on certain odd DNS responses

   Fixes PR pkg/29412 from Mike M. Volokhov.

3 files changed, 22 insertions, 10 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index ab74c2564d3..fb5662ddf21 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.120.2.8 2005/02/11 23:30:56 snj Exp $
+# $NetBSD: Makefile,v 1.120.2.9 2005/02/17 15:37:00 salo Exp $
 
 DISTNAME=	squid-2.5.STABLE8
 PKGNAME=	squid-2.5.8
+PKGREVISION=	1
 CATEGORIES=	www
 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=	
-#PATCH_DIST_STRIP=       -p1
+
+PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+PATCHFILES=	squid-2.5.STABLE8-dns_assert.patch \
+		squid-2.5.STABLE8-format_fixes.patch \
+		squid-2.5.STABLE8-html_high_chars.patch \
+		squid-2.5.STABLE8-ftp_cleanup.patch
+PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
diff --git a/www/squid/PLIST b/www/squid/PLIST
index 728b32e1511..39b4c50ce08 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.15 2004/04/23 22:08:00 reed Exp $
+@comment $NetBSD: PLIST,v 1.15.6.1 2005/02/17 15:37:00 salo Exp $
 bin/squidclient
 libexec/cachemgr.cgi
 man/man8/squid.8
+sbin/RunAccel
+sbin/RunCache
+sbin/squid
 share/doc/squid/ChangeLog
 share/doc/squid/RELEASENOTES.html
 share/doc/squid/debug-sections.txt
 share/examples/squid/mime.conf
 share/examples/squid/squid.conf
-sbin/RunAccel
-sbin/RunCache
-sbin/squid
 @dirrm share/doc/squid
 @dirrm share/examples/squid
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 95cfaf31185..4c17bbfd2d9 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.68.2.8 2005/02/11 23:30:56 snj Exp $
+$NetBSD: distinfo,v 1.68.2.9 2005/02/17 15:37:00 salo Exp $
 
 SHA1 (squid-2.5.8-2005021100/squid-2.5.STABLE8.tar.bz2) = de126ef85612fcd1a44bdd67d4a410c4d47cd02d
 Size (squid-2.5.8-2005021100/squid-2.5.STABLE8.tar.bz2) = 1057299 bytes
+SHA1 (squid-2.5.8-2005021100/squid-2.5.STABLE8-dns_assert.patch) = 41af4ec15e007d5bc2dbbdecaeb426a5f391c40f
+Size (squid-2.5.8-2005021100/squid-2.5.STABLE8-dns_assert.patch) = 2524 bytes
+SHA1 (squid-2.5.8-2005021100/squid-2.5.STABLE8-format_fixes.patch) = c853e84a671a8c8a6e304a1947be11d776685f34
+Size (squid-2.5.8-2005021100/squid-2.5.STABLE8-format_fixes.patch) = 9538 bytes
+SHA1 (squid-2.5.8-2005021100/squid-2.5.STABLE8-html_high_chars.patch) = 88da65e60bc75b448385696ac2059f690a1b24c1
+Size (squid-2.5.8-2005021100/squid-2.5.STABLE8-html_high_chars.patch) = 766 bytes
+SHA1 (squid-2.5.8-2005021100/squid-2.5.STABLE8-ftp_cleanup.patch) = a710fbb1ae4d24927ce88c46d394fc585ae2a325
+Size (squid-2.5.8-2005021100/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532 bytes
 SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0