new zaps, and zap G Analytics better

2 files changed, 31 insertions, 6 deletions

diff --git a/adzap/scripts/postmatch.list b/adzap/scripts/postmatch.list
index 0fbc304..618ab01 100755
--- a/adzap/scripts/postmatch.list
+++ b/adzap/scripts/postmatch.list
@@ -1,6 +1,8 @@
 AD http://*.adnet.ru/**
 URCHIN http://www.google-analytics.com/urchin.js
 URCHIN https://www.google-analytics.com/urchin.js
+WEBBUG http://www.google-analytics.com/**
+WEBBUG https://www.google-analytics.com/**
 AD http://(|*.)directivepub.com/**
 AD http://(|*.)chat-land.org/**gif
 AD http://(|*.)advertstream.com/**
@@ -17,3 +19,5 @@ AD http://*.redoute.*/**
 AD http://**.valuecommerce.com/**
 ADHTML http://*.10clicks.com/**
 AD http://(|*.)brazzers.com/ads/**
+AD http://(|*.)you*.com/ads/**
+AD http://**.doubleclick.net/**
diff --git a/adzap/scripts/squid_redirect b/adzap/scripts/squid_redirect
index f15b381..4eb26b4 100644
--- a/adzap/scripts/squid_redirect
+++ b/adzap/scripts/squid_redirect
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Freshmeat release: 20090301
+# Release: 20090301 -> Mon Aug 24 15:19:57 EST 2009 (exception for regiftable.com, report from Neal Macklin)
 #
 # See the home page at:
 #	http://adzapper.sourceforge.net/
@@ -1112,9 +1112,9 @@ sub proxy_munge($$)
 
 __DATA__
 ##
-## Last updated Sun Mar  1 15:41:59 EST 2009.
+## Last updated Mon Aug 24 15:19:57 EST 2009 (exception for regiftable.com, report from Neal Macklin).
 ##
-# comment
+#list commen
 NOZAP (*://**)?NOZAP $1
 PRINT http://((www*.|)washingtonpost.com)/wp-dyn/articles/(A[0-9]*).html http://$1/ac2/wp-dyn/$3?language=printer
 PRINT http://((www*.|)news.utoronto.ca)/bin6/(*).asp http://$1/bin6/print/$3.htm
@@ -1512,9 +1512,10 @@ ADPOPUP http://ads*.revenue.net/**pop.html**
 ADPOPUP http://*.smartadserver.com/*/show*.asp?**
 ADJS http://a.kerg.net/delivery/fa.php?**
 ADJS http://*.liberation.fr/inc/smartad.js
+ADSWF http://ads*/www/delivery/ajs.php?**
 ADJS http://*.smarttargetting.com/**smartad.jsp?**
 ADSWF http://*.smartadserver.com/**.swf**
-ADSWF http://adserv.legitreviews.com/www/delivery/ai.php?**
+ADSWF http://ads*/www/delivery/ai.php?**
 ADSWF http://ads*.quarterserver.de/kelkoo/*.swf**
 ADSWF http://aa.voice2page.com/**.swf**
 ADSWF http://(www*.|)scoop.co.nz/adserver/creative/**.swf**
@@ -1525,16 +1526,21 @@ ADSWF http://ad2.ip.ro/logos/*.swf?**
 ADSWF http://194.145.249.110/images/logoAnim*.swf
 ADSWF http://img-catgeo.paginegialle.it/clienti/**/A/*.swf**
 ADSWF http://*.tiser.com.au/images/**.swf**
+ADSWF http://*.specificclick.net/**swf
 ADJS http://*.tiser.com.au/jserver/**
 ADJS http://ds1.harmony-central.com/jserver/**
 ADJS http://ad-uk.tiscali.com/jserver/**
+ADJS http://afe.specificclick.net/AFECache
+ADJS http://afe.specificclick.net/?**&t=j**
 AD http://*.tiscali.co.uk/**/images/*-logo-*.(gif|jpg)
 AD http://*.tiser.com.au/nserver/**
 AD http://*.tiser.com.au/images/**
 AD http://*/[Aa]d[Ss]erver/creative/**
+AD http://*.specificmedia.com/**.jpg
 ADHTML http://ad2.ip.ro/please/code?**
 ADHTML http://ads.specificpop.com/code?**
 ADHTML http://ads.specificclick.com/code?**
+ADHTML http://afe.specificclick.net/?**&t=h**
 ADHTML http://www.imdb.com/google/box?**
 ADHTML http://**/RealMedia/ads/adstream_sx.ads/**
 ADHTML http://ad.aboutwebservices.com/cgi-bin/ad/**
@@ -1906,6 +1912,7 @@ AD http://(www*.|)whatisthematrix.com/234x60_v5.gif
 AD http://images.resellerratings.com/images/prices/*.(gif|jpg)
 ADHTML http://(www*.|)resellerratings.com/price-direct-theinquirer.pl
 ADHTML http://www.gizmag.com/ads/**.htm
+ADHTML http://www.gizmag.com/ads.php**
 ADPOPUP http://**ads/**popups/**.html
 ADPOPUP http://**popups/**promo**.html
 ADPOPUP http://32.96.232.10/teleweb/autopop/pop.asp?**
@@ -2127,6 +2134,7 @@ PASS http://*.ergophizmiz.com/**
 PASS http://*.mini-itx.com/**
 PASS http://www.saunalahti.fi/~ojn/photos/popup.html?**
 PASS http://(*.|)pbs.org/includes/tvschedules/**popup.htm**
+PASS http://(*.|)regiftable.com/regiftingrobinpopup.html
 ADPOPUP **popup.htm**
 ADPOPUP http://ad.iwin.com/tmpad/**.htm
 ADPOPUP http://ad.iwin.com/tmpad/content/netflix/rollover.html
@@ -2159,6 +2167,12 @@ ADPOPUP http://(www*.|)bt-chat.com/overlib.js
 COUNTER http://**/werbung/ziAdCount?**
 PASS http://(www*.|)kodi.de/werbung/**
 # ad: de:werbung,anzeige da:reklame no:annonser es:reklaam
+ADJS http://(anzeige|werbung|WERBUNG|annonser|reklame|reklaam).*/**.([Jj][Ss])
+ADJS http://annonser.dagbladet.no/eas?**;js=y
+AD http://annonser.dagbladet.no/eas?**;cre=img
+ADHTML http://www.dagbladet.no/inc3/hmarg/dblinker.php
+ADHTML http://annonser.dagbladet.no/eas?**
+AD http://(anzeige|werbung|WERBUNG|annonser|reklame|reklaam).*/**.([Gg][Ii][Ff]|[Jj][Pp][Gg])
 AD http://**/(anzeige|werbung|WERBUNG|annonser|reklame|reklaam)/**.([Gg][Ii][Ff]|[Jj][Pp][Gg])
 AD http://*.de/images/wrb/**
 # several patterns from Sergey Smirnov
@@ -2202,11 +2216,14 @@ AD http://**/ban/ani[0-9]*.gif
 AD http://(www*.|)nmnews.net/images/ani**.gif
 AD http://(www*.|)fxsound.com/grfx/dfx_animated.gif
 AD http://*/animeu/*.gif
+AD http://cdn.eyewonder.com/**.gif
+ADJS http://cdn.eyewonder.com/**/*.js?**
 ADJS http://imgserv.adbutler.com/jad?**
 ADJS http://*.cybereps.com:8880/jserver**
 ADJS http://216.148.128.89/jserver/**
 ADJS http://home.netscape.com/h.js
 ADJS http://*.usercash.com/**.js
+ADHTML http://img.mediaplex.com/cgi-bin/html/**
 ADHTML http://*.usercash.com/*.php**
 ADHTML http://www.megaupload.com/adbrite.php?**
 ADPOPUP http://**/ads/popup.shtml
@@ -2435,6 +2452,7 @@ PASS http://(www.|)tvs.org.au/rw_common/themes/**
 PASS http://(www.|)telstra.com.au/banners/**
 PASS http://(www.|)alifexi.org/images/**
 PASS http://(www.|)moxa.com/banner/**
+PASS http://static.gamesradar.com/images/**
 AD http://(www*.|)planet3dnow.de/images/zusatz/*.gif
 AD http://(www*.|)sueddeutsche.de/sz/misc/marktplatz/**.gif
 AD http://**/([Aa]dvert|ADVERT|advbn|adgifs|blipverts|showsell|*[Bb]anner|bann|bannerlink|linkbacks|liveads|adproof|SiteSponsor|spon)**.([Gg][Ii][Ff]|[Jj][Pp][Gg]|[Pp][Nn][Gg])*
@@ -2890,6 +2908,7 @@ AD http://(www*.|)nypostonline.com/images/p6teaser/*.gif
 AD http://(www*.|)eweek.com/dropdown/*.jpg
 AD http://bs[0-9]*.gmx.net/[0-9]**
 AD http://**/advertisers/*.gif
+PASS http://*.yimg.com**/a/i/**/twip/yahoo_twip*.swf
 ADSWF http://**/advertise(|r(|s))/**.swf**
 ADSWF http://temp.customize.org/*.swf
 ADSWF http://(www*.|)gamespy.com/aspcommon/120x38/arcade_120x38.swf
@@ -3536,6 +3555,8 @@ WEBBUGJS http://edge.quantserve.com/quant.js
 WEBBUGJS http://*.imrworldwide.com/v5.js
 COUNTERJS http://*.imrworldwide.com/*.js
 REWRITE http://switch.atdmt.com/action/msn_hm_*_signup_link?href=(**) $1
+WEBBUG http://acvs.mediaonenetwork.net/client/pixel.gif
+WEBBUG http://pixel.quantserve.com/pixel**
 WEBBUG http://*.imrworldwide.com/cgi-bin/m?**
 WEBBUG http://*.imrworldwide.com/cgi-bin/count**
 WEBBUG http://images-aud.slashdot.org/pc.gif?**
@@ -3899,8 +3920,8 @@ AD http://admin.digitalacre.com/images/**.(GIF|gif)
 AD http://cyber-knowledge.net/blog/images/hm.gif
 AD http://sportsbybrooks.com/farkbutton.gif
 AD http://huuto.net/fi/huutonet/bannerit/*
-AD http://ads.**.(gif|jpe?g)
-AD http://*.ads.**.(gif|jpe?g)
+AD http://ads.**.(gif|jpg|jpeg)
+AD http://*.ads.**.(gif|jpg|jpeg)
 AD http://ad.erotik-click.de/banner/*.gif
 AD http://(www*.|)joinfree.ro/adult20.jpg
 AD http://(www*.|)gm.com/nonflash_homepage/images/story*.jpg