Pullup ticket 498 - requested by Takahiro Kambe

security fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile	1.150
- pkgsrc/www/squid/distinfo	1.97

   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu May 12 16:09:48 UTC 2005

   Modified Files:
   	pkgsrc/www/squid: Makefile distinfo

   Log Message:
   Update squid package to 2.5.9nb11.

   Apply 9 official fixes including security improvement in DNS lookup.

   I still disable transparent_port.patch because it needs a missing header
   file of IP Filter.  NetBSD current and 3.0_BETA already fixed this problem
   but still netbsd-2/2-0 branches.  I will apply it after netbsd-2/2-0
   branches fix this problem.  (And this fix needs to update squid package
   to 2.5.STABLE10 which is RC3 now.)

   * 2005-05-10 23:11 (Cosmetic)
	Extended documentation of the always_direct directive

   * 2005-05-10 22:33 (Medium)
	assertion failed: store_client.c:343:
	"storeSwapOutObjectBytesOnDisk(mem) > sc->copy_offset"

   * 2005-05-11 19:19 (Security issue)
	DNS lookups unreliable on untrusted networks

   * 2005-05-09 01:51 (Minor)
	Allow dstdomain and dstdom_regex to match IP based hosts

   * 2005-05-08 14:01 (Cosmetic)
	Minor arp ACL improvements

   * 2005-05-04 18:09 (Minor)
	SNMP Agent updates to support SNMP Version 2 and bulk requests

   * 2005-05-01 10:58 (Cosmetic) Cosmetic change to DISKD statistics

   * 2005-04-30 12:58 (Medium)
   	Poor hot object cache hit ratio and sporadic assertion
   	failed: store_swapin.c: e->mem_status == NOT_IN_MEMORY

   * 2005-04-25 16:36 (Cosmetic)
	Minor aufs improvements

2 files changed, 43 insertions, 4 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 29921e2dae6..f454d152f3d 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.139.2.8 2005/05/02 00:18:13 salo Exp $
+# $NetBSD: Makefile,v 1.139.2.9 2005/05/13 10:23:22 salo Exp $
 
 DISTNAME=	squid-2.5.STABLE9
 PKGNAME=	squid-2.5.9
-PKGREVISION=	10
+PKGREVISION=	11
 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/ \
@@ -42,7 +42,16 @@ PATCHFILES=	squid-2.5.STABLE9-setcookie.patch \
 		squid-2.5.STABLE9-forwardcc.patch \
 		squid-2.5.STABLE9-authinfo.patch \
 		squid-2.5.STABLE9-chroot_pidfile.patch \
-		squid-2.5.STABLE9-cachemgr_conf.patch
+		squid-2.5.STABLE9-cachemgr_conf.patch \
+		squid-2.5.STABLE9-aufs_improvement.patch \
+		squid-2.5.STABLE9_2GB-hot_cache.patch \
+		squid-2.5.STABLE9-diskd.patch \
+		squid-2.5.STABLE9-snmp.patch \
+		squid-2.5.STABLE9-arpacl.patch \
+		squid-2.5.STABLE9-dstdomain_ip.patch \
+		squid-2.5.STABLE9-dns_query-5.patch \
+		squid-2.5.STABLE9-2GB_assert.patch \
+		squid-2.5.STABLE9-always_direct_documentation.patch
 #		squid-2.5.STABLE9-transparent_port.patch
 PATCH_DIST_STRIP=       -p1
 
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 837beb0b207..3c49672f5ee 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.86.2.8 2005/05/02 00:18:13 salo Exp $
+$NetBSD: distinfo,v 1.86.2.9 2005/05/13 10:23:22 salo Exp $
 
 SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 9605e274f548bfc8dcb60a299b680df2846ee74b
 RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9.tar.bz2) = 98e49ff58ffc4664a46350f3d6c34be99b713716
@@ -84,6 +84,9 @@ Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-errpage_user.patch) = 822 bytes
 SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = 804f09685b4d86c507f7eb669da20caeb02e6f7b
 RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = efc38284ceed04743abf637ce3b1f59628d5df57
 Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-debug_newlines.patch) = 5049 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 2580792f9353f23a221d4dc6303dbc0919aaf10c
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 9d9db96ef48fdcd376a1507996e24ab81db92024
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-transparent_port.patch) = 8886 bytes
 SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = 326dc2668e02f1034627f944163f92f12c7dc978
 RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = a9088582f60430c5a5e1f47e2566ef42d473a4ce
 Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-squid_k_nohostname.patch) = 1590 bytes
@@ -102,6 +105,33 @@ Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-chroot_pidfile.patch) = 948 bytes
 SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_conf.patch) = 064cea05c1741347ecaa6cf3ad4d29156154ff3b
 RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_conf.patch) = d2f84c263dfd3c8a39fc09e7ee3bdb0db704416a
 Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-cachemgr_conf.patch) = 31572 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_improvement.patch) = 58e4ac976bd390248797f5508db29f6c0e86e8cc
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_improvement.patch) = 2245d12c997c6918ca86d692876723e549fe1748
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-aufs_improvement.patch) = 3188 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9_2GB-hot_cache.patch) = 13da4ee06d1a2442eb9ebe6637d6f6c7aea39916
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9_2GB-hot_cache.patch) = a9f557182c01c61ebba190cbb4b33b19ce44f88a
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9_2GB-hot_cache.patch) = 3016 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-diskd.patch) = e32fc4a8a1201b9768fad831fe6d044da86292ee
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-diskd.patch) = 0df0b068baca3bd3a0adbdbaab09db304751e2fd
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-diskd.patch) = 2659 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-snmp.patch) = f810f55a6b0de96592f0f5dddd052e8dd90061ff
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-snmp.patch) = fe5c5a49194fdce270e0b22b02cf27c734f572fc
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-snmp.patch) = 8013 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-arpacl.patch) = 005732a132e41d2e0c888246016f2ff1ac386640
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-arpacl.patch) = afe73f9fb3371bb03c5998536cff36e37979d063
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-arpacl.patch) = 3110 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dstdomain_ip.patch) = 8bdfbed49bf0caa9ba0b7380347d98634871bd4d
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dstdomain_ip.patch) = 277061a114dc0cc00c120d51c31dab38031d6371
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-dstdomain_ip.patch) = 2638 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dns_query-5.patch) = d17dfb25c8292b54bbb8403c32506c489464f9f8
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-dns_query-5.patch) = 7cac123a800e56db320e4052cf4d1ecee10fe65c
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-dns_query-5.patch) = 25779 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB_assert.patch) = 4cf77b14c9b75eb4a7a55b17f5528ab486765118
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB_assert.patch) = 9d879037daaed4c67d5364b327e70e5efdd96a69
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-2GB_assert.patch) = 686 bytes
+SHA1 (squid-2.5.9-2005042600/squid-2.5.STABLE9-always_direct_documentation.patch) = 0d289314bb97129011c85966c1690f94826e1087
+RMD160 (squid-2.5.9-2005042600/squid-2.5.STABLE9-always_direct_documentation.patch) = 3cd529ca4cc36eceb766f2f83faeadcbadac114c
+Size (squid-2.5.9-2005042600/squid-2.5.STABLE9-always_direct_documentation.patch) = 1610 bytes
 SHA1 (patch-aa) = 4d697ea43975e7c98bdf6ff5b18d82b944bdd6b2
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0