Update squid package to 2.5.13 (2.5.STABLE13). Most of changes are

already in our previous package.  Here is changes from 2.5.12 (2.5.STABLE12):

Changes to squid-2.5.STABLE12 (12 Mar 2006)
	- [Minor] Fails to compile on Solaris and some other platforms
	  with undefined reference to setenv (Bug #1435)
	- [Cosmetic] Added WebDAV REPORT method to know HTTP methods list
	- [Minor] Squid ntlm_auth (not the Samba provided one) giving
	  odd results if --enable-ntlm-fail-open is used (Bug #1022)
	- [Minor] wbinfo_group.pl doesn't work with Samba 3.0.21 and later
	  (Bug #1472)
	- [Minor] Squid crash when asyncio function counters url accessed
	  from Cachemgr CGI (Bug #1464)
	- [Cosmetic] Linix compile warning about prctl called with too few
 	  arguments (Bug #1483)
	- [Minor] Wrong timezone declaration for 64 bit Irix (Bug #1479)
	- [Minor] Some 206 responses logged incorrectly (Bug #1511)
	- [Minor] Issues in processing ranges on objects >2GB (Bug #437)
	- [Cosmetic] Segmentation fault on empty proxy_auth ACLs (Bug #1414)
	- [Minor] Ident access lists don't work in delay_access statements
	  (Bug #1428)
	- [Minor] Some clients support NTLM even if not initially negotiating
	  persistent connections (Bug #1447)
	- [Medium] 504 Gateway Time-out on FTP uploads (Bug #1459)
	- [Medium] delay pools given too much bandwidht after "-k reconfigure"
	  (Bug #1481)
	- [Cosmetic] New persistent_connection_after_error configuration
	  directive (Bug #1482)
	- [Cosmetic] Hangs at 100% CPU if /dev/null is not accessible (Bug
	  #1484)
	- [Minor] Fails to compile on Fedora Core 5 test 2 x86_64 (Bug #1492)
	- [Cosmetic] Typo in ftp.c (Bug #1507)
	- [Cosmetic] Error in FTP listings of files with -> in their name
	  (Bug #1508)
	- [Cosmetic] With Squid-2.5 there is no more the DUPLICATE IP logging
 	  in cache.log (Bug #779)
	- [Minor] Fails to process long host names (Bug #1434)
	- [Cosmetic] Azerbaijani errors translation (Bug #1454)
	- [Cosmetic] misleading error message message for bad/unresolveable
	  cache_peer name (Bug #1504)
	- [Cosmetic] confusing statistics on stateful helpers (NTLM auth)
	  (Bug #1506)
	- [Major] connstate memory leak (Bug #1522)

10 files changed, 50 insertions, 150 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index c979630c7e1..c4fd3c756a4 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,41 +1,16 @@
-# $NetBSD: Makefile,v 1.173 2006/03/11 13:15:59 taca Exp $
+# $NetBSD: Makefile,v 1.174 2006/03/12 12:12:19 taca Exp $
 
-DISTNAME=	squid-2.5.STABLE12
-PKGNAME=	squid-2.5.12
-PKGREVISION=	7
+DISTNAME=	squid-2.5.STABLE13
+PKGNAME=	squid-2.5.13
 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.STABLE12-setenv.patch \
-		squid-2.5.STABLE12-REPORT.patch \
-		squid-2.5.STABLE12-SMB_BadFetch.patch \
-		squid-2.5.STABLE12-wbinfo_group.patch \
-		squid-2.5.STABLE12-asyncio_counters.patch \
-		squid-2.5.STABLE12-prctl_args.patch \
-		squid-2.5.STABLE12-irix_timezone.patch \
-		squid-2.5.STABLE12-log_206-4.patch \
-		squid-2.5.STABLE12-range2GB-2.patch \
-		squid-2.5.STABLE12-empty_proxy_auth_acl.patch \
-		squid-2.5.STABLE12-ident_acl.patch \
-		squid-2.5.STABLE12-ntlm_nonpersistent.patch \
-		squid-2.5.STABLE12-ftp_upload.patch \
-		squid-2.5.STABLE12-delay_pool_reconfigure.patch \
-		squid-2.5.STABLE12-persistent_connection_after_error.patch \
-		squid-2.5.STABLE12-devnull.patch \
-		squid-2.5.STABLE12-fc5.patch \
-		squid-2.5.STABLE12-ftpdates.patch \
-		squid-2.5.STABLE12-ftpsymlink.patch \
-		squid-2.5.STABLE12-max_user_ip_log-2.patch \
-		squid-2.5.STABLE12-longhostnames.patch \
-		squid-2.5.STABLE12-Azerbaijani.patch \
-		squid-2.5.STABLE12-peer_dns_error.patch \
-		squid-2.5.STABLE12-statefulhelpers_statistics.patch \
-		squid-2.5.STABLE12-connstate_leak.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/
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 88fc6e90727..dcfe657df55 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,94 +1,19 @@
-$NetBSD: distinfo,v 1.113 2006/03/11 13:15:59 taca Exp $
+$NetBSD: distinfo,v 1.114 2006/03/12 12:12:19 taca Exp $
 
-SHA1 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 57a046ca0eda0f649d259c2c161dc95c81a5dc09
-RMD160 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 0b332612d90d74681e47505a2afbfb6c962807a4
-Size (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 1075111 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = d59827280c5e1a73e659a1d127484e0901d34b48
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = 8698afef7b19402baffd81cecd0dbe143c500556
-Size (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = 934 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-REPORT.patch) = 9d50ebc364a7923afab46f123084c588450d2c1e
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-REPORT.patch) = ac65bcd9654c6acf836a6cfedf75c151da2c67dc
-Size (squid-2.5.12/squid-2.5.STABLE12-REPORT.patch) = 743 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-SMB_BadFetch.patch) = 028199a2be0c9541dce99da84d7c0f0be3f055fa
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-SMB_BadFetch.patch) = 4f4e017062afd27235949882ca336d857e72f866
-Size (squid-2.5.12/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-wbinfo_group.patch) = 32d992c073ae87d42b4f2581f36dedd377c8ea2c
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-wbinfo_group.patch) = 069ec50c312f12ba70d5b55d2cdd972a9fb37290
-Size (squid-2.5.12/squid-2.5.STABLE12-wbinfo_group.patch) = 1615 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-asyncio_counters.patch) = aa7ce6ab0da73d9b2347b25d5a3601d4309362fb
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-asyncio_counters.patch) = c91ee80c3d0da80f1424c00365964f645a6bfd34
-Size (squid-2.5.12/squid-2.5.STABLE12-asyncio_counters.patch) = 497 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-prctl_args.patch) = a258589b6ca4b771c615a84069dde6ff84bdc4e0
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-prctl_args.patch) = 5814f359fbefce41afad1f0a98b7b4b1eea312c5
-Size (squid-2.5.12/squid-2.5.STABLE12-prctl_args.patch) = 1657 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-irix_timezone.patch) = c12c9ba7c7d2077ead828d4b884e6ddfe0ca3adf
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-irix_timezone.patch) = b7e4f091faad235b4d961b861d725d3647cd6154
-Size (squid-2.5.12/squid-2.5.STABLE12-irix_timezone.patch) = 410 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-log_206-4.patch) = dda085fe5acab0d3a963955b4141d3bffb6d2e70
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-log_206-4.patch) = f13e8540a46dbba96e181e630d94f3bb68508037
-Size (squid-2.5.12/squid-2.5.STABLE12-log_206-4.patch) = 3786 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-range2GB-2.patch) = 83b255b2c183b14bd7467a830e9a076eddc9d8ed
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-range2GB-2.patch) = b34b8f5db3b8233a5c33e617d2ae2ef3f038d28a
-Size (squid-2.5.12/squid-2.5.STABLE12-range2GB-2.patch) = 5014 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-empty_proxy_auth_acl.patch) = fb140f5064e233f92ba08a7fc5e816d8216afa50
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-empty_proxy_auth_acl.patch) = 50f3870f0737e9087b5076c54ffe60ed09e91ea4
-Size (squid-2.5.12/squid-2.5.STABLE12-empty_proxy_auth_acl.patch) = 1252 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-ident_acl.patch) = 5a3d83908bb3a76acadb21b29608867e0908b7a6
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-ident_acl.patch) = b3e8d8ac5dc384adb959d815e2327977dab7283b
-Size (squid-2.5.12/squid-2.5.STABLE12-ident_acl.patch) = 944 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-ntlm_nonpersistent.patch) = 3cac3b060cef9d6a2eb813c0f7f3360f522a11ed
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-ntlm_nonpersistent.patch) = 9215f64c86be52459c689a604d5dc19f1888c22c
-Size (squid-2.5.12/squid-2.5.STABLE12-ntlm_nonpersistent.patch) = 651 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-ftp_upload.patch) = 95cdf313d9f0b310be451fdbd4dfa760b34cc3d5
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-ftp_upload.patch) = 61af6bc3238785320f7b9bd3f4b1647697f36de2
-Size (squid-2.5.12/squid-2.5.STABLE12-ftp_upload.patch) = 858 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-delay_pool_reconfigure.patch) = 29bd2638c3a342bb435c1ba236c45aaf6c524a8b
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-delay_pool_reconfigure.patch) = 1943ad71bd8b2cef2f0547b40bb6536bbf8de30f
-Size (squid-2.5.12/squid-2.5.STABLE12-delay_pool_reconfigure.patch) = 916 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-persistent_connection_after_error.patch) = 55699d7eac0866a0a188c639965caf20a5bb354d
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-persistent_connection_after_error.patch) = b8f91a8fabdaa1e928e9069daa79298ebf669b93
-Size (squid-2.5.12/squid-2.5.STABLE12-persistent_connection_after_error.patch) = 1952 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-devnull.patch) = 453315dfcdd22b66270cc1f36663755165f3bd71
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-devnull.patch) = accc6117366cdd8fdd74c7d15336b611820be8f5
-Size (squid-2.5.12/squid-2.5.STABLE12-devnull.patch) = 802 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-fc5.patch) = fca93649c88e94fc1ea3294bb313a9ffd6b74296
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-fc5.patch) = 9bb7a33c94d2fc49b2eebca5d3a26d86bf0d4b16
-Size (squid-2.5.12/squid-2.5.STABLE12-fc5.patch) = 7087 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-ftpdates.patch) = 8746601f4750eebf9f02d112d3efa403aebdd3de
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-ftpdates.patch) = 8d62f0da3bbf0f2cd4d25e4538ffdd0292446778
-Size (squid-2.5.12/squid-2.5.STABLE12-ftpdates.patch) = 721 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-ftpsymlink.patch) = 64262b4cc3fa4c98b8a60146c21af7c34cb40b35
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-ftpsymlink.patch) = 5ff75c30c89a085c4744274a09f5bfcacc82d92e
-Size (squid-2.5.12/squid-2.5.STABLE12-ftpsymlink.patch) = 580 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-max_user_ip_log-2.patch) = 047a39c0333fafe75a16b4c1cc62826cc8238253
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-max_user_ip_log-2.patch) = 47fae164af955b60496fd05ac38e79d0f19d5ee4
-Size (squid-2.5.12/squid-2.5.STABLE12-max_user_ip_log-2.patch) = 583 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-longhostnames.patch) = 0ddadffbdabe95e2bc9d94f7fe4e9e8113fe7200
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-longhostnames.patch) = aa9da95400035935f5354e2d219f72ea3adef73d
-Size (squid-2.5.12/squid-2.5.STABLE12-longhostnames.patch) = 2777 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-Azerbaijani.patch) = 562b759a842cee196cc023b51d97e27b5ae17d5f
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-Azerbaijani.patch) = 280fc25ebdce7075e5d7706657ee3b1cfd44a741
-Size (squid-2.5.12/squid-2.5.STABLE12-Azerbaijani.patch) = 36320 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-peer_dns_error.patch) = 3152bbf72623ac81974f9827f6f2939c49a67fef
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-peer_dns_error.patch) = b91ff8140ba79535587fa27336b4a9cf16c0074b
-Size (squid-2.5.12/squid-2.5.STABLE12-peer_dns_error.patch) = 6141 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-statefulhelpers_statistics.patch) = 466f04878ded84f377857e2e9cad0f234be93d7a
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-statefulhelpers_statistics.patch) = e0521c0e5c604a9854d174e0b46b8729c227c97d
-Size (squid-2.5.12/squid-2.5.STABLE12-statefulhelpers_statistics.patch) = 3185 bytes
-SHA1 (squid-2.5.12/squid-2.5.STABLE12-connstate_leak.patch) = 0282df3c75ccbb7d796f442a53443d7a2e57db73
-RMD160 (squid-2.5.12/squid-2.5.STABLE12-connstate_leak.patch) = d4faeae1446336837bb51666e20f806974fe3bf2
-Size (squid-2.5.12/squid-2.5.STABLE12-connstate_leak.patch) = 1683 bytes
-SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
+SHA1 (squid-2.5.13/squid-2.5.STABLE13.tar.bz2) = b28320d22e17524d2a8442317394f667e108ade7
+RMD160 (squid-2.5.13/squid-2.5.STABLE13.tar.bz2) = 53649274787a6c1157dc0e465637b3371c5cec12
+Size (squid-2.5.13/squid-2.5.STABLE13.tar.bz2) = 1074112 bytes
+SHA1 (patch-aa) = 49032ad1c2ece5c88805276ddd76d0f9ac09cd02
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
-SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
-SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
+SHA1 (patch-ad) = 3c1bce9266818b676b7cce4c2ef1f18e1edf9dd6
+SHA1 (patch-ae) = 2f9857bde5606d412276cb88ba28a38b9a67bd8e
 SHA1 (patch-af) = 9a93e1b98ade2b52089773bd8533586b0cd76925
 SHA1 (patch-ag) = 560f3a2a571cb988a1080e8d45f29a9eafef959e
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
-SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
-SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
-SHA1 (patch-an) = a44c492c39e249d7894d8424263deca7f5e0ea95
-SHA1 (patch-ap) = 0bc9d7dceaf132a60e4089796057e2e3a65c37b8
-SHA1 (patch-bb) = aa85a484f01f980c968f0436b7a2b46e4ee86d4c
+SHA1 (patch-ak) = 590fc6e981c3b95e1a77a2d801747f328ca31a2e
+SHA1 (patch-al) = 931108431486868cdb714dd9fb1f11b27d092b20
+SHA1 (patch-an) = e96eaf094579208da58e3777dfad7e58b5933101
+SHA1 (patch-ap) = e0b7a203f6e299c6e103aaf50aed611a0670bb14
+SHA1 (patch-bb) = dd9de273a1c1d49ec64ad79c49fad9ac862650d7
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 0c1b7e20c1c..49c99f95d05 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
+$NetBSD: patch-aa,v 1.18 2006/03/12 12:12:19 taca Exp $
 
---- src/Makefile.in.orig	2005-04-24 09:12:08.000000000 +0900
+--- src/Makefile.in.orig	2005-09-29 05:57:21.000000000 +0900
 +++ src/Makefile.in
-@@ -384,14 +384,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -388,14 +388,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
  
  DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
  
-@@ -856,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
+@@ -860,20 +860,20 @@ CCDEPMODE = @CCDEPMODE@
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
  	@$(NORMAL_INSTALL)
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
  	done
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
-@@ -1068,7 +1068,7 @@ info-am:
+@@ -1072,7 +1072,7 @@ info-am:
  install-data-am: install-data-local install-dataDATA
  
  install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
  
  install-info: install-info-recursive
  
-@@ -1086,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1090,7 +1090,7 @@ mostlyclean-am: mostlyclean-compile most
  
  uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
  	uninstall-libexecPROGRAMS uninstall-local \
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1169,26 +1169,7 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1175,26 +1175,7 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
  	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index 5631212fc7e..a9e236bb080 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-ad,v 1.8 2006/03/12 12:12:19 taca Exp $
 
---- errors/Makefile.in.orig	2004-06-08 20:37:11.000000000 +0900
+--- errors/Makefile.in.orig	2006-03-11 07:51:47.000000000 +0900
 +++ errors/Makefile.in
-@@ -118,7 +118,7 @@ am__quote = @am__quote@
+@@ -121,7 +121,7 @@ am__quote = @am__quote@
  install_sh = @install_sh@
  makesnmplib = @makesnmplib@
  
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index 6307ab91ee5..fbc4d3bc0de 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-ae,v 1.8 2006/03/12 12:12:19 taca Exp $
 
---- icons/Makefile.in.orig	2004-06-08 20:37:22.000000000 +0900
+--- icons/Makefile.in.orig	2005-09-29 05:57:20.000000000 +0900
 +++ icons/Makefile.in
-@@ -146,7 +146,7 @@ ICON2 = anthony-bomb.gif \
+@@ -149,7 +149,7 @@ ICON2 = anthony-bomb.gif \
  		anthony-xpm.gif
  
  
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
index 220af4bbc04..c613f42fa56 100644
--- a/www/squid/patches/patch-ak
+++ b/www/squid/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.8 2004/08/22 15:11:09 taca Exp $
+$NetBSD: patch-ak,v 1.9 2006/03/12 12:12:19 taca Exp $
 
---- src/cf.data.pre.orig	2004-08-20 18:35:25.000000000 +0900
+--- src/cf.data.pre.orig	2006-02-26 08:01:45.000000000 +0900
 +++ src/cf.data.pre
-@@ -952,6 +952,23 @@ DOC_START
+@@ -953,6 +953,23 @@ DOC_START
  DOC_END
  
  
diff --git a/www/squid/patches/patch-al b/www/squid/patches/patch-al
index 51fe158d7e6..cc441e61562 100644
--- a/www/squid/patches/patch-al
+++ b/www/squid/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.6 2005/02/11 14:47:18 taca Exp $
+$NetBSD: patch-al,v 1.7 2006/03/12 12:12:19 taca Exp $
 
---- src/structs.h.orig	2005-02-04 09:30:01.000000000 +0900
+--- src/structs.h.orig	2006-03-11 07:54:38.000000000 +0900
 +++ src/structs.h
-@@ -537,6 +537,7 @@ struct _SquidConfig {
+@@ -540,6 +540,7 @@ struct _SquidConfig {
      wordlist *mcast_group_list;
      wordlist *dns_testname_list;
      wordlist *dns_nameservers;
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index fb484f0a724..4dd8e891133 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.9 2005/09/15 15:40:47 taca Exp $
+$NetBSD: patch-an,v 1.10 2006/03/12 12:12:19 taca Exp $
 
---- configure.in.orig	2005-09-13 10:48:42.000000000 +0900
+--- configure.in.orig	2006-03-12 20:29:22.000000000 +0900
 +++ configure.in
-@@ -493,7 +493,7 @@ AC_ARG_ENABLE(snmp,
+@@ -496,7 +496,7 @@ AC_ARG_ENABLE(snmp,
  [ if test "$enableval" = "yes" ; then
      echo "SNMP monitoring enabled"
      AC_DEFINE(SQUID_SNMP)
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.9 2005/09/15 15:40:47 taca Exp $
      AM_CONDITIONAL(USE_SNMP, true)
      SNMP_MAKEFILE=./snmplib/Makefile
      makesnmplib=snmplib
-@@ -1302,6 +1302,7 @@ AC_CHECK_HEADERS( \
+@@ -1305,6 +1305,7 @@ AC_CHECK_HEADERS( \
  	libc.h \
  	limits.h \
  	linux/netfilter_ipv4.h \
@@ -19,7 +19,7 @@ $NetBSD: patch-an,v 1.9 2005/09/15 15:40:47 taca Exp $
  	malloc.h \
  	math.h \
  	memory.h \
-@@ -1529,8 +1530,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1532,8 +1533,17 @@ AC_CHECK_TYPE(pid_t, int)
  AC_CHECK_TYPE(size_t, unsigned int)
  AC_CHECK_TYPE(ssize_t, int)
  AC_CHECK_TYPE(off_t, int)
@@ -39,7 +39,7 @@ $NetBSD: patch-an,v 1.9 2005/09/15 15:40:47 taca Exp $
  
  AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
  AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1738,8 +1748,8 @@ if test "$GCC" = "yes"; then
+@@ -1741,8 +1751,8 @@ if test "$GCC" = "yes"; then
  	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
  	case "$GCCVER" in
  	[2.95.[123]])
diff --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap
index f01e24ede64..b590b79db8a 100644
--- a/www/squid/patches/patch-ap
+++ b/www/squid/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 2005/09/15 15:40:47 taca Exp $
+$NetBSD: patch-ap,v 1.3 2006/03/12 12:12:19 taca Exp $
 
---- helpers/basic_auth/MSNT/Makefile.in.orig	2005-03-19 09:55:41.000000000 +0900
+--- helpers/basic_auth/MSNT/Makefile.in.orig	2005-09-29 05:57:18.000000000 +0900
 +++ helpers/basic_auth/MSNT/Makefile.in
-@@ -383,9 +383,9 @@ info: info-am
+@@ -385,9 +385,9 @@ info: info-am
  
  info-am:
  
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 661454fbcc6..a590bba0a07 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.8 2005/09/15 15:40:47 taca Exp $
+$NetBSD: patch-bb,v 1.9 2006/03/12 12:12:19 taca Exp $
 
---- include/autoconf.h.in.orig	2005-04-23 10:32:27.000000000 +0900
+--- include/autoconf.h.in.orig	2005-09-13 09:12:34.000000000 +0900
 +++ include/autoconf.h.in
-@@ -665,6 +668,9 @@
+@@ -671,6 +671,9 @@
  /* Define if you have the <linux/netfilter_ipv4.h> header file.  */
  #undef HAVE_LINUX_NETFILTER_IPV4_H