Add official patches and bump PKGREVISION.

o 2004-03-11 15:29 (Cosmetic)
	Helper queue warnings inprecice on the number of helpers required
o 2004-03-12 10:13 (Cosmetic)
	Add pkg-config support for finding correct OpenSSL compile flags
o 2004-03-19 09:02 (Medium) "Vary: *" is ignored
o 2004-03-19 09:12 (Minor) 100% CPU usage on Linux-2.2
o 2004-03-19 09:17 (Cosmetic)
	Version number includes -CVS if autoconf is run
o 2004-03-29 09:47 (Minor)
	deny_info redirection with requested URL escaped wrongly
o 2004-03-29 10:02 (Minor) CONNECT timeout should produce a 504 or 503
o 2004-04-03 13:54 (Cosmetic)
	cache_swap_log documentation referred to swap.state by it's old
	swap.log name
o 2004-04-06 14:12 (Cosmetic)
	ntlm/auth_ntlm.c(683): warning #187: use of "=" where "==" may
	have been intended
o 2004-04-11 09:19 (Medium) rfc1035NameUnpack: Assertion (*off) < sz failed
o 2004-04-18 01:33 (Major)
	Segment violation when using a blank user name in digest authentication
o 2004-04-18 23:46 (Medium)
	assertion failed: errorpage.c:292: "mem->inmem_hi == 0"
o 2004-04-20 12:30 (Cosmetic)
	Spelling corrections in configure and squid.conf.default
o 2004-04-20 12:38 (Cosmetic)
	Clarify meaning of ERR in digest helper protocol
o 2004-04-20 12:38 (Cosmetic)
	Spelling error in Turkish ERR_DNS_FAIL
o 2004-04-24 14:10 (Minor)
	Negative cached 404 replies with VARY header never matches
o 2004-04-30 00:01 (Minor)
	range_offset_limit -1 KB rejected as invalid syntax

2 files changed, 55 insertions, 4 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index ae3428e8c7d..64a09c302a6 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2004/04/26 03:35:04 snj Exp $
+# $NetBSD: Makefile,v 1.106 2004/05/06 14:44:53 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE5
 PKGNAME=	squid-2.5.5
-PKGREVISION=	1
+PKGREVISION=	2
 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/ \
@@ -11,7 +11,24 @@ EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
 PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
-		squid-2.5.STABLE5-ldap.patch
+		squid-2.5.STABLE5-ldap.patch \
+		squid-2.5.STABLE5-helper_warning.patch \
+		squid-2.5.STABLE5-pkgconfig.patch \
+		squid-2.5.STABLE5-vary.patch \
+		squid-2.5.STABLE5-lin22_poll.patch \
+		squid-2.5.STABLE5-version.patch \
+		squid-2.5.STABLE5-deny_info.patch \
+		squid-2.5.STABLE5-CONNECT_timeout.patch \
+		squid-2.5.STABLE5-cache_swap_log.patch \
+		squid-2.5.STABLE5-ntlm_warning.patch \
+		squid-2.5.STABLE5-rfc1035NameUnpack.patch \
+		squid-2.5.STABLE5-digest_blank.patch \
+		squid-2.5.STABLE5-post_assert.patch \
+		squid-2.5.STABLE5-spelling.patch \
+		squid-2.5.STABLE5-digest_ERR.patch \
+		squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch \
+		squid-2.5.STABLE5-vary_negatively.patch \
+		squid-2.5.STABLE5-range_offset_limit.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 5440e8cc8ce..e91235e8f85 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2004/03/30 08:17:46 agc Exp $
+$NetBSD: distinfo,v 1.52 2004/05/06 14:44:53 taca Exp $
 
 SHA1 (squid-2.5.5/squid-2.5.STABLE5.tar.bz2) = fd632ebaad656566db11cf875868b19a9b4a71db
 Size (squid-2.5.5/squid-2.5.STABLE5.tar.bz2) = 1044932 bytes
@@ -6,6 +6,40 @@ SHA1 (squid-2.5.5/squid-2.5.STABLE5-ntlm_assert.patch) = 28c62c898a653269bee0154
 Size (squid-2.5.5/squid-2.5.STABLE5-ntlm_assert.patch) = 545 bytes
 SHA1 (squid-2.5.5/squid-2.5.STABLE5-ldap.patch) = b569f946c318f6cb7e84dd237bb33ce2022e7ccf
 Size (squid-2.5.5/squid-2.5.STABLE5-ldap.patch) = 6245 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-helper_warning.patch) = 022664cebadd43b1999556bca8a6ea5178243544
+Size (squid-2.5.5/squid-2.5.STABLE5-helper_warning.patch) = 3302 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-pkgconfig.patch) = 8642b87f6ed143e13496d7a84e2b6772786c392e
+Size (squid-2.5.5/squid-2.5.STABLE5-pkgconfig.patch) = 3751 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-vary.patch) = d6d64680a3e841fcf756a63c7dc2ab916ae662d2
+Size (squid-2.5.5/squid-2.5.STABLE5-vary.patch) = 626 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-lin22_poll.patch) = 88fb540f1056ac6d1d627440a4f1858de44f5e92
+Size (squid-2.5.5/squid-2.5.STABLE5-lin22_poll.patch) = 1909 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-version.patch) = ebc1ee7794806d6e2429af89273307e490f5140c
+Size (squid-2.5.5/squid-2.5.STABLE5-version.patch) = 588 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-deny_info.patch) = 32a4b5a5752689818d354d139273fffa37aae25b
+Size (squid-2.5.5/squid-2.5.STABLE5-deny_info.patch) = 1282 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 7444d1df28e16c2eaf4f999136c3a7d87e9df858
+Size (squid-2.5.5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 2531 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-cache_swap_log.patch) = 7f9cc24a135b5299a9ed212c3ab54e9bf3c0bcd8
+Size (squid-2.5.5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-ntlm_warning.patch) = 217bb0b556455d13ce3780edfaa50594c89719ed
+Size (squid-2.5.5/squid-2.5.STABLE5-ntlm_warning.patch) = 900 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = fccb9ac30b3cf6cd6d2fdcf2a2e16f11f8e70455
+Size (squid-2.5.5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-digest_blank.patch) = 9a0d1febc08d3ded01c38bb24a342b2b550427a6
+Size (squid-2.5.5/squid-2.5.STABLE5-digest_blank.patch) = 4598 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-post_assert.patch) = 998ea80a6a4c3a657733ae00aac14e5b83bd7865
+Size (squid-2.5.5/squid-2.5.STABLE5-post_assert.patch) = 2953 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-spelling.patch) = bb41521fbd2ba2329568c6eeaa382e0c7b42124d
+Size (squid-2.5.5/squid-2.5.STABLE5-spelling.patch) = 3210 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-digest_ERR.patch) = c4dcaccfb474a6ec909c74aa2e17046fb60fd75f
+Size (squid-2.5.5/squid-2.5.STABLE5-digest_ERR.patch) = 1015 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 911a7cc196c8feb609816c952fcb89b5b81397c5
+Size (squid-2.5.5/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 641 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-vary_negatively.patch) = fbf28253dc325e3e0bfd2f7884cfc245d2164f28
+Size (squid-2.5.5/squid-2.5.STABLE5-vary_negatively.patch) = 2308 bytes
+SHA1 (squid-2.5.5/squid-2.5.STABLE5-range_offset_limit.patch) = 3c4399608b95ab341ba93609ac531818c7ba106f
+Size (squid-2.5.5/squid-2.5.STABLE5-range_offset_limit.patch) = 565 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0