Pullup ticket 322 - requested by Takahiro Kambe

update squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile 1.137-1.138
- pkgsrc/www/squid/distinfo 1.84-1.85

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Mon Feb 28 16:59:08 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update squid to 2.5.8nb3, adding recent five official patches.

   * 2005-02-23 00:11 (Medium) Should not automatically retry request on 403
   			      and other server errors
   * 2005-02-21 17:02 (Minor) fqdn lookups with spaces may confuse redirectors
   * 2005-02-21 03:38 (Cosmetic) Display FTP URLs in decoded format to allow
   			      for sane display of national characters etc
   * 2005-02-21 02:58 (Minor) Peer related memory leaks on "squid -k
   			      reconfigure"
   * 2005-02-21 01:38 (Cosmetic) Doesn't work specifying the AR variable to
   			      configure
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Tue Mar  1 11:16:58 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update squid package to 2.5.9 (2.5.STABLE9).

   There is no runtime change from 2.5.8nb3.

   - Fix for a wrong configure warning on Solaris 9 x86 when enabling ARP
     ACl support: The effective host type is i386-pc-solaris2.9.

   - Documentation update for squid 2.5.STALBE9.

2 files changed, 12 insertions, 29 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index f81268c97d8..c021c23d081 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,22 +1,17 @@
-# $NetBSD: Makefile,v 1.120.2.10 2005/02/21 00:29:40 salo Exp $
+# $NetBSD: Makefile,v 1.120.2.11 2005/03/01 12:46:14 salo Exp $
 
-DISTNAME=	squid-2.5.STABLE8
-PKGNAME=	squid-2.5.8
-PKGREVISION=	2
+DISTNAME=	squid-2.5.STABLE9
+PKGNAME=	squid-2.5.9
+PKGREVISION=
 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=	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 \
-		squid-2.5.STABLE8-relaxed_header_parser.patch \
-		squid-2.5.STABLE8-gcc4.patch
-PATCH_DIST_STRIP=       -p1
+#
+#PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+#PATCHFILES=
+#PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
@@ -31,7 +26,7 @@ DATADIR=	${VARBASE}/squid
 
 # Update this time stamp pattern if any of official distfiles has changed.
 #
-DIST_STAMP=	2005022000
+DIST_STAMP=	2005022800
 
 DOCFILES=	ChangeLog RELEASENOTES.html doc/debug-sections.txt
 
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 3f0b53184a6..6237b744533 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.68.2.10 2005/02/21 00:29:40 salo Exp $
+$NetBSD: distinfo,v 1.68.2.11 2005/03/01 12:46:14 salo Exp $
 
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8.tar.bz2) = de126ef85612fcd1a44bdd67d4a410c4d47cd02d
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8.tar.bz2) = 1057299 bytes
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8-dns_assert.patch) = 41af4ec15e007d5bc2dbbdecaeb426a5f391c40f
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8-dns_assert.patch) = 2524 bytes
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8-format_fixes.patch) = 6319ab7ddb769576c1b27f2b6bf33e74af7b0e7f
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8-format_fixes.patch) = 10056 bytes
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8-html_high_chars.patch) = 88da65e60bc75b448385696ac2059f690a1b24c1
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8-html_high_chars.patch) = 766 bytes
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8-ftp_cleanup.patch) = a710fbb1ae4d24927ce88c46d394fc585ae2a325
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8-ftp_cleanup.patch) = 4532 bytes
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8-relaxed_header_parser.patch) = db757dc98f295631a50119b39d873c0d8d9d1c71
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8-relaxed_header_parser.patch) = 3217 bytes
-SHA1 (squid-2.5.8-2005022000/squid-2.5.STABLE8-gcc4.patch) = d200cc77e44f4c0295add906140b29d604ffdf83
-Size (squid-2.5.8-2005022000/squid-2.5.STABLE8-gcc4.patch) = 12128 bytes
+SHA1 (squid-2.5.9-2005022800/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b
+Size (squid-2.5.9-2005022800/squid-2.5.STABLE9.tar.bz2) = 1057776 bytes
 SHA1 (patch-aa) = 3e6fb677125eec276fdfa62336c134f26e1e1edd
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0