Update to version 20051024:

 - Add more ad patterns.
 - Add WEBBUGHTML zap class.

Note: adds the new STUBURL_WEBBUGHTML variable; users should update to
the latest adzap.conf as shown in the install message.

4 files changed, 17 insertions, 15 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index a0bb591914e..3abf7276837 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2005/10/12 08:48:26 kleink Exp $
+# $NetBSD: Makefile,v 1.55 2005/11/18 01:06:27 simonb Exp $
 #
 
-DISTNAME=	adzap-20051006
+DISTNAME=	adzap-20051024
 CATEGORIES=	www perl5
 # XXX: should use the following one day:
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adzapper/}
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 9b5cc084f82..83a0ff7d16d 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2005/10/12 08:48:26 kleink Exp $
+$NetBSD: distinfo,v 1.37 2005/11/18 01:06:27 simonb Exp $
 
-SHA1 (adzap-20051006.tar.gz) = 081773a00c4f9facdc76fb022868b6c4dcc30d1b
-RMD160 (adzap-20051006.tar.gz) = 5544943d846a517d0b04880e6510bc7726674168
-Size (adzap-20051006.tar.gz) = 51470 bytes
-SHA1 (patch-aa) = 6bdb5e8d2487a977907d20e0e40afbc900cad919
-SHA1 (patch-ab) = b98776ed6627e743b50cb233f5af0842a92cd6b7
+SHA1 (adzap-20051024.tar.gz) = f1bbe79867c11afb957cbcc76e9d26634bc8334f
+RMD160 (adzap-20051024.tar.gz) = 50ce7421c183497e8b9b7afe68316c403b8b7674
+Size (adzap-20051024.tar.gz) = 51811 bytes
+SHA1 (patch-aa) = 4e529b73962112d48e2a28f33257a83845ca5180
+SHA1 (patch-ab) = 3e4cbc4ce1227f892981ef027e7ee3b83ceb3b83
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 455fb0bfc8e..05a44ab2b56 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2005/05/04 12:35:54 simonb Exp $
+$NetBSD: patch-aa,v 1.14 2005/11/18 01:06:27 simonb Exp $
 
---- scripts/wrapzap.orig	2005-04-07 21:41:33.000000000 +1000
+--- scripts/wrapzap.orig	Fri Nov 18 11:53:35 2005
 +++ scripts/wrapzap
-@@ -15,40 +15,9 @@
+@@ -15,41 +15,9 @@
  #	- Cameron Simpson <cs@zip.com.au> 21apr2000
  #
  
@@ -38,6 +38,7 @@ $NetBSD: patch-aa,v 1.13 2005/05/04 12:35:54 simonb Exp $
 -STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 -STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
+-STUBURL_WEBBUGHTML=$ZAP_BASE/webbug.html
 -
 -STUBURL_PRINT=				# off by default, set to 1
 +zapper=@@PREFIX@@/libexec/squid_redirect
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index 8cfea1c75ab..05028b5e2e3 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2005/05/04 12:35:54 simonb Exp $
+$NetBSD: patch-ab,v 1.12 2005/11/18 01:06:27 simonb Exp $
 
---- scripts/adzap.conf.orig	Sat Apr  7 21:41:33 2005
-+++ scripts/adzap.conf	Sat Apr  7 21:41:33 2005
-@@ -0,0 +1,35 @@
+--- scripts/adzap.conf.orig	Fri Nov 18 11:53:35 2005
++++ scripts/adzap.conf	Fri Nov 18 11:53:35 2005
+@@ -0,0 +1,36 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
@@ -36,5 +36,6 @@ $NetBSD: patch-ab,v 1.11 2005/05/04 12:35:54 simonb Exp $
 +STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 +STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 +STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
++STUBURL_WEBBUGHTML=$ZAP_BASE/webbug.html
 +
 +STUBURL_PRINT=				# off by default, set to 1