diff --git a/assets/checksums.txt b/assets/checksums.txt index f88f8d84f..b65baac22 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -1,12 +1,12 @@ 538211a2228745b51b615b1b245cf99e assets/ublock/unbreak.txt 62111a29f0a5cb361ba8dbae92054adb assets/ublock/redirect-resources.txt 67590d6837f8cbd72a57e660da196e2e assets/ublock/privacy.txt -e33bcf90f9ff0f56ebe0d6f22c6583d9 assets/ublock/filters.txt +dfb7ad1b4767e1d1b578ee01f2c3449e assets/ublock/filters.txt 146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt 12b0660eebed61255fc67ad185dfd4e8 assets/ublock/experimental.txt -5f38a79aa8063d98f7e5316068fa05f0 assets/ublock/resources.txt -fd3bf1065012191e032f81468de43e09 assets/ublock/filter-lists.json +4fdcea3a4c1de893519b8d9d617d73b1 assets/ublock/resources.txt +da933e11b965eba2f3928ea6d5d979ce assets/ublock/filter-lists.json 3605c73f21abca428c7eb69a8bc32dfe assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt a91af77c47c302c0741c7445b0fada1a assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt 7f0443f3dcc9abfd47cfbc95ce824ddb assets/thirdparties/mirror1.malwaredomains.com/files/README.md diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json index 86c0fce78..3600cbc0c 100644 --- a/assets/ublock/filter-lists.json +++ b/assets/ublock/filter-lists.json @@ -57,6 +57,18 @@ "lang": "zh", "supportURL": "http://abpchina.org/forum/forum.php" }, + "https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt": { + "off": true, + "title": "CHN: CJX's EasyList Lite (main focus on Chinese sites)", + "group": "regions", + "supportURL": "https://github.com/cjx82630/cjxlist" + }, + "https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjx-annoyance.txt": { + "off": true, + "title": "CHN: CJX's Annoyance List", + "group": "regions", + "supportURL": "https://github.com/cjx82630/cjxlist" + }, "https://easylist-downloads.adblockplus.org/easylistdutch.txt": { "off": true, "title": "NLD: EasyList Dutch", @@ -237,12 +249,6 @@ "lang": "he", "supportURL": "https://github.com/AdBlockPlusIsrael/EasyListHebrew" }, - "https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt": { - "off": true, - "title": "CHN: China: cjxlist (main focus on Chinese sites)", - "group": "regions", - "supportURL": "https://github.com/cjx82630/cjxlist" - }, "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt": { "off": true, "title": "Anti-Adblock Killer | Reek", diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt index a22aa3b46..e80d45c49 100644 --- a/assets/ublock/filters.txt +++ b/assets/ublock/filters.txt @@ -233,7 +233,7 @@ skystreaming.net###fanback + style + div[id] 1erforum.de,20min.ch,abendzeitung-muenchen.de,allgemeine-zeitung.de,arcor.de,ariva.de,auto-motor-und-sport.de,autoextrem.de,boerse-online.de,buerstaedter-zeitung.de,computerbild.de,comunio.de,echo-online.de,fanfiktion.de,fem.com,finanzen.net,focus.de,foot01.com,gamestar.de,gelnhaeuser-tageblatt.de,general-anzeiger-bonn.de,giessener-anzeiger.de,hochheimer-zeitung.de,hofheimer-zeitung.de,kabeleins.de,kreis-anzeiger.de,lampertheimer-zeitung.de,lauterbacher-anzeiger.de,lpgforum.de,lustich.de,main-spitze.de,motorradonline.de,notebookcheck.net,oberhessische-zeitung.de,pcwelt.de,prosieben.de,prosiebenmaxx.de,rhein-main-presse.de,rp-online.de,runnersworld.de,sat1.de,sat1gold.de,serienjunkies.de,sixx.de,spiegel.de,spox.com,shz.de,teccentral.de,the-voice-of-germany.de,transfermarkt.de,tvspielfilm.de,tvtoday.de,usinger-anzeiger.de,webfail.com,wetter.com,wetteronline.at,wetteronline.de,wiesbadener-kurier.de,wiesbadener-tagblatt.de,wn.de,wormser-zeitung.de##script:inject(uabinject-defuser.js) # Yavli ads -activistpost.com,addictinginfo.org,alfonzorachel.com,allenwestrepublic.com,aplus.com,bizpacreview.com,breathecast.com,bulletsfirst.net,clashdaily.com,comicallyincorrect.com,conservativebyte.com,conservativeintel.com,conservativetribune.com,conservativevideos.com,cowboybyte.com,crossmap.com,dailysurge.com,dccrimestories.com,drhotze.com,explosm.net,flexonline.com,genfringe.com,girlsjustwannahaveguns.com,hellou.co.uk,instigatornews.com,joeforamerica.com,latinpost.com,libertyunyielding.com,mensfitness.com,minutemennews.com,mobilelikez.com,muscleandfitness.com,naturalblaze.com,oddee.com,okmagazine.com,patriotoutdoornews.com,pitgrit.com,radaronline.com,redmaryland.com,reverbpress.com,rightwingnews.com,segmentnext.com,shark-tank.com,sportsmole.co.uk,theblacksphere.net,thefreethoughtproject.com,thegatewaypundit.com,themattwalshblog.com,thepoke.co.uk,tinypic.com,unilad.co.uk,valuewalk.com,vcpost.com,victoriajackson.com,viralnova.com,viralthread.com##script:inject(yavli-defuser.js) +activistpost.com,addictinginfo.org,alfonzorachel.com,allenwestrepublic.com,aplus.com,bizpacreview.com,boredpanda.com,breathecast.com,bulletsfirst.net,clashdaily.com,comicallyincorrect.com,conservativebyte.com,conservativeintel.com,conservativetribune.com,conservativevideos.com,cowboybyte.com,crossmap.com,dailysurge.com,dccrimestories.com,drhotze.com,explosm.net,flexonline.com,genfringe.com,girlsjustwannahaveguns.com,hellou.co.uk,instigatornews.com,joeforamerica.com,latinpost.com,libertyunyielding.com,mensfitness.com,minutemennews.com,mobilelikez.com,muscleandfitness.com,naturalblaze.com,oddee.com,okmagazine.com,patriotoutdoornews.com,pitgrit.com,radaronline.com,redmaryland.com,reverbpress.com,rightwingnews.com,segmentnext.com,shark-tank.com,sportsmole.co.uk,theblacksphere.net,thefreethoughtproject.com,thegatewaypundit.com,themattwalshblog.com,thepoke.co.uk,tinypic.com,unilad.co.uk,valuewalk.com,vcpost.com,victoriajackson.com,viralnova.com,viralthread.com##script:inject(yavli-defuser.js) # https://github.com/gorhill/uBlock/issues/1094 extremetube.com,pornhub.com,primewire.*,redtube.*,spankwire.com,tube8.*,youporn.com,youporngay.com##script:inject(pornhub-popup-defuser.js) diff --git a/assets/ublock/resources.txt b/assets/ublock/resources.txt index 8f8de0d35..294d7c40e 100644 --- a/assets/ublock/resources.txt +++ b/assets/ublock/resources.txt @@ -409,7 +409,7 @@ yavli-defuser.js application/javascript Object.defineProperty(window, '__lturl', nourl); } catch (ex) { } - var aa = ['_x','_y','_z','pz','xz','zp','zx','zy']; + var aa = ['_x','_y','_z','pz','xz','yz','zp','zx','zy']; var no = { set: noopfn, get: function() { @@ -725,3 +725,23 @@ bcplayer-defuser.js application/javascript } }); })(); + + +# Foil attempts at javascript-based redirects +redirect-defuser.js application/javascript +(function() { + var noopfn = function() { + ; + }; + window.location.assign = window.location.replace = noopfn; + var href = window.location.href; + try { + Object.defineProperty(window.location, 'href', { + get: function() { + return href; + }, + set: noopfn + }); + } catch(ex) { + } +})();