Update "squid" package to 2.4.STABLE2. Changes since 2.4.STABLE1:

- Expanded configure's GCC opimization disabling check to
  include GCC 2.95.3
- avoid negative served_date in storeTimestampsSet().
- Made 'diskd' pathnames more configurable
- Make sure squid parent dies if child is killed with
  KILL signal
- Changed diskd offset args to off_t instead of int
- Fixed bugs #102, #101, #205: various problems with useragent
  log files
- Fixed bug #116: Large Age: values still cause problems
- Fixed bug #119: Floating point exception in
  storeDirUpdateSwapSize()
- Fixed bug #114: usernames not logged with
  authenticate_ip_ttl_is_strict
- Fixed bug #115: squid eating up ressources (eventAdd args)
- Fixed bug #125: garbage HTCP requests cause assertion
- Fixed bug #134: 'virtual port' support ignores
  httpd_accel_port, causes a loop in httpd_accel mode
- Fixed bug #135: assertion failed: logfile.c:135: "lf->offset
  <= lf->bufsz"
- Fixed bug #137: Ranges on misses are over-done
- Fixed bug #160: referer_log doesn't seem to work
- Fixed bug #162: some memory leaks (SNMP, delay_pools,
  comm_dns_incoming histogram)
- Fixed bug #165: "Store Mem Buffer" leaks badly
- Fixed bug #172: Ident Based ACLs fail when applied to
  cache_peer_access
- Fixed bug #177: LinuxPPC 2000 segfault bug due to varargs abuse
- Fixed bug #182: 'config' cachemgr option dumps core with
  null storage
- Fixed bug #185: storeDiskdDirParseQ[12]() use wrong number
  of args in debug/printf
- Fixed bug #187: bugs in lib/base64.c
- Fixed bug #184: storeDiskdShmGet() assertion; changed
  diskd to use bitmap instead of linked list
- Fixed bug #194: Compilation fails on index() on some
  non-BSD plaforms
- Fixed bug #197: refreshIsCachable() incorrectly checks
  entry->mem_obj->reply
- Fixed bug #215: NULL pointer access for proxy requests
  in accel-only mode

2 files changed, 6 insertions, 26 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index ab570ae11d4..1710c184006 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,20 +1,12 @@
-# $NetBSD: Makefile,v 1.51 2001/09/18 16:24:57 tron Exp $
+# $NetBSD: Makefile,v 1.52 2001/10/09 19:01:49 tron Exp $
 
-DISTNAME=	squid-2.4.STABLE1-src
-PKGNAME=	squid-2.4.1nb2
+DISTNAME=	squid-2.4.STABLE2-src
+PKGNAME=	squid-2.4.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.4/ \
 		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/
 
-PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.4/bugs/
-PATCHFILES=	squid-2.4.stable1-diskd_fixed_path.patch \
-		squid-2.4.stable1-force_valid_blksize.patch \
-		squid-2.4.stable1-high_cpu_with_peers.patch \
-		squid-2.4.stable1-htcp_assertion_fix.patch \
-		squid-2.4.stable1-kill_parent_on_child_sigkill.patch \
-		squid-2.4.stable1-wrong_sign_on_timestamp_check.patch
-
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
diff --git a/www/squid/distinfo b/www/squid/distinfo
index eed19c0fb4a..76c26958697 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/07/29 16:41:18 tron Exp $
+$NetBSD: distinfo,v 1.5 2001/10/09 19:01:50 tron Exp $
 
-SHA1 (squid-2.4.STABLE1-src.tar.gz) = 584eb15080f52ef406e3f66511dba406ec1a40c5
-Size (squid-2.4.STABLE1-src.tar.gz) = 1071386 bytes
-SHA1 (squid-2.4.stable1-diskd_fixed_path.patch) = 1ec289b37d0640a8d16e691659acc3776632b321
-Size (squid-2.4.stable1-diskd_fixed_path.patch) = 3321 bytes
-SHA1 (squid-2.4.stable1-force_valid_blksize.patch) = 1282c7cb5b7e367f04867b9658e002dd51f00313
-Size (squid-2.4.stable1-force_valid_blksize.patch) = 975 bytes
-SHA1 (squid-2.4.stable1-high_cpu_with_peers.patch) = 759f713faad31d13a3492ae814b2cdcba0f5fbe4
-Size (squid-2.4.stable1-high_cpu_with_peers.patch) = 710 bytes
-SHA1 (squid-2.4.stable1-htcp_assertion_fix.patch) = afdbe390453cc65b375c6616be583ee84299260b
-Size (squid-2.4.stable1-htcp_assertion_fix.patch) = 1314 bytes
-SHA1 (squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = c94ba4c220d31ea1612e5b1a84970de2c058f7a9
-Size (squid-2.4.stable1-kill_parent_on_child_sigkill.patch) = 666 bytes
-SHA1 (squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = cde4530d0c9cd184b0d4c6774e4c20f81ab7179f
-Size (squid-2.4.stable1-wrong_sign_on_timestamp_check.patch) = 936 bytes
+SHA1 (squid-2.4.STABLE2-src.tar.gz) = 798723943ef09e52539919f10b5d17a361fcfc11
+Size (squid-2.4.STABLE2-src.tar.gz) = 1075738 bytes
 SHA1 (patch-aa) = 89c0668d6380971734b373d38921525daeac61d5
 SHA1 (patch-ab) = afb0c443c708d03fc7ab39120ae9a3c68d9e9b88
 SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd