Update to adzap-20031018; change summary: more patterns.

Changes since adzap-20030811:

     * 2003-10-18

     cameron:
       scripts/squid_redirect: Turn off the 302: redirection mode. It crashed Andre Kajita's squid farm:-(
                               More research needed.

     * 2003-10-13

     cameron:
       rc/patterns: greenpeace.org PRINT rule
                    www.sundayherald.com PRINT rule

     * 2003-10-06

     cameron:
       scripts/squid_redirect: Add NOZAP class for the NOZAP rule.
       rc/patterns: more generous miami.com PRINT rule
                    http://noads/ prefix bypass rule
                    rename NOADS to NOZAP and move the Nimda defense towards the bottom of the pattern space
                    adjust NOZAP prefix from http://noads/ to http://nozap/
                    turn NOZAP into a suffix
                    make NOZAP suffix a ? instead of a /
                    doh! push NOZAP to the front
                    .sears.com exception from Neal Macklin

     * 2003-10-05

     cameron:
       rc/patterns: sltrib.com PRINT rule

     * 2003-10-04

     cameron:
       rc/patterns: newsforge.com PRINT rule
                    allafrica.com PRINT rule

     * 2003-10-01

     cameron:
       rc/patterns: broaden news.com.com PRINT rule

     * 2003-09-30

     cameron:
       rc/patterns: wfmynews2.com PRINT rule
                    generalise .boston.com PRINT rule

     * 2003-09-29

     cameron:
       rc/patterns: oreillynet.com PRINT rule

     * 2003-09-22

     cameron:
       rc/patterns: .hitbox.com web bugs
                    siliconvalley.com PRINT rule
                    tweak zdnet.com.com PRINT rule
                    another canoe.ca ad pattern

     * 2003-09-15

     cameron:
       rc/patterns: exception for www.supergo.com from Kath Knight
                    widen www.supergo.com exception

     * 2003-09-14

     cameron:
       rc/patterns: exception for ibm.com/common/stats/stats.js
                    ads.i2as.ulimit.com popup
                    geocities ad prefix
                    another geocities ad js

     * 2003-09-12

     cameron:
       rc/patterns: .targetnet.com popup

     * 2003-09-05

     cameron:
       rc/patterns: another barnesandnoble.com popup

     * 2003-09-04

     cameron:
       rc/patterns: turn osnews.com PRINT back on
                    disable osnews.com again

     * 2003-09-03

     cameron:
       rc/patterns: wider news.com.com PRINT rule
                    tweak nytimes.com PRINT rule
                    disable nytimes.com - referred based?
                    informationweek.com PRINT rule

     * 2003-09-01

     cameron:
       rc/patterns: exception for salon click-thru ad access reported by Neal Macklin
                    cache.ultramercial.com exception as part of salon.com fix
                    more ultramercial exception
                    further cache.ultramercial.com exception for cache.ultramercial.com salon clikcthru stuff

     * 2003-08-31

     cameron:
       rc/patterns: technologyreview.com PRINT rule
                    widen technologyreview.com PRINT rule

     * 2003-08-30

     cameron:
       rc/patterns: techcentralstation.com PRINT rule

     * 2003-08-28

     cameron:
       rc/patterns: exception for http://psi.affinix.com/forums/html/emoticons/blink.gif from Lance Conry

     * 2003-08-27

     cameron:
       rc/patterns: another zdnet.com.com PRINT rule
                    another sfgate.com PRINT rule

     * 2003-08-26

     cameron:
       rc/patterns: dfw.com PRINT rule
                    orlando.bizjournals.com PRINT rule
                    nightscapecreations.com popups

     * 2003-08-25

     cameron:
       rc/patterns: broaden .boston.com PRINT rule
                    tweak broader boston.com PRINT rule

     * 2003-08-22

     cameron:
       rc/patterns: straitstimes.asia1.com.sg PRINT rule
                    another theglobeandmail.com PRINT rule
                    widen .adbureau.net ADJS pattern
                    newmediazero.com PRINT rule

     * 2003-08-21

     cameron:
       rc/patterns: local6.com PRINT rule
                    improve local6.com PRINT rule
                    upi.com PRINT rule
                    bizreport.com PRINT rule
                    fix bizreport rule
                    another nytimes.com PRINT rule
                    xml.com PRINT rule
                    widen news.independent.co.uk PRINT rule - may break
                    another ad

     * 2003-08-20

     cameron:
       rc/patterns: newsfactor.com PRINT rule
                    ad.openfind.com.tw AD
                    fpeng.peopledaily.com.cn PRINT rule
                    europemedia.net PRINT rule
                    voanews.com PRINT rule
                    washingtonpost.com PRINT rule
                    cbronline.com PRINT rule

     * 2003-08-19

     cameron:
       rc/patterns: admech ad
                    .googlesyndication.com javascript
                    .googlesyndication.com ADHTML
                    focusin.ads.targetnet.com IFRAME
                    differentiate focusin.ads.targetnet.com HTML from IMGs
                    newsmax.com PRINT rule
                    docguide.com PRINT rule
                    popularmechanics.com PRINT rule
                    enterpriseitplanet.com PRINT rule
                    nzherald.co.nz PRINT rule
                    rockymountainnews.com PRINT rule

     * 2003-08-18

     cameron:
       rc/patterns: ads.specificclick.com HTML
                    eweek.com/dropdown images
                    another .zdnet.com PRINT rule

     * 2003-08-16

     cameron:
       rc/patterns: .realtracker.com/netpoll javascript
                    .realtracker.com ADHTML
                    another counter
                    another securityfocus.com PRINT rule
       index.html: Add description of the everyupdate list to the updates webpage section.

     * 2003-08-15

     cameron:
       rc/patterns: af.mil PRINT rule
                    aftenposten.no PRINT rule

     * 2003-08-14

     cameron:
       rc/patterns: worldnetdaily.com PRINT rule
                    wasabisystems.com exception from Simon Burge
                    news.independent.co.uk PRINT rule
                    typo in news.independent.co.uk rule
                    ads.zedo.com/ads2 AD pattern
                    .zedo.com web bug behind AD
                    ADHTML web bug from ads.specificpop.com
                    .googlesyndication.com web bug
                    javascript ad code from .zedo.com
                    business.boston.com PRINT rule
                    vnunet.com PRINT rule
                    dailytimes.com.pk PRINT rule

     * 2003-08-13

     cameron:
       rc/patterns: blink.gif exception for dpreview.com from Simon Burge
                    edinburghnews.com PRINT rule
                    eet.com PRINT rule

     * 2003-08-12

     cameron:
       rc/patterns: tweak rss.com.com PRINT rule
                    zdnet.com.com PRINT rule
                    scotlandonsunday.com PRINT rule
                    chron.com PRINT rule
                    enn.com PRINT rule
                    gulfnews.com PRINT rule
                    nj.com/newsflash PRINT rule


Approved by: agc

3 files changed, 7 insertions, 8 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index b6ec08fe4d8..a5aa4ba4518 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2003/08/13 03:05:48 simonb Exp $
+# $NetBSD: Makefile,v 1.40 2003/10/18 23:23:41 kleink Exp $
 #
 
-DISTNAME=	adzap-20030811
+DISTNAME=	adzap-20031018
 WRKSRC=		${WRKDIR}/adzap
 CATEGORIES=	www perl5
 # XXX: should use the following one day:
@@ -35,7 +35,7 @@ do-install:
     no-op.html no-op.js webbug-clear.gif webbug-clear.js webbug.gif webbug.js
 	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
-.for FILE in proxy-cisra.pac proxy-home.pac proxy-zip.pac
+.for FILE in proxy-home.pac proxy-zip.pac
 	${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/scripts/adzap.conf \
diff --git a/www/adzap/PLIST b/www/adzap/PLIST
index 85cfac21a62..e97a62aaf14 100644
--- a/www/adzap/PLIST
+++ b/www/adzap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/22 12:52:35 simonb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/10/18 23:23:41 kleink Exp $
 libexec/adzap
 libexec/squid_redirect
 share/examples/adzap/ad-clear.gif
@@ -24,7 +24,6 @@ share/examples/adzap/no-op-counter.html
 share/examples/adzap/no-op-counter.js
 share/examples/adzap/no-op.html
 share/examples/adzap/no-op.js
-share/examples/adzap/proxy-cisra.pac
 share/examples/adzap/proxy-home.pac
 share/examples/adzap/proxy-zip.pac
 share/examples/adzap/webbug-clear.gif
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 6833bdaaa33..8a562c5abd8 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2003/08/13 03:05:49 simonb Exp $
+$NetBSD: distinfo,v 1.26 2003/10/18 23:23:41 kleink Exp $
 
-SHA1 (adzap-20030811.tar.gz) = 09875df4b349a7e5dc127e966e85c304bc52850e
-Size (adzap-20030811.tar.gz) = 35551 bytes
+SHA1 (adzap-20031018.tar.gz) = 16f35ec1b7db247ffec65a8095cd8fc3ec47c5f3
+Size (adzap-20031018.tar.gz) = 37227 bytes
 SHA1 (patch-aa) = 2b83211b9eee28f508bc6ac40575a46c8bbbcc56
 SHA1 (patch-ab) = 7aa67928e6a49bee814a75eac52c58e4ab5eb8eb