Update squid package to 2.5.6 (squid 2.5.STALBE6 + official patches).

Squid 2.5.STABLE5 to 2.5.STABLE6:

* Several "Assertion error" bugs fixed
* Several "Segmentation fault" bugs fixes
* Corrects a security issue in the old ntlm_auth NTLM helper used in transparent NTLM authentication to a NT domain without using samba.
* Processing of Vary: * and Vary on error messages corrected
* a large number of minor and cosmetic bugfixes. See the list of squid-2.5.STABLE5 patches and the ChangeLog file for details.


2.5.STABLE56 official patches:

* 2004-08-20 08:18 (Major) NTLM authentication denial of service
* 2004-08-14 21:07 (Minor) external_acl does not handle newlines
* 2004-08-09 14:03 (Minor) Supplementary group memberships not set
* 2004-08-05 20:33 (Medium) Segfaults and other strange crashes when using heap policies
* 2004-08-06 11:05 (Cosmetic) Unknown %X errorpage codes incorrectly quoted
* 2004-08-17 12:22 (Cosmetic) Grammatical corrections in squid.conf.default
* 2004-07-27 21:52 (Minor) NTLM authentication truncated
* 2004-07-17 22:43 (Minor) Memory leak in client_db
* 2004-07-17 20:11 (Cosmetic) Add delay pools information to active_requests
* 2004-07-17 19:57 (Minor) case insensitive authentication
* 2004-07-17 19:48 (Cosmetic) Warn if cache_dir ufs can not create files
* 2004-07-17 16:33 (Cosmetic) HEAD requests may return stale information
* 2004-07-17 16:33 (Minor) Partial hit results in TCP_HIT, not TCP_MISS
* 2004-07-17 16:33 (Cosmetic) request_header_max_size configuration option doesn't work correctly
* 2004-07-29 13:29 (Minor) A large number of queued DNS lookups for the same domain
* 2004-08-10 09:40 (Minor) LDAP helpers update
* 2004-07-14 16:29 (Medium) storeCreate: no valid swapdirs for this object

1 files changed, 21 insertions, 36 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 002a3e602ac..244270ba8eb 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.113 2004/06/19 22:07:52 taca Exp $
+# $NetBSD: Makefile,v 1.114 2004/08/22 15:11:07 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE5
-PKGNAME=	squid-2.5.5
-PKGREVISION=	5
+DISTNAME=	squid-2.5.STABLE6
+PKGNAME=	squid-2.5.6
+PKGREVISION=	# empty
 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/ \
@@ -10,38 +10,23 @@ MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 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-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 \
-		squid-2.5.STABLE5-large_cache_mem.patch \
-		squid-2.5.STABLE5-least-load.patch \
-		squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch \
-		squid-2.5.STABLE5-debug_client_ip.patch \
-		squid-2.5.STABLE5-openbsd_m88k.patch \
-		squid-2.5.STABLE5-ftp_html_doctype.patch \
-		squid-2.5.STABLE5-dns_localhost.patch \
-		squid-2.5.STABLE5-msnt_auth_doc.patch \
-		squid-2.5.STABLE5-va_copy.patch \
-		squid-2.5.STABLE5-CONNECT_log_size.patch \
-		squid-2.5.STABLE5-proxy_abuse.patch \
-		squid-2.5.STABLE5-sasl_auth_SASL2.patch \
-		squid-2.5.STABLE5-ntlm_auth_overflow.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch \
+		squid-2.5.STABLE6-ntlmtruncated.patch \
+		squid-2.5.STABLE6-grammar.patch \
+		squid-2.5.STABLE6-errorpage_quote.patch \
+		squid-2.5.STABLE6-heap_segfault.patch \
+		squid-2.5.STABLE6-initgroups.patch \
+		squid-2.5.STABLE6-external_acl_newlines.patch \
+		squid-2.5.STABLE6-ntlm_fetch_string.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org