Update "squid" package to version 2.3 STABLE 3. Changes since 2.3 STABLE 2:

- You can now toggle the 'offline_mode' option from the cache manager.
- Added the 'minimum_object_size' option. Files smaller than this size are
  not cached.
- If your firewall doesn't allow passive FTP transfers, you can tell Squid
  to use PORT instead by turning the 'passive_ftp' option off.
- Some Cisco IOS versions expect to receive WCCP packets with version set
  to three. The 'wccp_version' option allows you to change it, from the
  default value of four.

5 files changed, 11 insertions, 97 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 1356828b0ad..4af1a5fde9f 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2000/05/03 15:14:53 rh Exp $
+# $NetBSD: Makefile,v 1.29 2000/05/19 07:18:55 tron Exp $
 
-DISTNAME=	squid-2.3.STABLE2-src
-PKGNAME=	squid-2.3s2
+DISTNAME=	squid-2.3.STABLE3-src
+PKGNAME=	squid-2.3s3
 CATEGORIES=	www
 MASTER_SITES=	\
 	http://www.squid-cache.org/Versions/v2/2.3/ \
@@ -9,16 +9,11 @@ MASTER_SITES=	\
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ \
-	ftp://ftp.xlink.net/pub/mirror.squid/squid-2/STABLE/
+	ftp://ftp.kpnqwest.de/pub/mirror.squid/squid-2/STABLE/
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
-PATCHFILES=	squid-2.3.stable2-EOF_in_cf.data.pre.patch \
-		squid-2.3.stable2-USE_DNSSERVER.patch \
-		squid-2.3.stable2-USE_DNSSERVER_part2.patch \
-		squid-2.3.stable2-getMyHostname.patch \
-		squid-2.3.stable2-hostname_whitespace.patch \
-		squid-2.3.stable2-netdb_exchange_loop.patch \
-		squid-2.3.stable2-redirected_username_logging.patch
+PATCHFILES=	squid-2.3.stable3-carp_compile.patch \
+		squid-2.3.stable3-storeExpiredReferenceAge.patch 
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index 4a76d7b362e..71d53bf5870 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,10 +1,5 @@
-$NetBSD: md5,v 1.11 2000/05/03 15:14:54 rh Exp $
+$NetBSD: md5,v 1.12 2000/05/19 07:18:55 tron Exp $
 
-MD5 (squid-2.3.STABLE2-src.tar.gz) = ba90c12907e5dd8a29bf824bde2f7755
-MD5 (squid-2.3.stable2-EOF_in_cf.data.pre.patch) = bade9d4d6dbed4520e0353669ee057b6
-MD5 (squid-2.3.stable2-USE_DNSSERVER.patch) = a586565ec1809f8afff72cd33f5e388d
-MD5 (squid-2.3.stable2-USE_DNSSERVER_part2.patch) = 65de93562970eaa5af25e88fc15c62f9
-MD5 (squid-2.3.stable2-getMyHostname.patch) = 3649a611c44418366d07d579bfb4c64d
-MD5 (squid-2.3.stable2-hostname_whitespace.patch) = 9ce477e56b4eed66ed97bf377792029e
-MD5 (squid-2.3.stable2-netdb_exchange_loop.patch) = 2d7f25ca0c723907c9265ea840739982
-MD5 (squid-2.3.stable2-redirected_username_logging.patch) = abafca200d09fc9badf81992af47e5ad
+MD5 (squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7
+MD5 (squid-2.3.stable3-carp_compile.patch) = 6bc79fd59484d7b4acc55d268a6e5081
+MD5 (squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788
diff --git a/www/squid/files/patch-sum b/www/squid/files/patch-sum
index 147ea169e61..d9afe6dad47 100644
--- a/www/squid/files/patch-sum
+++ b/www/squid/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/03/06 21:18:26 tron Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/19 07:18:55 tron Exp $
 
 MD5 (patch-aa) = 6befb071002fb7ced0fb9f388d039cd9
 MD5 (patch-ab) = 05ef29847c539ee53d056061ab21ebcf
@@ -9,5 +9,3 @@ MD5 (patch-af) = ec14792120b479d910a2a9f2f183564c
 MD5 (patch-ag) = faf26a08bbaf4998339e37ab9f9b305c
 MD5 (patch-ah) = 971f5268e79bd6a7b266baa3e5b87ca0
 MD5 (patch-ai) = f4e4dbed017331c46df688543c98fec8
-MD5 (patch-aj) = 0c42b8fd8d685c491e6529e3ffae5d87
-MD5 (patch-ak) = 15498599142502aa01366a8f7ffcc4f4
diff --git a/www/squid/patches/patch-aj b/www/squid/patches/patch-aj
deleted file mode 100644
index 35c5f973512..00000000000
--- a/www/squid/patches/patch-aj
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/03/06 21:18:27 tron Exp $
-
---- errors/Japanese/ERR_SHUTTING_DOWN.orig	Tue Jan 12 08:28:38 1999
-+++ errors/Japanese/ERR_SHUTTING_DOWN	Fri Mar  3 17:23:40 2000
-@@ -1,17 +1,18 @@
- <HTML><HEAD>
--<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=EUC-JP">
-+<TITLE>エラー: リクエストされた URL は取得できませんでした</TITLE>
- </HEAD><BODY>
- <H1>ERROR</H1>
--<H2>The requested URL could not be retrieved</H2>
-+<H2>リクエストされた URL は取得できませんでした</H2>
- <HR>
- <P>
--While trying to retrieve the URL:
-+以下の URL を取得した際に:
- <A HREF="%U">%U</A>
- <P>
--The following error was encountered:
-+次のエラーが発生しました:
- <UL>
- <P>
--This cache is in the process of shutting down and can not
--service your request at this time.  Please retry your
--request again soon.
-+このキャッシュは稼働停止の処理に入っていて、
-+現在あなたのリクエストへのサービスを提供できません。
-+後で再度リクエストしてください．
- </P>
diff --git a/www/squid/patches/patch-ak b/www/squid/patches/patch-ak
deleted file mode 100644
index 1d27d98309f..00000000000
--- a/www/squid/patches/patch-ak
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2000/03/06 21:18:27 tron Exp $
-
---- errors/Japanese/ERR_TOO_BIG.orig	Tue May 11 04:25:38 1999
-+++ errors/Japanese/ERR_TOO_BIG	Fri Mar  3 16:40:39 2000
-@@ -1,26 +1,27 @@
- <HTML><HEAD>
--<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=EUC-JP">
-+<TITLE>エラー: リクエストされた URL は取得できませんでした</TITLE>
- </HEAD><BODY>
- <H1>ERROR</H1>
--<H2>The requested URL could not be retrieved</H2>
-+<H2>リクエストされた URL は取得できませんでした</H2>
- <HR>
- <P>
--While trying to retrieve the URL:
-+以下の URL を取得した際に:
- <A HREF="%U">%U</A>
- <P>
--The following error was encountered:
-+次のエラーが発生しました:
- <UL>
- <LI>
- <STRONG>
--The request or reply is too large.
-+リクエストまたはリプライが大きすぎます。
- </STRONG>
- <P>
--If you are making a POST or PUT request, then your request body
--(the thing you are trying to upload) is too large.  If you are 
--making a GET request, then the reply body (what you are trying
--to download) is too large.   These limits have been established
--by the Internet Service Provider who operates this cache.  Please
--contact them directly if you feel this is an error.
-+POSTかPUTのリクエストをしていたなら、あなたのリクエストの本体
-+(あなたがアップロードを試みようとしていたもの)が大きすぎます。
-+GETのリクエストをしていたなら、リプライの本体(ダウンロードしよう
-+としていたもの)が大きすぎます。これらの制限は、このキャッシュの
-+運用者によって課されています。
-+これがエラーだと感じるときは直接運用者に連絡して下さい。
- </UL>
- <P>
--Your cache administrator is <A HREF="mailto:%w">%w</A>.
-+キャッシュの管理者は<A HREF="mailto:%w">%w</A>です。