merge

2010-05-02 15:38:04 +10:00 · 2010-05-02 15:38:04 +10:00 · b7730b8f25
commit b7730b8f25
parent dd49a6fb0f dfb56b2bfa
11 changed files with 220 additions and 35 deletions
--- a/addChecksum-org.pl
+++ b/addChecksum-org.pl
@ -0,0 +1,65 @@
+#!/usr/bin/perl
+
+#############################################################################
+# This is a reference script to add checksums to downloadable               #
+# subscriptions. The checksum will be validated by Adblock Plus on download #
+# and checksum mismatches (broken downloads) will be rejected.              #
+#                                                                           #
+# To add a checksum to a subscription file, run the script like this:       #
+#                                                                           #
+#   perl addChecksum.pl subscription.txt                                    #
+#                                                                           #
+# Note: your subscription file should be saved in UTF-8 encoding, otherwise #
+# the generated checksum might be incorrect.                                #
+#                                                                           #
+#############################################################################
+
+use strict;
+use warnings;
+use Digest::MD5 qw(md5_base64);
+
+die "Usage: $^X $0 subscription.txt\n" unless @ARGV;
+
+my $file = $ARGV[0];
+my $data = readFile($file);
+
+# Remove already existing checksum
+$data =~ s/^.*!\s*checksum[\s\-:]+([\w\+\/=]+).*\n//gmi;
+
+# Calculate new checksum: remove all CR symbols and empty
+# lines and get an MD5 checksum of the result (base64-encoded,
+# without the trailing = characters).
+my $checksumData = $data;
+$checksumData =~ s/\r//g;
+$checksumData =~ s/\n+/\n/g;
+
+# Calculate new checksum
+my $checksum = md5_base64($checksumData);
+
+# Insert checksum into the file
+$data =~ s/(\r?\n)/$1! Checksum: $checksum$1/;
+
+writeFile($file, $data);
+
+sub readFile
+{
+  my $file = shift;
+
+  open(local *FILE, "<", $file) || die "Could not read file '$file'";
+  binmode(FILE);
+  local $/;
+  my $result = <FILE>;
+  close(FILE);
+
+  return $result;
+}
+
+sub writeFile
+{
+  my ($file, $contents) = @_;
+
+  open(local *FILE, ">", $file) || die "Could not write file '$file'";
+  binmode(FILE);
+  print FILE $contents;
+  close(FILE);
+}
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: fRr8YpwV7eHhsnaQV69CRA
+! Checksum: zw94E1SMtgmFR0UyjXGKrg
 ! Fanboy's Adblock list
-! Version: 023B Updated: 1 May 2010
+! Version: 023B Updated: 2 May 2010
 ! This list expires after 3 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Please report any unblocked ads or problems by email or in our forums
@ -34,6 +34,7 @@
 .cliximages.
 .cnn.com/cnn_adspaces/
 .codigobarras.
+.com.au/banners/$subdocument
 .com/a?network
 .com/a?pagetype
 .com/a?size
@ -278,7 +279,7 @@
 /adpeeps
 /ADPictures/*
 /adpoint.
-/adpopup.php?
+/adpopup.
 /AdPostInject
 /adproxy/*
 /adrawdata/*
@ -409,8 +410,8 @@
 /advert/*
 /advert_iframe
 /advertis$image,script,subdocument
-/advertisementheader.
 /advertising/ads/*
+/advertisementheader.
 /advertpro/*
 /adverts/*
 /advfiles/*
@ -480,9 +481,6 @@
 /banners.cgi?
 /banners.js|
 /banners.php?id
-/banners/*_banner.html
-/banners/*_island.html
-/banners/*_tower.html
 /banners/ad
 /banners/ban_
 /banners/banner
@ -513,9 +511,9 @@
 /call/pubj/*
 /cdn.doubleclick.
 /cgi-bin/adcgi
+/cgi-bin/ads_
 /cgi-bin/ads/*
 /cgi-bin/ads2/*
-/cgi-bin/ads_
 /cgi-bin/adx
 /cgi-bin/banner
 /cgi-bin/iframe/*
@ -717,7 +715,6 @@
 /mainAD.html
 /media/ads/*
 /MetaAdServer/*
-/mfnpreroll2.php?$domain=rss2search.com,third-party
 /miva_ads
 /mod_ad/*
 /modules_ads.
@ -814,7 +811,6 @@
 /reklame.asp?
 /reklame/*$image
 /relatedads
-/restserver.php?*-Ads-$third-party
 /right_ad.
 /rightad.
 /rightbanner/*
@ -977,6 +973,7 @@ _adserve/
 _adshow.asp?
 _advert_vert
 _advertisement_
+_assets/ads/
 _blogads.
 _cedexis.
 _custom_ad.
@ -1182,6 +1179,7 @@ visitor-track.
 |https://adserv
 ||125exchange.com^$third-party
 ||196.41.0.207/
+||208.43.84.120^$third-party
 ||209.172.55.5$script
 ||216.151.186.5/
 ||2dpt.com^$third-party
@ -1278,6 +1276,7 @@ visitor-track.
 ||adgent007.com^$third-party
 ||adgitize.com^$third-party
 ||adgoto.com^$third-party
+||adhostingsolutions.com^$third-party
 ||adicate.com^$third-party
 ||adimise.com^$third-party
 ||adinterax.com^$third-party
@ -1613,7 +1612,7 @@ visitor-track.
 ||doubleclick.net/imp;
 ||dpbolvw.net^$third-party
 ||dregie.com^$third-party
-||driversdownloaddriver.com/images/big-banner.jpg
+||driversdownloaddriver.com/images/$image
 ||dt00.net^$third-party,domain=~marketgrid.com
 ||dtmpub.com^$third-party
 ||dynamitedata.com^$third-party
@ -1694,14 +1693,13 @@ visitor-track.
 ||googleadservices.com^$third-party
 ||googlesyndication.com^*/domainpark.cgi?$third-party
 ||gopjn.com/b/$third-party
-||gov-auctions.org/images/banner/banner$third-party
+||gov-auctions.org^*/banner/
 ||gowilkes.com/cj/
 ||gowilkes.com/other/
 ||grabmyads.com^$third-party
 ||grapeshot.co.uk^$third-party
 ||hfimage.head-fi.org/sponsors/
-||hidemyass.com/*-banner.$image
-||hidemyass.com/index.php?q=$subdocument
+||hidemyass.com/*.png|$image,domain=w2.hidemyass.com
 ||hjlas.com/images/
 ||hopfeed.com^$third-party
 ||hosting.conduit.com^$third-party,script
@ -2045,6 +2043,7 @@ visitor-track.
 ||suitesmart.com^$third-party
 ||surveymonkey.com/jsPop.aspx?$third-party
 ||surveywriter.net^$third-party,script
+||swiftco.net/banner/
 ||switch.atdmt.com^$third-party
 ||synad2.nuffnang.com.au^$third-party
 ||syndicate.payloadz.com^$third-party
@ -2199,6 +2198,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
@@/html.ng/*$domain=webmd.com
@@/img/banners/*$domain=vodafone.co.nz
@@/js/ads.js$domain=imdb.com
+@@/mtvi_ads_$domain=southparkstudios.com
@@/tii_ads.js$domain=ew.com|people.com|time.com
@@/www/delivery/*$domain=video.belga.be|submarino.com.br|japantimes.co.jp|pumpkinpatch.co.nz|pumpkinpatch.com.au|pumpkinpatch.co.uk|pumpkinpatchusa.com
@@://10.1.1.
@ -2438,10 +2438,13 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###ad_container
 ###ad_content
 ###ad_creative_2
+###ad_creative_3
+###ad_creative_5
 ###ad_feature
 ###ad_feedback
 ###ad_footer
 ###ad_footerAd
+###ad_global_below_navbar
 ###AD_google
 ###ad_halfpage
 ###ad_header
@ -2636,6 +2639,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###adsDiv0
 ###adsDiv1
 ###adsDiv2
+###adsDisplay
 ###AdSense
 ###adsense
 ###adsense-area
@ -2657,6 +2661,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###adSky
 ###adSkyPosition
 ###adskyscraper
+###adsNarrow
 ###ADsmallWrapper
 ###adsonar
 ###adspace-300x250
@ -2718,6 +2723,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###adv_google_728
 ###adv_top
 ###adv_top_banner_wrapper
+###advert-1
 ###advert-ahead
 ###advert-banner
 ###advert-block
@ -2737,6 +2743,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###advertBanner
 ###advertBoxRight
 ###advertise_top
+###advertisement_notice
 ###advertisement160x600
 ###advertisement728x90
 ###advertiserLinks
@ -2927,6 +2934,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###footerleaderboard
 ###front_mpu
 ###frontlowerad
+###frmRightnavAd
 ###g-adblock2
 ###g_ad
 ###g_adsense
@ -3083,6 +3091,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ###midpost_ad
 ###midrect_ad
 ###midstrip_ad
+###module_ad
 ###module-google_ads
 ###module_box_ad
 ###module_sky_scraper
@ -3899,6 +3908,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ##.googleads
 ##.googleads_300x250
 ##.googleads_title
+##.googleSideAd
 ##.googley_ads
 ##.gradientAd
 ##.group.ads
@ -3992,6 +4002,7 @@ itweb.co.za##div[style$="width: 300px; height: 266px;"]
 ##.midad
 ##.mod-adcpc
 ##.mod-adopenx
+##.module_ad_disclaimer
 ##.module-ad-small
 ##.moduleAd
 ##.modulegad
@ -4299,6 +4310,7 @@ androidcommunity.com##div[style="padding: 6px 0px 0px;"]
 androlib.com##.gadsqr
 angelfire.com###tb_container
 animetake.com##.top-banner
+animenfo.com##.nav2
 anonymouse.org###mouselayer
 ansearch.com.au##.sponsor
 answers.com###th1
@ -4603,7 +4615,7 @@ demonoid.com##.pad9px_right
 demonoid.com##[style="color: rgb(119, 119, 119); background: none repeat scroll 0% 0% rgb(205, 208, 178); padding-left: 10px; padding-right: 10px; border: 1px solid rgb(119, 119, 119);"]
 denofgeek.com##.skyright
 desktoplinux.com##TABLE[width="600"]
-destructoid.com##[style="width: 300px; height: 250px; overflow: hidden;"]
+destructoid.com##table[align="left"][width="300"]
 detnews.com##.bannerSpace
 detroitnews.com##.bannerSpace.clearfix
 deviantart.com###adso-magnifico
@ -6391,6 +6403,7 @@ zug.com###header_rotate
 /728x90b.
 /728x90ban
 /728x90c
+/728x90n
 /750-100
 /760x120_
 /760x90_
@ -6890,6 +6903,7 @@ LargeFlashAd.js
 ||affiliate.burn-out.tv^$third-party
 ||affiliate.dtiserv.com^$third-party
 ||affiliates.jlist.com^$third-party
+||affiliate.godaddy.com^$third-party
 ||affiliatewindow.com^$third-party
 ||affiliation-int.com^$third-party
 ||alt.com/go/$third-party
--- a/fanboy-adblocklist-stats.txt
+++ b/fanboy-adblocklist-stats.txt
@ -1,7 +1,7 @@
 [Adblock Plus 1.1]
-! Checksum: tJcySjXrpSj62IT/H408EQ
+! Checksum: T9PB6qL3l0lOXbR8rBuRzQ
 ! Fanboy Tracking/Stats V3 Blocking
-! Version: 023B Updated: 1 May 2010
+! Version: 023B Updated: 2 May 2010
 ! This list expires after 3 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Contact: mp3geek@gmail.com  http://fanboy.co.nz/adblock
@ -339,6 +339,7 @@
 /etracker.js
 /etracker/*
 /etrackercode
+/eu/ywa.js
 /eventTracker.js
 /EWTRACK_
 /exe/indexer.php?
@ -449,6 +450,7 @@
 /LinkInformer.js
 /linktrack.
 /log-view.
+/Log.ashx?
 /log.jphp?
 /log.jsp?
 /log.php?*http
@ -1128,6 +1130,7 @@ webstatisztika
 ||havamedia.net^$third-party
 ||hb.lycos.com/hb.js$script
 ||hellosherpa.com^$third-party
+||hidemyass.com/&$subdocument
 ||higherengine.com^$third-party
 ||highmetrics.com^$third-party
 ||histats.com^$third-party
@ -1186,6 +1189,7 @@ webstatisztika
 ||keewurd.com^$third-party
 ||keywordmax.com^
 ||komtrack.com^$third-party
+||kosmix.com/images/*.txt?pvid
 ||latimes.com/pixel/
 ||launch.roirocket.com^
 ||lct.salesforce.com^
@ -1559,7 +1563,7 @@ webstatisztika
@@||js.revsci.net^$script,domain=video.foxnews.com 		
@@||log.go.com/log?srvc=abc&guid=*Adsatt.*$domain=abc.go.com 		
@@||metrics.howstuffworks.com^$image
-@@||pixel.quantserve.com/api/segments.$domain=comedy.com|tv.com|southparkstudios.com,third-party
+@@||pixel.quantserve.com/api/segments.xml?a=$domain=comedy.com|tv.com,third-party
@@||pixel.quantserve.com/seg/r;a=$object_subrequest,domain=filefront.com|cbs.com|laobserved.com|breitbart.tv|imdb.com|tv.com 		
@@||quantserve.com/quant.js$domain=g4tv.com
@@||revsci.net^*/pcx.js?csid$script,domain=video.foxnews.com 		
--- a/firefox-regional/fanboy-adblocklist-ita.txt
+++ b/firefox-regional/fanboy-adblocklist-ita.txt
@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: rCHMF+2JVRLL5TpocHDKvg
+! Checksum: REwopM+oK6ghtjPOpLmE3Q
 ! Fanboy's Italian-addon Adblock list 
 ! Version: 024A Updated: 2 May 2010
 ! This list expires after 3 days
@ -14,6 +14,7 @@
 /adv_300x250.
 /box_tuttomercato/*
 /getbanner.aspx?
+/highlight_mfa.$subdocument
 /images/bg_adv$image,background
 /js/adv.js|
 /negozi_accordion.swf?
@ -36,6 +37,7 @@
 ||affiliati.cellulare.net^$third-party
 ||agi.it/repository/banner-google
 ||allosponsor.it^$third-party
+||bow.it/SiteImages/banner/
 ||bmwpassion.com^*/banners/
 ||cda.libero.it^
 ||chunnel.de^$third-party
@ -78,6 +80,7 @@
 ||tecnozoom.it^*_adsl300250
 ||textads.ikiweb.it^$third-party
 ||video-loader.com^$third-party
+||virgilio.it/banner
 ||virgilio.it/sg/boxis_
 ||wallstreetitalia.com^*/swf_banners/
 ||widget.kelkoo.com^$third-party
@ -86,7 +89,9 @@
 !
 !---------- Italian Trackers ------------
 !
+.it/Cnt/
 /cdcounter.cgi?
+/webabacus-
 ||85.115.8.249/tracking.php?
 ||ansa.it/nseevo/counter?
 ||aspstats.wallstreetitalia.com^
@ -102,6 +107,7 @@
 ||simply.com/magellan.html?
 ||sprintrade.com^$third-party
 ||stats.e-go.gr^
+||virgilio.it/clientinfo.gif?
 !
 !---------- Easylist-specific ----------
 !
@ -134,6 +140,7 @@ agi.it###google_ads_frame_vert
 agi.it##.bannerAdv
 agi.it##.headerbanner
 annunci.tiscali.it##.w300
+allaguida.it###top-banner
 ansa.it##.adv
 ansa.it##.adv-4
 asylumitalia.it##.topBanner
@ -147,12 +154,15 @@ bitcity.it###banner-leaderboard
 bitcity.it###banner-mpu
 bitcity.it###banner-normal
 bitcity.it###banner-sky
+blogosfere.it##.googleSideAd
 bmwpassion.com##[style="width: 180px; height: 90px; text-align: center;"]
 bresciaoggi.it##.header-box
 businessonline.it###spotgoogle
 businessonline.it##.adv1
 businessonline.it##.adv3
 businessonline.it##table[bgcolor="#ece9e2"][width="90%"]
+buttalapasta.it###top-banner
+cinguettare.com###sads
 corriere.it###atcasa_ppn
 corriere.it###box-viaggi-home-cor
 corriere.it###BoxAdv2
@ -165,7 +175,12 @@ corriere.it##.collection
 corriere.it##.dove
 corriere.it##.royal_mkt
 cronacaqui.it##.manchette
+derapate.it###top-banner
+ecoo.it###top-banner
+film.it##.top_advertizing_cnt
+film.it##.right_advertise_cnt
 f1grandprix.it###container4
+gaywave.it###top-banner
 gazzetta.it##.poker
 gazzetta.it##.pubblicita
 giovani.it##.adv_leaderboard
@ -173,6 +188,7 @@ giovani.it##.sidebar_adv_pp
 gizmodo.it###bodyGoogleAnnounces
 gizmodo.it###headerAdButton
 gizmodo.it###sideBarGoogleAnnounces
+hwgadget.com###adpromo
 ilgiornale.it###adsense_box
 ilgiornale.it###headerleader
 ilgiornale.it###primopiano
@ -216,6 +232,7 @@ monde-diplomatique.it###spotsinistra
 mrwebmaster.it##.banner
 mrwebmaster.it##.box_sky
 mrwebmaster.it##.highlight
+nextmoto.it###top-banner
 panorama.it###leadermarketing
 panorama.it##.adv
 pcworld.it###common-network
@ -224,6 +241,7 @@ pcworld.it###Leaderboard
 pcworld.it###pangoraBox
 pcworld.it##.advertise
 pianetacellulare.it##.banner2
+pourfemme.it###top-banner
 quattroruote.it###advmenu
 quattroruote.it###advmenu
 quattroruote.it###bannerqrt
@ -248,9 +266,16 @@ rumors.it###block-block-27
 rumors.it###block-block-4
 rumors.it###block-block-4
 rumors.it###block-block-5
+screenweek.it###googleads-swblogbox1
+screenweek.it###googleads-swblogbox2
 studenti.it##.boxConsiglia
 style.it##.slide-items
+stylosophy.it###top-banner
+suipedali.it###top-banner
 tecnozoom.it###header-banner
+tecnocino.it###top-banner
+trackback.it###top-banner
+televisionando.it###top-banner
 tio.ch##[style="border: 1px solid rgb(1, 84, 136);"]
 tiscali.it###banner300x250c20
 tiscali.it##.ADV
@ -280,6 +305,7 @@ virgilio.it##.newboxIsOrizz
 virgilio.it##.primo
 virgilio.it##.promo_spalla
 virgilio.it##.ultimo
+vostrisoldi.it###top-banner
 voceditalia.it##.banner_casino
 webmasterpoint.org###b728
 webmasterpoint.org##.banner
--- a/firefox-regional/fanboy-adblocklist-rus-v2.txt
+++ b/firefox-regional/fanboy-adblocklist-rus-v2.txt
@ -1,13 +1,14 @@
 [Adblock Plus 1.1]
-! Checksum: Ny66fK+2/yBJLWRND+5Hjg
+! Checksum: zBrPTBcL/AlWlB76v9Q76A
 ! Fanboy's Russian-V2-addon Adblock list 
-! Version: 024A Updated: 30 Apr 2010
+! Version: 024A Updated: 2 May 2010
 ! This list expires after 3 days
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Contact: mp3geek@gmail.com  http://fanboy.co.nz/adblock
 !
 .admitad.com^
 .ngs.ru/*.swf?pid
+.ru/adx.js
 .ru/RCL/BAN/
 /1tizer_
 /adt.fcgi?
@ -22,6 +23,7 @@
 ||77.120.122.117^*/banners/
 ||212.150.34.115^$third-party
 ||2x2.su/reclama/
+||2baksa.net^*/reklama/
 ||77.91.228.66^$third-party
 ||78.140.145.178^$third-party
 ||80.93.49.192^$third-party
@ -79,6 +81,8 @@
 ||advesti.ru/poligrafia
 ||advmaker.ru^$third-party
 ||affiliate.printdirect.ru^$third-party
+||agronews.ru^*.swf|
+||agrotv.ru/informer.swf?
 ||aif.yadro.ru^$third-party
 ||akabo.ru^$third-party
 ||anime-zone.ru/inc/partners
@ -106,9 +110,11 @@
 ||c.bigmir.net^
 ||carclub.ru^*/banners/
 ||cash4ru.com^$third-party
+||cn.ru/data/promoblocks/
 ||cnews.ru^*/banners/
 ||cnews.ru^*/partners/
 ||code.popup2m.com^$third-party
+||copypast.ru/foto7/$object
 ||dc.ixbt.com^$subdocument
 ||denwer.ru/ru/rec/$~third-party,image
 ||dirkino-traff.ru^$third-party
@ -118,7 +124,9 @@
 ||echo.msk.ru/att/webpage-
 ||engine.video-link.ru^$third-party
 ||exaccess.ru^$third-party
+||exler.ru/banners/
 ||ferra.ru/include/priceru_advert_
+||fishki.net^*.ad.png 
 ||free-torrents.org^*/banners/
 ||freshmac.ru^*/banner_
 ||freshmac.ru^*_banner.
@ -144,6 +152,7 @@
 ||ifolder.ru/images/brs/
 ||img.advesti.ru^*.gif|
 ||img.sape.ru/bn/$third-party
+||inshop.ru^$third-party
 ||instantcash.ru^$third-party
 ||ixbt.com/banner/
 ||izvestia.ru/banners/
@ -161,6 +170,8 @@
 ||lifehacker.ru/promo/
 ||lifenews.ru/banner/
 ||link.link.ru^$third-party
+||litres.ru/static/baners/
+||lol.bash.org.ru^
 ||lostfilm.tv/img/$object
 ||luxup.ru^$third-party
 ||macovod.net/ads/
@ -184,6 +195,7 @@
 ||partnerearning.com^$third-party
 ||partners.livegames.ru^$third-party
 ||partners.autoweek.ru^$third-party
+||partners.nikitaonline.ru^$third-party
 ||pbid.iforex.com^$third-party
 ||pics.rbc.ru/img/*.gif?$third-party
 ||pics.rbc.ru^*960
@ -195,6 +207,7 @@
 ||quintura.ru^$third-party
 ||qzx.ru/gf/banner_
 ||r.i.ua/s?$third-party
+||rabota.ru/banner/
 ||rbc.ru/banners/
 ||readme.ru/informer/
 ||regnum.ru/i/bn/
@ -242,6 +255,7 @@
 ||vpsite.ru/600x200
 ||widgets.fotocash.ru^$object,third-party
 ||xmemory.ru^$third-party,script
+||xruni.ru^*/banners/
 ||yottos.com.ua^$third-party,subdocument
 ||yabs.yandex.ru^
 ||yadro.ru/ad/
@ -251,6 +265,7 @@
 !
 !---------- Russian Trackers ------------
 !
+.ru/cnt/?
 .ru/counter?
 .ru/counters?
 .ru/stat/?
@ -269,6 +284,7 @@
 ||c.uarating.com^
 ||clicks.runews.radeant.com^$third-party
 ||cnstats.ru^$third-party
+||counter.promopark.ru^$third-party
 ||counter.rambler.ru^$third-party
 ||counter.spylog.com^$third-party
 ||counter.top.am^$third-party
@ -302,6 +318,7 @@
 ||rutvit.ru/?identifier
 ||seemore.ru^$third-party
 ||spylog.ru/counter$third-party
+||stat.aft.ru^
 ||stat.izvestia.ru^
 ||stat.kffg.ru^$third-party
 ||stat1.ukr.net^
@ -344,6 +361,9 @@
 ###b240x400
 ###b728x90
 actualcomment.ru###topbanner
+ag.ru##.a_blk
+ag.ru###upadbg2
+ag.ru##.dotsbg2[height="80"]
 ag.ru###ad120x60_override
 ag.ru###rotating_banners
 anode.ru##.cban
@ -354,8 +374,14 @@ bash.org.ru##[style="text-align: center; font-size: 10pt;"]
 binmovie.org##[style="border: 3px outset green; font-size: 16px; background-color: rgb(253, 252, 240); margin-bottom: 10px;"]
 cifrovik.ru##.noprice
 citysmile.ru##[style="border: 3px outset green; font-size: 16px; background-color: rgb(253, 252, 240); margin-bottom: 10px;"]
+cosmo.ru##.banner_LEFT1
+cosmo.ru##.ban300x500
+cosmo.ru##.marketing
+cosmo.ru##div[style="height: 465px;"]
 cn.ru##.madv
 cn.ru##.rx8
+cn.ru###block-promo
+cn.ru##.rx7neta
 cnews.ru###banner300x250
 cnews.ru###banner300x250_publication
 cnews.ru###banner600x90
@ -387,15 +413,24 @@ dni.ru###tb_135_outer
 dni.ru###tb_137_outer
 dni.ru##.partners-links
 domik.net###hright
+dreamprogs.net###topbanner2
 exler.ru###BannerGBottomMediaT
 exler.ru###BannerGCenterMediaT
 exler.ru###BannerGTopMediaT
 exler.ru###BannerH2Left
 exler.ru###BannerHLeft
+exler.ru###BannerGTop
+exler.ru###BannerGIMGMediaT
+exler.ru###BannerGIMG
+exler.ru###BannerGBottom
+exler.ru###BannerGCenter
 exnews.org##[style="border: 3px outset green; font-size: 16px; background-color: rgb(253, 252, 240); margin-bottom: 10px;"]
 fanacmilan.com###adTextausgPjIE
+feels.ru##[width="550"][bgcolor="#FF0000"]
+file-online.ru##[style="border: 2px dashed green; padding: 15px 3px; font-size: 16px; background-color: rgb(253, 250, 195);"]
 forums.overclockers.ru##.banner
 forums.overclockers.ru##[style="border: 1px dotted rgb(119, 119, 119);"]
+freesoft.ru##[width="472"][align="center"]
 gazeta.ua###baner_top
 gazeta.ua##[style="width: 240px; height: 350px; overflow: hidden;"]
 gazeta.ua##[style="overflow: hidden; width: 240px; height: 350px;"]
@ -500,4 +535,4 @@ yandex.ru###banner
 yandex.ru##.somebanner
 zaxid.net###fakeCommercialBox
 zhmak.info###fp_adv2
-zhmak.info##[style="border: 2px dashed green; padding: 15px 3px; font-size: 16px; background-color: rgb(253, 250, 195);"]
+zhmak.info##[style="border: 2px dashed green; padding: 15px 3px; font-size: 16px; background-color: rgb(253, 250, 195);"]
--- a/iron/adblock-beta.ini
+++ b/iron/adblock-beta.ini
@ -1,6 +1,6 @@
 # Fanboy's Adblock list (Iron-Chrome)
-# Checksum: IpTxaYbD7HmpB1OgA1DqMQ
-# Version: 024A Updated: 1 May 2010
+# Checksum: ZOYHmUb5IhTlsHYADaZiaQ
+# Version: 024A Updated: 2 May 2010
 # License: http://creativecommons.org/licenses/by/2.5
 # Contact: mp3geek@gmail.com  http://fanboy.co.nz/adblock
 &ad_number=
@ -125,6 +125,7 @@
 .adgitize.com/
 .adgoto.com/
 .adhese.be/
+.adhostingsolutions.com/
 .adicate.com/
 .adimise.com/
 .adinterax.
@ -389,6 +390,7 @@
 .cocolog-nifty.com/banner/
 .codigobarras.
 .collective-media.
+.com.au/banners/
 .com/?wid=
 .com/a?network
 .com/a?pagetype
@ -1031,6 +1033,7 @@
 .swf?BannerId
 .swf?iurl=http
 .swf?link1=http
+.swiftco.net/banner/
 .targetpoint.com/
 .targetsaver.
 .targetspot.com/player/
@ -1290,6 +1293,7 @@
 /728x90b.
 /728x90ban
 /728x90c
+/728x90n
 /750-100
 /760x120_
 /760x90_
@ -1465,7 +1469,7 @@
 /adpeeps
 /ADPictures/
 /adpoint.
-/adpopup.php?
+/adpopup.
 /AdPostInject
 /adproxy/
 /adrawdata/
@ -2611,6 +2615,7 @@ _Ads/InHouse
 _adshow.asp?
 _advert_vert
 _advertisement_
+_assets/ads/
 _banner/
 _blogads.
 _cedexis.
@ -2734,6 +2739,7 @@ hogalia_ad
 house_ad
 http://196.41.0.207/
 http://1under.ru/
+http://208.43.84.120/
 http://209.172.55.5/
 http://216.151.186.5/
 http://4gifs.com/Ads/
@ -2928,6 +2934,7 @@ http://aff-jp.
 http://affil.mupromo.com/
 http://affiliate.burn-out.
 http://affiliate.dtiserv.
+http://affiliate.godaddy.com/redirect/
 http://affiliates.homestead.com/
 http://affiliates.jlist.
 http://affiliates.market-ace.com/
--- a/iron/adblock-stats.ini
+++ b/iron/adblock-stats.ini
@ -1,6 +1,6 @@
 # Fanboy's Stats list (Iron-Chrome)
-# Checksum: //8/8sk+NETk/LfAYUtHPw
-# Updated: 30 Apr 2010
+# Checksum: sbySx3IGJ69+oM87jZAWLg
+# Updated: 2 May 2010
 -AdTracking.
 -seo-tracker.
 -statistiken.de/
@ -323,6 +323,8 @@
 .jstracker.
 .keynote.com/wt/
 .komtrack.com/
+.kosmix.com/images/mpv.txt?
+.kosmix.com/images/pv.txt?
 .latimes.com/pixel/
 .letsstat.nl/
 .libstat.com/
@ -824,6 +826,7 @@
 /etracker.js
 /etracker/
 /etrackercode
+/eu/ywa.js
 /eventTracker.js
 /EWTRACK_
 /ewtrack_
@ -937,6 +940,7 @@
 /LinkInformer.js
 /linktrack.
 /log-view.
+/Log.ashx?
 /log.jphp?
 /log.php?
 /log.php?http
--- a/opera/fanboy-adblocklist-elements-v3.css
+++ b/opera/fanboy-adblocklist-elements-v3.css
@ -1,7 +1,7 @@
 /*
-! Checksum: humTuylS/ZuKJdSCulYxiQ
+! Checksum: o8neOgrCdIi/EKXKYMjFDg
 ! Fanboy Optimised Element Blocking
-! Version: V3 Updated: 1 May 2010
+! Version: V3 Updated: 2 May 2010
 ! License: http://creativecommons.org/licenses/by-sa/3.0/
 ! Contact: mp3geek@gmail.com  http://fanboy.co.nz/adblock
 !
@ -152,7 +152,8 @@
 #google_ads_frame3,.ad_descriptor,.x04-adunit,.meta_ad,#onespot-ads,#textAds,#adiframe1_iframe,#adiframe2_iframe,#adiframe3_iframe,#ad300X250,.adServer,.ad160x600,.ad468x60,#adsense_300x250,
 #adsense_box,#adcontainer250x250,#adskyscraper,#adleaderboardb,#navi_banner_ad_780,.otj_adspot,#admod2,#google-ads-container,#GoogleAdsense,#right_column_top_ad_unit,#article_ad_container,
 .sidebar_ad_holder,#ad_1,.divAdvTopRight,.alt_ad,#ad-trailerboard-spot,#ad-mpu2-spot,#ad-mpu1-spot,#ad-leaderboard-spot,.ad_top_banner,#topbannerad,#FooterAdBlock,.ad-permalink,
-#ad-top-300x250,#ad-bottom-300x250,#ctl00_cphMain_hlAd1,#ctl00_cphMain_hlAd2,#ctl00_cphMain_hlAd3,#topbar-ad,#ad_skyscraper_1,#ad_leaderboard_1,
+#ad-top-300x250,#ad-bottom-300x250,#ctl00_cphMain_hlAd1,#ctl00_cphMain_hlAd2,#ctl00_cphMain_hlAd3,#topbar-ad,#ad_skyscraper_1,#ad_leaderboard_1,.googleSideAd,#frmRightnavAd,
+#ad_creative_3,#ad_creative_5,#ad_global_below_navbar,#adsNarrow,#adsDisplay,#advertisement_notice,#module_ad,.module_ad_disclaimer,#advert-1,

 /* adult-list */
 #im_popupDiv,#AFF_popup,#floatyContent,.adbckgrnd,
--- a/opera/urlfilter-rus.ini
+++ b/opera/urlfilter-rus.ini
@ -3,6 +3,7 @@
 */esel_b.swf?*
 */esel_s.swf?*
 *.2x2.su/reclama/*
+*.2baksa.net/download/reklama/*
 *.adcast.ru/*
 *.adfox.ru/*
 *.adhands.ru/*
@ -18,16 +19,21 @@
 *.adtaily.pl/*
 *.adv.vz.ru/*
 *.advertpay.net/*
+*.agronews.ru/images/flash/lbr4.swf
+*.agronews.ru/temp/banner_5.swf
+*.agrotv.ru/informer.swf?
 *.arbocontext.ru/*
 *.bannerbank.ru/*
 *.begun.ru/*
 *.bizbanner.com.ua/*
 *.cash4ru.com/*
+*.cn.ru/data/promoblocks/*
 *.cnews.ru/inc/banners/*
 *.cnews.ru/inc/dynamic/partners/*
 *.denwer.ru/ru/rec/*
 *.exaccess.ru/*
 *.ferra.ru/include/priceru_advert_*
+*.fishki.net/*.ad.png
 *.free-torrents.org*/banners/*
 *.globalstars.ru/*
 *.goldfishkapartners.com/*
@ -44,6 +50,7 @@
 *.ksweb.ru/img/money*
 *.ladyshopping.ru/*
 *.lifenews.ru/banner/*
+*.litres.ru/static/baners/*
 *.luxup.ru/*
 *.macovod.net/ads/*
 *.magna.ru/*
@ -57,6 +64,7 @@
 *.partnerearning.com/*
 *.profistats.net/*
 *.quintura.ru*
+*.rabota.ru/banner/*
 *.rbc.ru/banners/*
 *.regnum.ru/i/bn/*
 *.richbanner.ru/*
@ -64,6 +72,7 @@
 *.rmbn.ru/js/smartblock/*
 *.rorer.ru/*
 *.rotaban.ru/*
+*.ru/adx.js
 *.ru/RCL/BAN/*
 *.ruserv.com/*
 *.ruspatch.info/*
@ -84,6 +93,7 @@
 *.visitweb.com/v/*
 *.voffka.com/archives/*
 *.vpsite.ru/600x200_*
+*.xruni.ru/PICS/banners/*
 *.yadro.ru/ad/*
 *.zaks.ru/f/ad/*
 */1tizer_*
@ -153,12 +163,14 @@ http://bans.bride.ru/*
 http://bans.dating.ru/*
 http://bin-layer.de/*
 http://bin-layer.ru/*
+http://blocks.inshop.ru/external.php?*
 http://bubblesmedia.ru/*
 http://bw.pronto.ru/img/*.swf
 http://c.bigmir.net/*
 http://c.uarating.com/*
 http://carclub.ru*/banners/*
 http://code.popup2m.com*
+http://copypast.ru/foto7/*.swf
 http://dc.ixbt.com/*
 http://dirkino-traff.ru/*
 http://dosugcz.biz/*
@ -166,6 +178,7 @@ http://dozory.goodoo.ru/squest/*
 http://echo.msk.ru/att/element-*.gif
 http://echo.msk.ru/att/webpage-*
 http://engine.video-link.ru/*
+http://exler.ru/banners/*
 http://freshmac.ru*/banner_*
 http://freshmac.ru*_banner.*
 http://gamingpartners.org/*
@ -179,6 +192,7 @@ http://hypersearch.novoteka.ru/*
 http://i.udaff.com/image/*.swf
 http://lbn.podrobnosti.ua/*
 http://ifolder.ru/images/brs/*
+http://lol.bash.org.ru/*
 http://img.advesti.ru/*.gif
 http://img.sape.ru/bn/*
 http://instantcash.ru/ad/*
@ -202,6 +216,7 @@ http://partner.grand-casino.com/*
 http://partner.sotmarket.ru/*
 http://partners.autoweek.ru/*
 http://partners.livegames.ru/*
+http://partners.nikitaonline.ru/*
 http://pbid.iforex.com/*
 http://pics.rbc.ru*960
 http://pics.rbs.ru*_600
@ -249,6 +264,7 @@ http://zinio.imweb.ru/*
 *.radar.imgsmail.ru/*
 *.redtram.com/*
 *.rg.ru/rgrucounter.*
+*.ru/cnt/?*
 *.ru/counter?*
 *.ru/counters?*
 *.ru/stat/?*
@ -267,6 +283,7 @@ http://bs.yandex.ru/*
 http://c.domik.net/*
 http://c.hit.ua/*
 http://clicks.runews.radeant.com/*
+http://counter.promopark.ru/*
 http://counter.rambler.ru/*
 http://counter.spylog.com/*
 http://counter.top.am/*
@ -278,6 +295,7 @@ http://mcount.ru/*
 http://mixmarket.biz/*
 http://odnaknopka.ru/*
 http://pics.rbc.ru*/img.gif?_*
+http://stat.aft.ru/*
 http://stat.izvestia.ru/*
 http://stat.kffg.ru/*
 http://stat1.ukr.net/*
--- a/opera/urlfilter-stats.ini
+++ b/opera/urlfilter-stats.ini
@ -1,6 +1,6 @@
 # Fanboy's Stats list (Opera)
-# Checksum: x+FEsVynEiyQS8h32picww
-# Updated: 30 Apr 2010
+# Checksum: Ue4UPi1una8OWwVFpxEHaQ
+# Updated: 2 May 2010
 *-AdTracking.*
 *-seo-tracker.*
 *-statistiken.de/*
@ -333,6 +333,8 @@
 *.jstracker.*
 *.keynote.com/wt/*
 *.komtrack.com/*
+*.kosmix.com/images/mpv.txt?*
+*.kosmix.com/images/pv.txt?*
 *.latimes.com/pixel/*
 *.letsstat.nl/*
 *.libstat.com/*
@ -863,6 +865,7 @@
 */etracker.js
 */etracker/*
 */etrackercode*
+*/eu/ywa.js
 */eventTracker.js
 */EWTRACK_*
 */ewtrack_*
@ -998,6 +1001,7 @@
 */linotraffic.com/*
 */lloogg.com/*
 */log-view.*
+*/Log.ashx?*
 */log.jphp?*
 */log.php?*http*
 */log2.php?*
--- a/opera/urlfilter.ini
+++ b/opera/urlfilter.ini
@ -1,6 +1,6 @@
 # Fanboy's Adblock list (Opera)
-# Checksum: l3pi69v7VIU6NC/Gx/WTXw
-# Version: 024A Updated: 1 May 2010
+# Checksum: 75Aw0iXpA/h3uLnAjhdi9A
+# Version: 024A Updated: 2 May 2010
 # License: http://creativecommons.org/licenses/by/3.0/
 # Contact: mp3geek@gmail.com  http://fanboy.co.nz/adblock
 #
@ -81,6 +81,7 @@ prioritize excludelist=1
 *.adgitize.com/*
 *.adgoto.com/*
 *.adhese.be/*
+*.adhostingsolutions.com/*
 *.adicate.com/*
 *.adimise.com/*
 *.adinterax.*
@ -339,6 +340,7 @@ prioritize excludelist=1
 *.collarity.com*/ad_engine?*
 *.collective-media.*
 *.com/?wid=*
+*.com.au/banners/*
 *.com/a?network*
 *.com/a?pagetype*
 *.com/a?size*
@ -969,6 +971,7 @@ prioritize excludelist=1
 *.swf?BannerId*
 *.swf?iurl=http*
 *.swf?link1=http*
+*.swiftco.net/banner/*
 *.targetpoint.com/*
 *.targetsaver.*
 *.targetspot.com/player/*
@ -1320,7 +1323,7 @@ prioritize excludelist=1
 */adpeeps*
 */ADPictures/*
 */adpoint.*
-*/adpopup.php?*
+*/adpopup.*
 */AdPostInject*
 */adprotraffic.com/*
 */adproxy/*
@ -2377,6 +2380,7 @@ prioritize excludelist=1
 *_adshow.asp?*
 *_advert_vert*
 *_advertisement_*
+*_assets/ads/*
 *_blogads.*
 *_cedexis.*
 *_custom_ad.*
@ -2575,6 +2579,7 @@ prioritize excludelist=1
 http://*net.nuggad.net/*
 http://2*.v.fwmrm.net/ad/*
 http://209.172.55.5/*.js
+http://208.43.84.120/*
 http://4gifs.com/Ads/*
 http://69.31.136.5/funfun/s.php?*
 http://75.126.76.32/ads/
@ -2676,6 +2681,7 @@ http://advt.*
 http://adweb*
 http://aff-jp.*
 http://affil.mupromo.com/*
+http://affiliate.godaddy.com/redirect/*
 http://affiliates.market-ace.com/*
 http://affiliationcash.com/scripts/*
 http://aj.daniweb.com/servlet/*
@ -3061,6 +3067,7 @@ https://view.atdmt.*view/*
 */728x90b.*
 */728x90ban*
 */728x90c*
+*/728x90n*
 */750-100*
 */760x120_*
 */760x90_*