Now apply squid-2.5.STABLE5-sasl_auth_SASL2.patch though pkgsrc dosen't

support making sasl_auth module.  (I think it is better to create
separate packages for those authentication modules.)

Bump package revision.

2 files changed, 70 insertions, 68 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 5261b70ab36..c30b9c947ac 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2004/06/19 16:54:31 taca Exp $
+# $NetBSD: Makefile,v 1.112 2004/06/19 22:05:48 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE5
 PKGNAME=	squid-2.5.5
-PKGREVISION=	5
+PKGREVISION=	6
 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/ \
@@ -40,8 +40,8 @@ PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.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
-#		squid-2.5.STABLE5-sasl_auth_SASL2.patch	   # currently broken
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 21445be9dc5..f086f275e03 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,69 +1,71 @@
-$NetBSD: distinfo,v 1.59 2004/06/19 16:54:31 taca Exp $
+$NetBSD: distinfo,v 1.60 2004/06/19 22:05:48 taca Exp $
 
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5.tar.bz2) = fd632ebaad656566db11cf875868b19a9b4a71db
-Size (squid-2.5.5nb5/squid-2.5.STABLE5.tar.bz2) = 1044932 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_assert.patch) = 28c62c898a653269bee01540dd34c0fc7545b958
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_assert.patch) = 545 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ldap.patch) = b569f946c318f6cb7e84dd237bb33ce2022e7ccf
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ldap.patch) = 6245 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-helper_warning.patch) = 022664cebadd43b1999556bca8a6ea5178243544
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-helper_warning.patch) = 3302 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-pkgconfig.patch) = 8642b87f6ed143e13496d7a84e2b6772786c392e
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-pkgconfig.patch) = 3751 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-vary.patch) = d6d64680a3e841fcf756a63c7dc2ab916ae662d2
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-vary.patch) = 626 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-lin22_poll.patch) = 88fb540f1056ac6d1d627440a4f1858de44f5e92
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-lin22_poll.patch) = 1909 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-version.patch) = ebc1ee7794806d6e2429af89273307e490f5140c
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-version.patch) = 588 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-deny_info.patch) = 32a4b5a5752689818d354d139273fffa37aae25b
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-deny_info.patch) = 1282 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 7444d1df28e16c2eaf4f999136c3a7d87e9df858
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_timeout.patch) = 2531 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-cache_swap_log.patch) = 7f9cc24a135b5299a9ed212c3ab54e9bf3c0bcd8
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-cache_swap_log.patch) = 1245 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_warning.patch) = 217bb0b556455d13ce3780edfaa50594c89719ed
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_warning.patch) = 900 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = fccb9ac30b3cf6cd6d2fdcf2a2e16f11f8e70455
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-digest_blank.patch) = 9a0d1febc08d3ded01c38bb24a342b2b550427a6
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-digest_blank.patch) = 4598 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-post_assert.patch) = 998ea80a6a4c3a657733ae00aac14e5b83bd7865
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-post_assert.patch) = 2953 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-spelling.patch) = bb41521fbd2ba2329568c6eeaa382e0c7b42124d
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-spelling.patch) = 3210 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-digest_ERR.patch) = c4dcaccfb474a6ec909c74aa2e17046fb60fd75f
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-digest_ERR.patch) = 1015 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 911a7cc196c8feb609816c952fcb89b5b81397c5
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 641 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-vary_negatively.patch) = fbf28253dc325e3e0bfd2f7884cfc245d2164f28
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-vary_negatively.patch) = 2308 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-range_offset_limit.patch) = 3c4399608b95ab341ba93609ac531818c7ba106f
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-range_offset_limit.patch) = 565 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-large_cache_mem.patch) = 67d9cd31327c6e88f9c1921ba0b8a8500029ffa7
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-large_cache_mem.patch) = 1848 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-least-load.patch) = 133b2dd6b64dec04c0fc421f1cc1d5a3ec2ebfa5
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-least-load.patch) = 2638 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 4d4c6de195e01da97a4acd9ef869d27665058a60
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-debug_client_ip.patch) = ede058b5a2580d09b338b1f0ee118e44db09812b
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-debug_client_ip.patch) = 2104 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-openbsd_m88k.patch) = fee467a13f364a6bcb8675eae746f05194dbd8a2
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-openbsd_m88k.patch) = 1360 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ftp_html_doctype.patch) = ec4430d1670b897b2c3b3d34ffcd7bc71a2fdf36
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-dns_localhost.patch) = 73be7a23e0aec3304c1597a8c003c40371b99a68
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-dns_localhost.patch) = 1408 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 9177b064a207fa0582fe18b6a965746bf7b3fa33
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-va_copy.patch) = 8bf37643f91687439b06b0e125c7044ed8ce3069
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-va_copy.patch) = 8337 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_log_size.patch) = 7ae32d244141571eed4cdf23a6c73e5f97676afa
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-CONNECT_log_size.patch) = 2011 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-proxy_abuse.patch) = 1922b5010241c2a748b5df43135a6a28b906caf2
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-proxy_abuse.patch) = 761 bytes
-SHA1 (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_auth_overflow.patch) = c9c26cbab3251561ef5d34e22ff1c9a11dc74775
-Size (squid-2.5.5nb5/squid-2.5.STABLE5-ntlm_auth_overflow.patch) = 3198 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5.tar.bz2) = fd632ebaad656566db11cf875868b19a9b4a71db
+Size (squid-2.5.5nb6/squid-2.5.STABLE5.tar.bz2) = 1044932 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-ntlm_assert.patch) = 28c62c898a653269bee01540dd34c0fc7545b958
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-ntlm_assert.patch) = 545 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-ldap.patch) = b569f946c318f6cb7e84dd237bb33ce2022e7ccf
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-ldap.patch) = 6245 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-helper_warning.patch) = 022664cebadd43b1999556bca8a6ea5178243544
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-helper_warning.patch) = 3302 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-pkgconfig.patch) = 8642b87f6ed143e13496d7a84e2b6772786c392e
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-pkgconfig.patch) = 3751 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-vary.patch) = d6d64680a3e841fcf756a63c7dc2ab916ae662d2
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-vary.patch) = 626 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-lin22_poll.patch) = 88fb540f1056ac6d1d627440a4f1858de44f5e92
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-lin22_poll.patch) = 1909 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-version.patch) = ebc1ee7794806d6e2429af89273307e490f5140c
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-version.patch) = 588 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-deny_info.patch) = 32a4b5a5752689818d354d139273fffa37aae25b
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-deny_info.patch) = 1282 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-CONNECT_timeout.patch) = 7444d1df28e16c2eaf4f999136c3a7d87e9df858
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-CONNECT_timeout.patch) = 2531 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-cache_swap_log.patch) = 7f9cc24a135b5299a9ed212c3ab54e9bf3c0bcd8
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-cache_swap_log.patch) = 1245 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-ntlm_warning.patch) = 217bb0b556455d13ce3780edfaa50594c89719ed
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-ntlm_warning.patch) = 900 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = fccb9ac30b3cf6cd6d2fdcf2a2e16f11f8e70455
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-rfc1035NameUnpack.patch) = 685 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-digest_blank.patch) = 9a0d1febc08d3ded01c38bb24a342b2b550427a6
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-digest_blank.patch) = 4598 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-post_assert.patch) = 998ea80a6a4c3a657733ae00aac14e5b83bd7865
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-post_assert.patch) = 2953 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-spelling.patch) = bb41521fbd2ba2329568c6eeaa382e0c7b42124d
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-spelling.patch) = 3210 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-digest_ERR.patch) = c4dcaccfb474a6ec909c74aa2e17046fb60fd75f
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-digest_ERR.patch) = 1015 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 911a7cc196c8feb609816c952fcb89b5b81397c5
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch) = 641 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-vary_negatively.patch) = fbf28253dc325e3e0bfd2f7884cfc245d2164f28
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-vary_negatively.patch) = 2308 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-range_offset_limit.patch) = 3c4399608b95ab341ba93609ac531818c7ba106f
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-range_offset_limit.patch) = 565 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-large_cache_mem.patch) = 67d9cd31327c6e88f9c1921ba0b8a8500029ffa7
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-large_cache_mem.patch) = 1848 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-least-load.patch) = 133b2dd6b64dec04c0fc421f1cc1d5a3ec2ebfa5
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-least-load.patch) = 2638 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 4d4c6de195e01da97a4acd9ef869d27665058a60
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch) = 1449 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-debug_client_ip.patch) = ede058b5a2580d09b338b1f0ee118e44db09812b
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-debug_client_ip.patch) = 2104 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-openbsd_m88k.patch) = fee467a13f364a6bcb8675eae746f05194dbd8a2
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-openbsd_m88k.patch) = 1360 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-ftp_html_doctype.patch) = ec4430d1670b897b2c3b3d34ffcd7bc71a2fdf36
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-ftp_html_doctype.patch) = 1266 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-dns_localhost.patch) = 73be7a23e0aec3304c1597a8c003c40371b99a68
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-dns_localhost.patch) = 1408 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-msnt_auth_doc.patch) = 9177b064a207fa0582fe18b6a965746bf7b3fa33
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-msnt_auth_doc.patch) = 16644 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-va_copy.patch) = 8bf37643f91687439b06b0e125c7044ed8ce3069
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-va_copy.patch) = 8337 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-CONNECT_log_size.patch) = 7ae32d244141571eed4cdf23a6c73e5f97676afa
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-CONNECT_log_size.patch) = 2011 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-proxy_abuse.patch) = 1922b5010241c2a748b5df43135a6a28b906caf2
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-proxy_abuse.patch) = 761 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-sasl_auth_SASL2.patch) = 832b2b1a1849be9aa5da8f88a622adc2262a4e13
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-sasl_auth_SASL2.patch) = 11268 bytes
+SHA1 (squid-2.5.5nb6/squid-2.5.STABLE5-ntlm_auth_overflow.patch) = c9c26cbab3251561ef5d34e22ff1c9a11dc74775
+Size (squid-2.5.5nb6/squid-2.5.STABLE5-ntlm_auth_overflow.patch) = 3198 bytes
 SHA1 (patch-aa) = 2e0d96f6ccb9d0c42db2da49e76846edad09624f
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0