convert some 3rdparty elements over

2011-10-18 23:14:22 +13:00 · 2011-10-18 23:14:22 +13:00 · ea5d5d915b
commit ea5d5d915b
parent b05c0ee845
1 changed files with 321 additions and 328 deletions
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: i7fBLf44c06uviQlVMSmcw
+! Checksum: 1epViYfqJs3HDnmuXqUPLQ
 ! Fanboy's Adblock list
 ! Updated: 18 Oct 2011
 ! This list expires after 5 days
@ -886,6 +886,9 @@
 /adtaily_
 /adtaobao.
 /adtech-
+/adshare.
+/adtag.
+/adtech.
 /adtech.
 /adtech/*
 /ADTECH;
@ -2165,6 +2168,282 @@ images/ads/*
 ||adform.net^$third-party
 ||admanage.com^$third-party
 ||adprofit2share.com^$third-party
+||ru4.com^
+||194.71.107.25^$third-party
+||209.222.8.217^$third-party
+||174.142.194.177^$third-party
+||600z.com^$third-party
+||247realmedia.com^$third-party
+||64.20.60.123^$third-party
+||vsservers.net^$third-party
+||777seo.com^$third-party
+||a.giantrealm.com^$script
+||a.watershed-publishing.com^$third-party
+||a2dfp.net^$third-party
+||a433.com/delivery/
+||aaa.at4.info^$third-party
+||aaa.dv0.info^$third-party
+||abnad.net^$third-party
+||accmgr.com^$third-party
+||acronym.com^$third-party
+||ad-clicks.com^$third-party
+||ad-gbn.com^$third-party
+||ad-srv.net^$third-party
+||adserv.legitreviews.com^$third-party
+||ad.23blogs.com^$third-party
+||ad.aquamediadirect.com^$third-party
+||ad.flux.com^$third-party
+||ad.ghfusion.com^$third-party
+||ad.jamba.net^$third-party
+||ad.leadbolt.net^$third-party
+||ad.linkstorms.com^$third-party
+||ad.mygamesol.com^$third-party
+||ad.premiumonlinemedia.com^$third-party
+||ad.retargeter.com^$third-party
+||ad.sensismediasmart.com.au^$third-party
+||ad.sharethis.com^$third-party
+||ad.sponsoreo.com^$third-party
+||ad.valuecalling.com^$third-party
+||ad.viewablemedia.net^$third-party
+||ad.wsod.com^$third-party
+||z5x.net^$third-party
+||zanox.com^$third-party
+||ad20.net^$third-party
+||ad2games.com^$third-party
+||adaos-ads.net^$third-party
+||adap.tv/redir/plugins/banner/
+||adbard.net^$third-party
+||adbasket.net^$third-party
+||adblade.com^$third-party
+||adbrite.com^$third-party
+||adbull.com^$third-party
+||adbureau.net^$third-party
+||adbutler.com^$third-party
+||adcde.com^$third-party
+||magnetisemedia.com^$third-party
+||adcentriconline.com^$third-party
+||adclick.lv^$third-party
+||adcloud.net^$third-party
+||adcolo.com^$third-party
+||addiply.com^$third-party
+||addynamix.com^$third-party
+||adecn.com^$third-party
+||ademails.com^$third-party
+||adengage.com^$third-party
+||adf01.net^$third-party
+||adfrontiers.com^$third-party
+||adfusion.com^$third-party
+||adgardener.com^$third-party
+||adgear.com^$third-party
+||adgent007.com^$third-party
+||adgitize.com^$third-party
+||adglamour.net^$third-party
+||adgoto.com^$third-party
+||adhese.com^$third-party
+||adhostingsolutions.com^$third-party
+||adicate.com^$third-party
+||adimise.com^$third-party
+||adindigo.com^$third-party
+||adinsight.eu^$third-party
+||adshuffle.com^$third-party
+||adsinimages.com^$third-party
+||adinterax.com^$third-party
+||adiqglobal.com^$third-party
+||adisfy.com^$third-party
+||adisn.com^$third-party
+||adition.com^$third-party
+||adjal.com^$third-party
+||adjug.com^$third-party
+||adjuggler.com^$third-party
+||adjuggler.net^$third-party
+||adk2.com^$third-party
+||adknowledge.com^$third-party
+||adlandpro.com^$third-party
+||adlayer.net^$third-party
+||adlegend.com^$third-party
+||adlink.net^$third-party
+||adlisher.com^$third-party
+||adm.fwmrm.net^$object-subrequest,domain=ign.com
+||admagnet.net^$third-party
+||admarketplace.net^$third-party
+||admaya.in^$third-party
+||admedia.com^$third-party
+||admeld.com^$third-party
+||admeta.com^$third-party
+||admission.net^$third-party
+||admob.com^$third-party
+||admonkey.dapper.net^$third-party
+||admpads.com^$third-party
+||adn.ebay.com^$third-party
+||adnet-media.net^$third-party
+||adnxs.com^$third-party
+||adocean.pl^$third-party
+||adoptim.com^$third-party
+||adorika.com^$third-party
+||adotic.com^$third-party
+||adotomy.com^$third-party
+||adotube.com^$third-party
+||adpaths.com/_aspx/cpcinclude.aspx?
+||adperium.com^$third-party
+||adphreak.com^$third-party
+||adpinion.com^$third-party
+||adpremo.com^$third-party
+||adprs.net^$third-party
+||adready.com^$third-party
+||adrevolver.com^$third-party
+||adrocket.com^$third-party
+||adroll.com^$third-party
+||ads.adap.tv^$third-party
+||adhub.co.nz^$third-party
+||adonion.com^$third-party
+||adshopping.com^$third-party
+||ads.avitu.com.s3.amazonaws.com^$third-party
+||ads.advanceweb.com^$third-party
+||blogherads.com^$third-party
+||brainient.com^$third-party
+||ads.chango.ca^$third-party
+||ads.eagletribune.com^$third-party
+||exactdrive.com^$third-party
+||fb-plus.com^$third-party
+||footar.com^$third-party
+||ads.gravytrainproductions.com^$third-party
+||ads.greenerworldmedia.com^$third-party
+||ads.hearstmags.com^$third-party
+||ads.ireel.com^$third-party
+||ads.jetpackdigital.com^$third-party
+||ads.juicemobile.ca^$third-party
+||ads.kelbymediagroup.com^$third-party
+||ads.matchbin.com^$third-party
+||ads.mefeedia.com^$third-party
+||ads.mmania.com^$third-party
+||ads.mp.mydas.mobi^$third-party
+||ads.ncm.com^$third-party
+||ads.ncmsocial.com^$third-party
+||ads.netcommunities.com^$third-party
+||ads.newworld.com^$third-party
+||ads.ookla.com^$third-party
+||ads.over-blog.com^$third-party
+||ads.pof.com^$third-party
+||shoppingads.com^$third-party
+||ads.ruralpress.com^$third-party
+||rtbidder.net^$third-party
+||ads.sixapart.com^$third-party
+||socialreach.com^$third-party
+||ads.sup.com^$third-party
+||trafficspaces.net^$third-party
+||ads.undertone.com^$third-party
+||ads01.com^$third-party
+||ads4cheap.com^$third-party
+||adsbookie.com^$third-party
+||adsdk.com^$third-party
+||adse-2.liverail.com^$third-party
+||adsensecamp.com^$third-party
+||adserve.com^$third-party
+||adserve.ph^$third-party
+||adserverplus.com^$third-party
+||adserverpub.com^$third-party
+||adservinginternational.com^$third-party
+||adsfac.eu^$third-party
+||adsfac.net^$third-party
+||adsfac.us^$third-party
+||adsfactor.net^$third-party
+||adsfast.com^$third-party
+||adsmarket.com^$third-party
+||adsmoon.com^$third-party
+||adsnext.net^$third-party
+||adsonar.com^$third-party
+||adspring.to^$third-party
+||adsrevenue.net^$third-party
+||adsrvr.org^$third-party
+||adsummos.net^$third-party
+||adswizz.com^$third-party
+||adtaily.com^$third-party
+||adtech.de^$third-party
+||adtechus.com^$third-party
+||adtegrity.net^$third-party
+||adteractive.com^$third-party
+||adtology2.com^$third-party
+||adtology3.com^$third-party
+||adtoma.com^$third-party
+||adtrgt.com^$third-party
+||adtwirl.com^$third-party
+||adulttds.com^$third-party
+||adurr.com^$third-party
+||adversalservers.com^$third-party
+||adverserve.net^$third-party
+||adverticum.net^$third-party
+||advertisespace.com^$third-party
+||advertiseyourgame.com^$third-party
+||advertising.com^$third-party
+||advertising365.com^$third-party
+||advertisingiq.com^$third-party
+||advertisingvalue.info^$third-party
+||advertlets.com^$third-party
+||advertrev.com^$third-party
+||advertserve.com^$third-party
+||advertstatic.com^$third-party
+||advertstream.com^$third-party
+||advg.jp^$third-party
+||adviva.net^$third-party
+||advpoints.com^$third-party
+||adwires.com^$third-party
+||adxpansion.com^$third-party
+||adxpose.com^$third-party
+||adzerk.net^$third-party
+||adzmob.com^$third-party
+||adzonk.com^$third-party
+||afcyhf.com^$third-party
+||afdads.com^$third-party
+||aff.biz^$third-party
+||affbot1.com^$third-party
+||affbot3.com^$third-party
+||affbot7.com^$third-party
+||affbot8.com^$third-party
+||affil.mupromo.com^$third-party
+||affiliate-gate.com^$third-party
+||affiliateer.com^$third-party
+||affiliatelounge.com^$third-party
+||affiliates.homestead.com^$third-party
+||affiliates.picaboocorp.com^$third-party
+||affiliates.ticketnetwork.com^$third-party
+||affiliationcash.com^$third-party
+||affiliproducts.com^$third-party
+||affiliserve.com^$third-party
+||affinity.com^$third-party
+||affiz.net^$third-party
+||alphagodaddy.com^$third-party
+||alternads.info^$third-party
+||affplanet.com^$third-party
+||afterdownload.com^$third-party
+||afy11.net^$third-party
+||aglocobanners.com^$third-party
+||alimama.com^$third-party
+||allyes.com^$third-party
+||amazon.com/widgets/
+||amgdgt.com^$third-party
+||amobee.com^$third-party
+||ampxchange.com^$third-party
+||anchorfree.net^$third-party
+||angege.com^$third-party
+||anrdoezrs.net^$third-party
+||apmebf.com^$third-party
+||apple.com/itunesaffiliates/
+||arcadebanners.com^$third-party
+||assetize.com^$third-party
+||athena-ads.wikia.com^$third-party
+||atrinsic.com^$third-party
+||atwola.com^$third-party
+||au2m8.com^$third-party
+||auditude.com^$third-party
+||avads.co.uk^$third-party
+||avazutracking.net^$third-party
+||awin1.com^$third-party
+||awltovhc.com^$third-party
+||awsurveys.com^$third-party
+||axf8.net^$third-party
+||axill.com^$third-party
+||azjmp.com^$third-party
+||azoogleads.com^$third-party
 ||adscendmedia.com^$third-party
 ||adtransfer.net^$third-party
 ||affiliate.juno.co.uk^$third-party
@ -2442,6 +2721,47 @@ images/ads/*
 ||akipress.com/_ban/
 ||vidds.net/pads*.js
 ||akipress.org/ban/
+||4chan.org/support/
+||a.thefreedictionary.com^
+||ad-apac.doubleclick.net/adx/
+||ad-emea.doubleclick.net^$~object-subrequest
+||ad.*doubleclick.net/adx/
+||ad.au.doubleclick.net/ad
+||ad.be.doubleclick.net/ad/
+||ad.ca.doubleclick.net^$~object-subrequest
+||ad.doubleclick.net/ad/
+||ads.msn-int.com^
+||ad.doubleclick.net/clk
+||ads.worldgolf.com^
+||ads.yimg.com^
+||ad.doubleclick.net/crossdomain.xml$domain=colbertnation.com|thedailyshow.com|slatev.com
+||ad.doubleclick.net/n
+||ad.doubleclick.net/pfadx/
+||ad.uk.doubleclick.net/ad/
+||ads.abovetopsecret.com^
+||addirector.vindicosuite.com^
+||adsipl.indiatimes.com^
+||au.doubleclick.net/adx/
+||ad.e-kolay.net^
+||ads.nzcity.co.nz^
+||ads.foxnews.com/api/
+||ads.sina.com^
+||ads.com.com^
+||ad.jamster.com^
+||ads.aol.co.uk^
+||ads.sharenator.com^
+||ads.raidrush.org^
+||ads.readwriteweb.com^
+||ads.returnpath.net^
+||adlog.com.com^
+||ads.flameload.com^
+||ad.ie.doubleclick.net/pfadx/
+||ad.es.doubleclick.net^*/adi/
+||ad.fnnews.com^
+||ad.nz.doubleclick.net/pfadx/
+||ad.za.doubleclick.net/ad/
+||ad.pandora.tv^
+||ad.pt.doubleclick.net/pfadx/
 ||allhiphop.com/site_resources/ui-images/*-conduit-banner.gif
 ||allmovieportal.com/dynbanner.
 ||alternet.org/givememygfp.
@ -2818,333 +3138,6 @@ images/ads/*
 !     
 ! ---------- General blocking rules ----------
 !     
-.ru4.com/
-||174.142.194.177^*.aspx?
-||194.71.107.25^
-||209.222.8.217^
-||247realmedia.com^
-||4chan.org/support/
-||600z.com^
-||64.20.60.123/userbanners/
-||7121.vsservers.net^
-||777seo.com^
-||a.giantrealm.com^$script
-||a.thefreedictionary.com^
-||a.watershed-publishing.com^
-||a2dfp.net^
-||a433.com/delivery/
-||aaa.at4.info^
-||aaa.dv0.info^
-||abnad.net^
-||accmgr.com^
-||acronym.com^
-||ad-apac.doubleclick.net/adx/
-||ad-clicks.com^
-||ad-emea.doubleclick.net^$~object-subrequest
-||ad-gbn.com^
-||ad-srv.net^
-||adserv.legitreviews.com^
-||ad.*doubleclick.net/adx/
-||ad.23blogs.com^
-||ad.aquamediadirect.com^
-||ad.au.doubleclick.net/ad
-||ad.be.doubleclick.net/ad/
-||ad.ca.doubleclick.net^$~object-subrequest
-||ad.doubleclick.net/ad/
-||ad.doubleclick.net/clk
-||ad.doubleclick.net/crossdomain.xml$domain=colbertnation.com|thedailyshow.com|slatev.com
-||ad.doubleclick.net/n
-||ad.doubleclick.net/pfadx/
-||ad.e-kolay.net^
-||ad.es.doubleclick.net^*/adi/
-||ad.flux.com^
-||ad.fnnews.com^
-||ad.ghfusion.com^
-||ad.ie.doubleclick.net/pfadx/
-||ad.jamba.net^
-||ad.jamster.com^
-||ad.leadbolt.net^
-||ad.linkstorms.com^
-||ad.mygamesol.com^
-||ad.nz.doubleclick.net/pfadx/
-||ad.pandora.tv^
-||ad.premiumonlinemedia.com^
-||ad.pt.doubleclick.net/pfadx/
-||ad.retargeter.com^
-||ad.sensismediasmart.com.au^
-||ad.sharethis.com^
-||ad.sponsoreo.com^
-||ad.uk.doubleclick.net/ad/
-||ad.valuecalling.com^
-||ad.viewablemedia.net^
-||ad.wsod.com^
-||ad.z5x.net^
-||ad.za.doubleclick.net/ad/
-||ad.zanox.com^
-||ad20.net/
-||ad2games.com^
-||adaos-ads.net^
-||adap.tv/redir/plugins/banner/
-||adbard.net^
-||adbasket.net^
-||adblade.com^
-||adbrite.com^
-||adbull.com^
-||adbureau.net^
-||adbutler.com^
-||adcde.com^
-||adcentre.magnetisemedia.com^
-||adcentriconline.com^
-||adclick.lv^
-||adcloud.net^
-||adcolo.com^
-||addiply.com^
-||addirector.vindicosuite.com^
-||addynamix.com^
-||adecn.com^
-||ademails.com^
-||adengage.com^
-||adf01.net^
-||adfrontiers.com^
-||adfusion.com^
-||adgardener.com^
-||adgear.com^
-||adgent007.com^
-||adgitize.com^
-||adglamour.net^
-||adgoto.com^
-||adhese.com^
-||adhostingsolutions.com^
-||adicate.com^
-||adimise.com^
-||adindigo.com^
-||adinsight.eu^
-||adinterax.com^
-||adiqglobal.com^
-||adisfy.com^
-||adisn.com^
-||adition.com^
-||adjal.com^
-||adjet.wzdwidget.com^
-||adjug.com^
-||adjuggler.com^
-||adjuggler.net^
-||adk2.com^
-||adknowledge.com^
-||adlandpro.com^
-||adlayer.net^
-||adlegend.com^
-||adlink.net^
-||adlisher.com^
-||adlog.com.com^
-||adm.fwmrm.net^$object-subrequest,domain=ign.com
-||admagnet.net^
-||admarketplace.net^
-||admaya.in^
-||admedia.com^
-||admeld.com^
-||admeta.com^
-||admission.net^
-||admob.com^
-||admonkey.dapper.net^
-||admpads.com^
-||adn.ebay.com^
-||adnet-media.net^
-||adnxs.com^
-||adocean.pl^
-||adoptim.com^
-||adorika.com^
-||adotic.com^
-||adotomy.com^
-||adotube.com^
-||adpaths.com/_aspx/cpcinclude.aspx?
-||adperium.com^
-||adphreak.com^
-||adpinion.com^
-||adpremo.com^
-||adprs.net^
-||adready.com^
-||adrevolver.com^
-||adrocket.com^
-||adroll.com^
-||ads.abovetopsecret.com^
-||ads.adap.tv^
-||ads.adhub.co.nz^
-||ads.adonion.com^
-||ads.adshopping.com^
-||ads.advanceweb.com^
-||ads.aol.co.uk^
-||ads.avitu.com.s3.amazonaws.com^
-||ads.blogherads.com^
-||ads.brainient.com^
-||ads.chango.ca^
-||ads.com.com^
-||ads.digitalpoint.com^
-||ads.eagletribune.com^
-||ads.exactdrive.com^
-||ads.fb-plus.com^
-||ads.flameload.com^
-||ads.footar.com^
-||ads.foxnews.com/api/
-||ads.gravytrainproductions.com^
-||ads.greenerworldmedia.com^
-||ads.hearstmags.com^
-||ads.heias.com^
-||ads.ireel.com^
-||ads.jetpackdigital.com^
-||ads.juicemobile.ca^
-||ads.kelbymediagroup.com^
-||ads.matchbin.com^
-||ads.mefeedia.com^
-||ads.mmania.com^
-||ads.mp.mydas.mobi^
-||ads.msn-int.com^
-||ads.ncm.com^
-||ads.ncmsocial.com^
-||ads.netcommunities.com^
-||ads.newworld.com^
-||ads.nzcity.co.nz^
-||ads.ookla.com^
-||ads.over-blog.com^
-||ads.pof.com^
-||ads.raidrush.org^
-||ads.readwriteweb.com^
-||ads.resellerratings.com^
-||ads.returnpath.net^
-||ads.rtbidder.net^
-||ads.ruralpress.com^
-||ads.scribefire.com^
-||ads.sharenator.com^
-||ads.shoppingads.com^
-||ads.sina.com^
-||ads.sixapart.com^
-||ads.socialreach.com^
-||ads.sup.com^
-||ads.techhamlet.com^
-||ads.trafficspaces.net^
-||ads.undertone.com^
-||ads.worldgolf.com^
-||ads.yimg.com^
-||ads01.com^
-||ads4cheap.com^
-||adsbookie.com^
-||adsdk.com^
-||adse-2.liverail.com^
-||adsensecamp.com^
-||adserve.com^
-||adserve.ph^
-||adserverplus.com^
-||adserverpub.com^
-||adservinginternational.com^
-||adsfac.eu^
-||adsfac.net^
-||adsfac.us^
-||adsfactor.net^
-||adsfast.com^
-||adshare.freedocast.com^
-||adshuffle.com^
-||adsinimages.com^
-||adsipl.indiatimes.com^
-||adsmarket.com^
-||adsmoon.com^
-||adsnext.net^
-||adsonar.com^
-||adspring.to^
-||adsrevenue.net^
-||adsrvr.org^
-||adsummos.net^
-||adswizz.com^
-||adtag.asiaone.com^
-||adtaily.com^
-||adtech.de^
-||adtech.panthercustomer.com^
-||adtechus.com^
-||adtegrity.net^
-||adteractive.com^
-||adtology2.com^
-||adtology3.com^
-||adtoma.com^
-||adtrgt.com^
-||adtwirl.com^
-||adulttds.com^
-||adurr.com^
-||adversalservers.com^
-||adverserve.net^
-||adverticum.net^
-||advertisespace.com^
-||advertiseyourgame.com^
-||advertising.com^
-||advertising365.com^
-||advertisingiq.com^
-||advertisingvalue.info^
-||advertlets.com^
-||advertrev.com^
-||advertserve.com^
-||advertstatic.com^
-||advertstream.com^
-||advg.jp^
-||adviva.net^
-||advpoints.com^
-||adwires.com^
-||adxpansion.com^
-||adxpose.com^
-||adzerk.net^
-||adzmob.com^
-||adzonk.com^
-||afcyhf.com^
-||afdads.com^
-||aff.biz/images/banners/
-||affbot1.com^
-||affbot3.com^
-||affbot7.com^
-||affbot8.com^
-||affil.mupromo.com^
-||affiliate-gate.com^
-||affiliateer.com^
-||affiliatelounge.com^
-||affiliates.homestead.com^
-||affiliates.picaboocorp.com^
-||affiliates.ticketnetwork.com^
-||affiliationcash.com^
-||affiliproducts.com^
-||affiliserve.com^
-||affinity.com^
-||affiz.net^
-||affplanet.com^
-||afterdownload.com^
-||afy11.net^
-||aglocobanners.com^
-||alimama.com^
-||allyes.com^
-||alphagodaddy.com^
-||alternads.info^
-||amazon.com/widgets/
-||amgdgt.com^
-||amobee.com^
-||ampxchange.com^
-||anchorfree.net^
-||angege.com^
-||anrdoezrs.net^
-||apmebf.com^
-||appbodega.com/Promos/
-||apple.com/itunesaffiliates/
-||arcadebanners.com^
-||assetize.com^
-||athena-ads.wikia.com^
-||atrinsic.com^
-||atwola.com^
-||au.doubleclick.net/adx/
-||au2m8.com^
-||auditude.com^
-||avads.co.uk^
-||avazutracking.net^
-||awin1.com^
-||awltovhc.com^
-||awsurveys.com^
-||axf8.net^
-||axill.com^
-||azjmp.com^
-||azoogleads.com^
 ||b92.putniktravel.com^
 ||banman.isoftmarketing.com^
 ||banner-clix.com^