Update adzap to version 20011120.

Changes include support for https ads and yet more add patterns.

4 files changed, 22 insertions, 18 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 259a28e1048..46debfe6dc5 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2001/09/30 01:26:54 simonb Exp $
+# $NetBSD: Makefile,v 1.17 2001/11/23 02:18:21 simonb Exp $
 #
 
-DISTNAME=	adzap-20010921
+DISTNAME=	adzap-20011120
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 67bde8856dc..87b713ba3c9 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/09/30 01:26:54 simonb Exp $
+$NetBSD: distinfo,v 1.6 2001/11/23 02:18:21 simonb Exp $
 
-SHA1 (adzap-20010921.tar.gz) = 70215d2e0d4aaa0e6a6e84802a1c6dc9a0bf124a
-Size (adzap-20010921.tar.gz) = 25201 bytes
-SHA1 (patch-aa) = 1982dfbbc48be2e3783457c90ea9df26b591b87e
-SHA1 (patch-ab) = 2b41dcacbba7a6e6a15455a56dd41c97faead1d0
+SHA1 (adzap-20011120.tar.gz) = e431f3681eff385f37f74dafb933511f669478ea
+Size (adzap-20011120.tar.gz) = 26402 bytes
+SHA1 (patch-aa) = 6da380b284d6498a8eef90d783451ed740f55114
+SHA1 (patch-ab) = 63cb93a6dec9ffbd7d090390cc934c1efd53b686
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index e8543537093..b55d7c0e23c 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/07/07 07:48:15 simonb Exp $
+$NetBSD: patch-aa,v 1.6 2001/11/23 02:18:22 simonb Exp $
 
---- wrapzap.orig	Sat Jun 23 11:39:22 2001
-+++ wrapzap	Fri Jul  6 23:33:13 2001
-@@ -16,27 +16,9 @@
+--- wrapzap.orig	Fri Nov 23 12:30:44 2001
++++ wrapzap	Fri Nov 23 12:34:21 2001
+@@ -16,29 +16,9 @@
  #
  
  # modify this to match your install
@@ -10,6 +10,7 @@ $NetBSD: patch-aa,v 1.5 2001/07/07 07:48:15 simonb Exp $
 -
 -ZAP_MODE=				# or "CLEAR"
 -ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
+-ZAP_BASE_SSL=https://adzap.cs.zip.com.au # this can probably be ignored
 -ZAP_PREMATCH=				# pathname of extra pattern file
 -					# for patterns to preempt the stock
 -					# zapper
@@ -18,6 +19,7 @@ $NetBSD: patch-aa,v 1.5 2001/07/07 07:48:15 simonb Exp $
 -					# stock zapper; this is the one to
 -					# which you should add new ads
 -STUBURL_AD=$ZAP_BASE/ad.gif
+-STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 -STUBURL_ADBG=$ZAP_BASE/adbg.gif
 -STUBURL_ADJS=$ZAP_BASE/no-op.js
 -STUBURL_ADHTML=$ZAP_BASE/no-op.html
@@ -28,8 +30,8 @@ $NetBSD: patch-aa,v 1.5 2001/07/07 07:48:15 simonb Exp $
 -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 -STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
 +zapper=@@PREFIX@@/libexec/squid_redirect
-+  
++   
 +. /etc/adzap.conf
  
- export ZAP_MODE ZAP_BASE ZAP_PREMATCH ZAP_POSTMATCH
- export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
+ export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH
+ export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index 8b950c11323..915cb207b55 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,14 +1,15 @@
-$NetBSD: patch-ab,v 1.4 2001/07/07 07:48:15 simonb Exp $
+$NetBSD: patch-ab,v 1.5 2001/11/23 02:18:22 simonb Exp $
 
---- /dev/null	Fri Jul  6 23:30:38 2001
-+++ adzap.conf	Fri Jul  6 23:32:42 2001
-@@ -0,0 +1,23 @@
+--- adzap.conf.orig	Fri Nov 23 12:31:35 2001
++++ adzap.conf	Fri Nov 23 12:32:56 2001
+@@ -0,0 +1,25 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
 +
 +ZAP_MODE=				# or "CLEAR"
 +ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
++ZAP_BASE_SSL=https://adzap.cs.zip.com.au # this can probably be ignored
 +ZAP_PREMATCH=				# pathname of extra pattern file
 +					# for patterns to preempt the stock
 +					# zapper
@@ -17,6 +18,7 @@ $NetBSD: patch-ab,v 1.4 2001/07/07 07:48:15 simonb Exp $
 +					# stock zapper; this is the one to
 +					# which you should add new ads
 +STUBURL_AD=$ZAP_BASE/ad.gif
++STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 +STUBURL_ADBG=$ZAP_BASE/adbg.gif
 +STUBURL_ADJS=$ZAP_BASE/no-op.js
 +STUBURL_ADHTML=$ZAP_BASE/no-op.html