- Add more official patches, last one is applied as patches/patch-cd

  since it is broken (reported to squid-bugs@squid-cache.org.)
- use DIST_SUBDIR.
- bump PKG_REVISION.

These patches fixes those problem. See
<http://www.squid-cache.org/Versions/v2/2.5/bugs/> in detail.

   o Squid MIB definition syntax error
   o winbind helpers fail to work with Samba 2.2.6 or later
   o CONNECT data corruption if client pipelines data before 200 OK reply
   o time acls only accept a single time
   o Client performance issue with HEAD requests to certain servers
   o --with-ssl fails to compile with OpenSSL 0.9.7 or later
   o Slow filedescriptor leak for /etc/hosts
   o Warn if cachemgr_passwd is specified more than once for the same action
   o assertion failed: forward.c:96: "fwdState->err" on shutdown
   o Compilation fails if incorrect --with-auth-threads=NN option is given
   o squid.conf documentation still refers to authenticate_program
   o authenticateAuthenticate: no connection data, cannot process
     authentication
   o delay_pools example does not match text
   o cachemgr helper stats cleanup
   o Segmentation fault after ftpDataWriteCallback
   o Issues with auth scheme configurations
   o Removed Cachable stats "no.non_get"
   o unclear documentation of http_reply_body_max_size
   o The pid file was removed too early in the shutdown process
   o select loops statistics incorrect when using select()
   o Added select filedescriptor histogram output to cachemgr
   o Duplicate assignment of sc->copy_offset
   o mem_pool_free_calls should be printed as a unsigned integer
   o Internal cleanup of peer selection accounting
   o log_mime_hdrs can show garbage in the access log on overly long request
     headers
   o Improved memory usage statistics via sbrk
   o Hostname cleanups performed by Squid
   o cachemgr failure_ratio is a ratio, not percentage
   o offline_toggle cachemgr documentation
   o squid_ldap_group update to version 2.10
   o Documentation update to remove stale reference to Squid-1.1 release notes
   o further safeguards for aufs compilation problems when not using
     --enable-pthreads
   o chroot_dir complains about all paths in squid.conf
   o Segfault when using -S in combination with cache_dir coss/null
   o Stale cached data miss in offline_mode
   o Sometimes crashes while rebuilding dirty cache directories
   o RunCache/RunAccel scripts still looks for squid in bin
   o poor performance when using aufs
   o squid_ldap_group link failure
   o assertion failed: comm.c:646: "F->flags.open"

3 files changed, 178 insertions, 67 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8150a2c4cb5..6cc5bcacf02 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2003/01/28 22:04:31 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2003/02/16 06:43:40 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE1
 PKGNAME=	squid-2.5.1
-PKGREVISION=	2
+PKGREVISION=	3
 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/ \
@@ -32,7 +32,48 @@ PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
 		squid-2.5.STABLE1-cachemgr.patch \
 		squid-2.5.STABLE1-auth-proxy.patch \
 		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch
+		squid-2.5.STABLE1-spaces.patch \
+		squid-2.5.STABLE1-flags_open.patch \
+		squid-2.5.STABLE1-ldap_group-compile.patch \
+		squid-2.5.STABLE1-aufs_performance.patch \
+		squid-2.5.STABLE1-RunCache.patch \
+		squid-2.5.STABLE1-rebuild_assert.patch \
+		squid-2.5.STABLE1-offline_mode.patch \
+		squid-2.5.STABLE1-S.patch \
+		squid-2.5.STABLE1-chroot.patch \
+		squid-2.5.STABLE1-aufs_reentrant.patch \
+		squid-2.5.STABLE1-relnote11.patch \
+		squid-2.5.STABLE1-ldap_group.patch \
+		squid-2.5.STABLE1-offline_toggle.patch \
+		squid-2.5.STABLE1-failure_ratio.patch \
+		squid-2.5.STABLE1-hostnames.patch \
+		squid-2.5.STABLE1-sbrk.patch \
+		squid-2.5.STABLE1-log_mime_hdrs.patch \
+		squid-2.5.STABLE1-peer_select_alg.patch \
+		squid-2.5.STABLE1-mempoolstat.patch \
+		squid-2.5.STABLE1-copy_offset.patch \
+		squid-2.5.STABLE1-select_fds_hist.patch \
+		squid-2.5.STABLE1-select_stat.patch \
+		squid-2.5.STABLE1-pidfile.patch \
+		squid-2.5.STABLE1-http_reply_max_size.patch \
+		squid-2.5.STABLE1-cachemgr_non_get.patch \
+		squid-2.5.STABLE1-authsheme_realloc.patch \
+		squid-2.5.STABLE1-ftp_abort.patch \
+		squid-2.5.STABLE1-helper_stats.patch \
+		squid-2.5.STABLE1-delay_pools_docs.patch \
+		squid-2.5.STABLE1-auth_connection.patch \
+		squid-2.5.STABLE1-authenticate_program_docs.patch \
+		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
+		squid-2.5.STABLE1-shutdown_assert.patch \
+		squid-2.5.STABLE1-cachemgr_passwd.patch \
+		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
+		squid-2.5.STABLE1-openssl097.patch \
+		squid-2.5.STABLE1-HEAD_bad_headers.patch \
+		squid-2.5.STABLE1-time_acl_list.patch \
+		squid-2.5.STABLE1-CONNECT_pipeline.patch \
+		squid-2.5.STABLE1-winbind.patch
+#	currently it is broken, so patch with patches/patch-cd
+#		squid-2.5.STABLE1-mib.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@netbsd.org
@@ -40,6 +81,7 @@ HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
 USE_PERL5=	build
+DIST_SUBDIR=	squid-2.5.1
 
 # Configuration directory location which can be overwritten by the user.
 PKG_SYSCONFSUBDIR?=	squid
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 6f9f8abc128..3de795109a0 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,60 +1,137 @@
-$NetBSD: distinfo,v 1.22 2002/12/03 16:58:56 wiz Exp $
+$NetBSD: distinfo,v 1.23 2003/02/16 06:43:41 taca Exp $
 
-SHA1 (squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62
-Size (squid-2.5.STABLE1.tar.bz2) = 1006600 bytes
-SHA1 (squid-2.5.STABLE1-disable-ident-lookups.patch) = 8b21d1c40c85a86c575e039021b10010e0ab55a8
-Size (squid-2.5.STABLE1-disable-ident-lookups.patch) = 695 bytes
-SHA1 (squid-2.5.STABLE1-disable-http-violations.patch) = 18bc6685a7ee054e75f5260f6db15064671df361
-Size (squid-2.5.STABLE1-disable-http-violations.patch) = 1903 bytes
-SHA1 (squid-2.5.STABLE1-proxy_auth.patch) = acbe54df4e2f6f00ac17d20e8b65a33c8fb27c32
-Size (squid-2.5.STABLE1-proxy_auth.patch) = 6507 bytes
-SHA1 (squid-2.5.STABLE1-max_user_ip.patch) = fcab373dc21c2b79e397a594469e18a308c13f41
-Size (squid-2.5.STABLE1-max_user_ip.patch) = 12639 bytes
-SHA1 (squid-2.5.STABLE1-cache_dir_docs.patch) = 3795590991c447b1f4b3bc78db78722f4c1709df
-Size (squid-2.5.STABLE1-cache_dir_docs.patch) = 960 bytes
-SHA1 (squid-2.5.STABLE1-load_icons.patch) = 960858c6d8ada1d70c20d740148de42ddb3c93a0
-Size (squid-2.5.STABLE1-load_icons.patch) = 1254 bytes
-SHA1 (squid-2.5.STABLE1-referer_log.patch) = f5fceab5c485068d023b6093490f26f42278096e
-Size (squid-2.5.STABLE1-referer_log.patch) = 1347 bytes
-SHA1 (squid-2.5.STABLE1-ldap_auth.patch) = 0fe9f652d5cb72821b70151a819454ddb5f553ec
-Size (squid-2.5.STABLE1-ldap_auth.patch) = 1203 bytes
-SHA1 (squid-2.5.STABLE1-addlang.patch) = aafb5c5535a2e48a83831cd42265c6a5354942cc
-Size (squid-2.5.STABLE1-addlang.patch) = 1483 bytes
-SHA1 (squid-2.5.STABLE1-pthreads.patch) = ba0839b2595e005ffa5fe2d7f8de685097703adf
-Size (squid-2.5.STABLE1-pthreads.patch) = 4047 bytes
-SHA1 (squid-2.5.STABLE1-strwordtok.patch) = 916e63f5db23971466e1d15038f09d47112f0f81
-Size (squid-2.5.STABLE1-strwordtok.patch) = 2005 bytes
-SHA1 (squid-2.5.STABLE1-wccp.patch) = 38ccbbab09a03228f3617f16db1a916e23439eeb
-Size (squid-2.5.STABLE1-wccp.patch) = 2143 bytes
-SHA1 (squid-2.5.STABLE1-memstat.patch) = 4c67ece7a7cc1e6ab46b2a6e586287adc3a5d426
-Size (squid-2.5.STABLE1-memstat.patch) = 571 bytes
-SHA1 (squid-2.5.STABLE1-aufs.patch) = 82e216a036ae3660cf0085c20b15feab881e13cf
-Size (squid-2.5.STABLE1-aufs.patch) = 17855 bytes
-SHA1 (squid-2.5.STABLE1-acl_leak.patch) = a217d6a2c00637165a4b61f8ebc411bd69ea8539
-Size (squid-2.5.STABLE1-acl_leak.patch) = 1722 bytes
-SHA1 (squid-2.5.STABLE1-ext_acl_comma.patch) = 3a6a739f52a67e4256df20756ce123108fcb1ca0
-Size (squid-2.5.STABLE1-ext_acl_comma.patch) = 600 bytes
-SHA1 (squid-2.5.STABLE1-request_entity.patch) = 68f756428f8477b5779c424965d6bd66c154577a
-Size (squid-2.5.STABLE1-request_entity.patch) = 1999 bytes
-SHA1 (squid-2.5.STABLE1-ext_acl_exit.patch) = 3de37ee805f22d47e1296edb64a4c8c50d58fda4
-Size (squid-2.5.STABLE1-ext_acl_exit.patch) = 1858 bytes
-SHA1 (squid-2.5.STABLE1-uninstall.patch) = b103cc343e77e3029c7a995a4fe8077efbd0f66f
-Size (squid-2.5.STABLE1-uninstall.patch) = 2395 bytes
-SHA1 (squid-2.5.STABLE1-cachemgr.patch) = 364542493e269db5c9101557d4e095caa3ca25aa
-Size (squid-2.5.STABLE1-cachemgr.patch) = 1182 bytes
-SHA1 (squid-2.5.STABLE1-auth-proxy.patch) = cbb1d1300027ccaef73356a3ee7d849b1e386d27
-Size (squid-2.5.STABLE1-auth-proxy.patch) = 1225 bytes
-SHA1 (squid-2.5.STABLE1-dnsserver.patch) = 3f58bac1233b90e7504e65e1cb3e55fa8aba5273
-Size (squid-2.5.STABLE1-dnsserver.patch) = 795 bytes
-SHA1 (squid-2.5.STABLE1-spaces.patch) = 1c40dfa614096685ed1d39af16878869f4ad3d3c
-Size (squid-2.5.STABLE1-spaces.patch) = 1014 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62
+Size (squid-2.5.1/squid-2.5.STABLE1.tar.bz2) = 1006600 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-disable-ident-lookups.patch) = 8b21d1c40c85a86c575e039021b10010e0ab55a8
+Size (squid-2.5.1/squid-2.5.STABLE1-disable-ident-lookups.patch) = 695 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-disable-http-violations.patch) = 16c24d98ca41a0aaa15c4f58fafc3b5adfd3d375
+Size (squid-2.5.1/squid-2.5.STABLE1-disable-http-violations.patch) = 405 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-proxy_auth.patch) = acbe54df4e2f6f00ac17d20e8b65a33c8fb27c32
+Size (squid-2.5.1/squid-2.5.STABLE1-proxy_auth.patch) = 6507 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-max_user_ip.patch) = fcab373dc21c2b79e397a594469e18a308c13f41
+Size (squid-2.5.1/squid-2.5.STABLE1-max_user_ip.patch) = 12639 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-cache_dir_docs.patch) = 3795590991c447b1f4b3bc78db78722f4c1709df
+Size (squid-2.5.1/squid-2.5.STABLE1-cache_dir_docs.patch) = 960 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-load_icons.patch) = 960858c6d8ada1d70c20d740148de42ddb3c93a0
+Size (squid-2.5.1/squid-2.5.STABLE1-load_icons.patch) = 1254 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-referer_log.patch) = f5fceab5c485068d023b6093490f26f42278096e
+Size (squid-2.5.1/squid-2.5.STABLE1-referer_log.patch) = 1347 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-ldap_auth.patch) = 0fe9f652d5cb72821b70151a819454ddb5f553ec
+Size (squid-2.5.1/squid-2.5.STABLE1-ldap_auth.patch) = 1203 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-addlang.patch) = aafb5c5535a2e48a83831cd42265c6a5354942cc
+Size (squid-2.5.1/squid-2.5.STABLE1-addlang.patch) = 1483 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-pthreads.patch) = ba0839b2595e005ffa5fe2d7f8de685097703adf
+Size (squid-2.5.1/squid-2.5.STABLE1-pthreads.patch) = 4047 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-strwordtok.patch) = 916e63f5db23971466e1d15038f09d47112f0f81
+Size (squid-2.5.1/squid-2.5.STABLE1-strwordtok.patch) = 2005 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-wccp.patch) = 38ccbbab09a03228f3617f16db1a916e23439eeb
+Size (squid-2.5.1/squid-2.5.STABLE1-wccp.patch) = 2143 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-memstat.patch) = 4c67ece7a7cc1e6ab46b2a6e586287adc3a5d426
+Size (squid-2.5.1/squid-2.5.STABLE1-memstat.patch) = 571 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-aufs.patch) = 82e216a036ae3660cf0085c20b15feab881e13cf
+Size (squid-2.5.1/squid-2.5.STABLE1-aufs.patch) = 17855 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-acl_leak.patch) = a217d6a2c00637165a4b61f8ebc411bd69ea8539
+Size (squid-2.5.1/squid-2.5.STABLE1-acl_leak.patch) = 1722 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-ext_acl_comma.patch) = 3a6a739f52a67e4256df20756ce123108fcb1ca0
+Size (squid-2.5.1/squid-2.5.STABLE1-ext_acl_comma.patch) = 600 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-request_entity.patch) = 68f756428f8477b5779c424965d6bd66c154577a
+Size (squid-2.5.1/squid-2.5.STABLE1-request_entity.patch) = 1999 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-ext_acl_exit.patch) = 3de37ee805f22d47e1296edb64a4c8c50d58fda4
+Size (squid-2.5.1/squid-2.5.STABLE1-ext_acl_exit.patch) = 1858 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-uninstall.patch) = b103cc343e77e3029c7a995a4fe8077efbd0f66f
+Size (squid-2.5.1/squid-2.5.STABLE1-uninstall.patch) = 2395 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-cachemgr.patch) = 364542493e269db5c9101557d4e095caa3ca25aa
+Size (squid-2.5.1/squid-2.5.STABLE1-cachemgr.patch) = 1182 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-auth-proxy.patch) = cbb1d1300027ccaef73356a3ee7d849b1e386d27
+Size (squid-2.5.1/squid-2.5.STABLE1-auth-proxy.patch) = 1225 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-dnsserver.patch) = 3f58bac1233b90e7504e65e1cb3e55fa8aba5273
+Size (squid-2.5.1/squid-2.5.STABLE1-dnsserver.patch) = 795 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-spaces.patch) = 1c40dfa614096685ed1d39af16878869f4ad3d3c
+Size (squid-2.5.1/squid-2.5.STABLE1-spaces.patch) = 1014 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-flags_open.patch) = 771642e607e276f0429c4900b4211440744d2ef8
+Size (squid-2.5.1/squid-2.5.STABLE1-flags_open.patch) = 634 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-ldap_group-compile.patch) = 54012cc0e78765c3e8755b8f4083f5afba933df5
+Size (squid-2.5.1/squid-2.5.STABLE1-ldap_group-compile.patch) = 1570 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-aufs_performance.patch) = 5360cc0ff6fa5966a8f48daf64366c00e6d52a56
+Size (squid-2.5.1/squid-2.5.STABLE1-aufs_performance.patch) = 3383 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-RunCache.patch) = b1ce9d936bc19432ba36a3bd740e3e2ee978fea8
+Size (squid-2.5.1/squid-2.5.STABLE1-RunCache.patch) = 1068 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-rebuild_assert.patch) = a146de9315c3339e723c56d7cda645eda8781eb7
+Size (squid-2.5.1/squid-2.5.STABLE1-rebuild_assert.patch) = 3572 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-offline_mode.patch) = bd3b8bd9cc1a45c00eda14d9fdf448442c40b2a5
+Size (squid-2.5.1/squid-2.5.STABLE1-offline_mode.patch) = 917 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-S.patch) = fb4fa8b88503388695dbec73a56ee73b71d05848
+Size (squid-2.5.1/squid-2.5.STABLE1-S.patch) = 635 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-chroot.patch) = eae51317095148bc1b2b40c52e519d2d3013d901
+Size (squid-2.5.1/squid-2.5.STABLE1-chroot.patch) = 826 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-aufs_reentrant.patch) = 0db98c47e5ca3a06c6541e089477a557b36457b5
+Size (squid-2.5.1/squid-2.5.STABLE1-aufs_reentrant.patch) = 448 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-relnote11.patch) = a94d3a598c7ea6438c88697a2a500c51675afe31
+Size (squid-2.5.1/squid-2.5.STABLE1-relnote11.patch) = 762 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-ldap_group.patch) = ff8096fa1212975bf9a88b10f59ae88939685654
+Size (squid-2.5.1/squid-2.5.STABLE1-ldap_group.patch) = 25837 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-offline_toggle.patch) = 388629a5dfeba6993809520a14b47690abf07bd0
+Size (squid-2.5.1/squid-2.5.STABLE1-offline_toggle.patch) = 368 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-failure_ratio.patch) = 606c3639c75a0c37edaa7a9a035c8b9f2b06928f
+Size (squid-2.5.1/squid-2.5.STABLE1-failure_ratio.patch) = 900 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-hostnames.patch) = 8edfe53a98d6c0c09c9509d2f990d2f90731843b
+Size (squid-2.5.1/squid-2.5.STABLE1-hostnames.patch) = 5557 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-sbrk.patch) = fc3677369f8648cb0b2fa232083a80ad118a4215
+Size (squid-2.5.1/squid-2.5.STABLE1-sbrk.patch) = 3496 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-log_mime_hdrs.patch) = dd80ea4505777c0cbd236a43d2214e85429fe5cf
+Size (squid-2.5.1/squid-2.5.STABLE1-log_mime_hdrs.patch) = 503 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-peer_select_alg.patch) = 5a0356d6ad358490d68769721e51de80a1ea36ab
+Size (squid-2.5.1/squid-2.5.STABLE1-peer_select_alg.patch) = 2457 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-mempoolstat.patch) = 488d00decd37a79e0bfff5fed8df4afd4a0f789a
+Size (squid-2.5.1/squid-2.5.STABLE1-mempoolstat.patch) = 1070 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-copy_offset.patch) = 05a34799ce176af6eac7dd26ed727456b5281ecd
+Size (squid-2.5.1/squid-2.5.STABLE1-copy_offset.patch) = 476 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-select_fds_hist.patch) = cb0ae5f9d44813e5431249ebbe6dcaa848a80563
+Size (squid-2.5.1/squid-2.5.STABLE1-select_fds_hist.patch) = 555 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-select_stat.patch) = 74a5691ef30017cb44b820de9a608f1c3fd5b32b
+Size (squid-2.5.1/squid-2.5.STABLE1-select_stat.patch) = 682 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-pidfile.patch) = d18de709dde42248515547f13a932af7c7fcf028
+Size (squid-2.5.1/squid-2.5.STABLE1-pidfile.patch) = 903 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-http_reply_max_size.patch) = f35f419b4468259e2bb50aa37d7963456813cff7
+Size (squid-2.5.1/squid-2.5.STABLE1-http_reply_max_size.patch) = 1114 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-cachemgr_non_get.patch) = a6c03334ec67846a0e5287c1b0109583db47e594
+Size (squid-2.5.1/squid-2.5.STABLE1-cachemgr_non_get.patch) = 608 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-authsheme_realloc.patch) = cd99d9aba788c2f4871c1f0bc7913e7400424b9b
+Size (squid-2.5.1/squid-2.5.STABLE1-authsheme_realloc.patch) = 667 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-ftp_abort.patch) = 2c216c3e11474d3efe3b37cbbf12b90f249b5f5a
+Size (squid-2.5.1/squid-2.5.STABLE1-ftp_abort.patch) = 1702 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-helper_stats.patch) = 684c47169cb6caa7c5d7570d5b0677ed309c631a
+Size (squid-2.5.1/squid-2.5.STABLE1-helper_stats.patch) = 3325 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-delay_pools_docs.patch) = c04eb28f29c616c5192679070632207897631129
+Size (squid-2.5.1/squid-2.5.STABLE1-delay_pools_docs.patch) = 753 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-auth_connection.patch) = 40208be6825efafcb04389e0f3fe62f3af5aa6ac
+Size (squid-2.5.1/squid-2.5.STABLE1-auth_connection.patch) = 8297 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-authenticate_program_docs.patch) = adf7bd0643859181eec2bc403052787ad91b77a4
+Size (squid-2.5.1/squid-2.5.STABLE1-authenticate_program_docs.patch) = 1672 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 4f9e3026d56628a62c8c3a3e4e7e23898432c7e2
+Size (squid-2.5.1/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 1893 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-shutdown_assert.patch) = 347154d7f3815eb3a75926aa824778a4db1999cc
+Size (squid-2.5.1/squid-2.5.STABLE1-shutdown_assert.patch) = 1107 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-cachemgr_passwd.patch) = 8bd9a7899babdb33b4391b8d686d12a18abc46ec
+Size (squid-2.5.1/squid-2.5.STABLE1-cachemgr_passwd.patch) = 1271 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = a6c766cdaacb5f84a381864e2f8d1f94534d4494
+Size (squid-2.5.1/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 327 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-openssl097.patch) = 0842b16b3cc7dbbdf862068a6a7b513ffb4d878d
+Size (squid-2.5.1/squid-2.5.STABLE1-openssl097.patch) = 4248 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-HEAD_bad_headers.patch) = d167a534244150f4d0750f394f93cbe37a5a5219
+Size (squid-2.5.1/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 577 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-time_acl_list.patch) = 03da4d3195968f00305a55e5261ab6df1bdac7f0
+Size (squid-2.5.1/squid-2.5.STABLE1-time_acl_list.patch) = 855 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-CONNECT_pipeline.patch) = 8d1472cb82a12e44a22ab3baae72a901951dda37
+Size (squid-2.5.1/squid-2.5.STABLE1-CONNECT_pipeline.patch) = 1873 bytes
+SHA1 (squid-2.5.1/squid-2.5.STABLE1-winbind.patch) = 949990209a4db546e3b0be698c68202a5e923a39
+Size (squid-2.5.1/squid-2.5.STABLE1-winbind.patch) = 70619 bytes
 SHA1 (patch-aa) = e29686a5c75635129b7e2eaf451140f10f29e081
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
-SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd
+SHA1 (patch-ac) = 57447b3b2455214c94a86e917a947d779dff1f6d
 SHA1 (patch-ad) = 23a906011ffef78d070cc49c94c4f4837eb319ec
 SHA1 (patch-ae) = 33888cf772b3fb3b7c4352cc29551a2dadfb12fa
 SHA1 (patch-ag) = 7a0aa328d18374a4a954f66ac1431779a303f395
-SHA1 (patch-ah) = c80f9d8ce5fae7f399583607aa7f7153824465b7
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 19861281d8a9ece352ce9e881e1e60f6787933e3
 SHA1 (patch-al) = 534f273ec63f6de0818f1f86a2b655eac4564213
@@ -65,3 +142,4 @@ SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
 SHA1 (patch-ca) = 652e35b253a6b75a3ac452773d681e70c5fc310d
 SHA1 (patch-cb) = 7fb49ee4f9e21dea9ca6e54da9a581866b225853
 SHA1 (patch-cc) = 9d9cf0b66768b3942c1683a7a908bfb0aa2fe0f2
+SHA1 (patch-cd) = 40eb5429ee7f6714037026b6b04d4ac56758fcac
diff --git a/www/squid/patches/patch-ac b/www/squid/patches/patch-ac
index c69339a5d72..e283068cc23 100644
--- a/www/squid/patches/patch-ac
+++ b/www/squid/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.4 1999/05/02 12:49:43 tron Exp $
+$NetBSD: patch-ac,v 1.5 2003/02/16 06:43:41 taca Exp $
 
---- scripts/RunCache.in.orig	Fri Jan 29 19:19:46 1999
-+++ scripts/RunCache.in	Sun May  2 14:36:10 1999
-@@ -5,7 +5,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- logdir=@localstatedir@
--PATH=@bindir@:/bin:/usr/bin
-+PATH=@sbindir@:/bin:/usr/bin
- export PATH
- 
- conf=""
-@@ -16,10 +16,10 @@
+--- scripts/RunCache.in.orig	2003-02-16 14:56:30.000000000 +0900
++++ scripts/RunCache.in	2003-02-16 14:56:31.000000000 +0900
+@@ -16,10 +16,10 @@ fi
  
  failcount=0
  while : ; do