From 9b784c085851a6652fcf0b4d8987fe30f5580fce Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 13 Sep 2019 11:51:58 +0200 Subject: [PATCH] I just knew this would come back to bite me one day, part 3/3 As per #44. --- .../AdawayHosts | 11 +-- .../DandelionSproutsNorskeFiltre.tpl | 13 +--- .../LittleSnitchNorwegianList.lsrules | 9 --- .../NordicFiltersABP.txt | 13 +--- .../NordicFiltersAdGuard.txt | 17 +---- .../NordicFiltersDnsmasq.conf | 9 --- .../NordicFiltersHostsDeny.deny | 11 +-- .../NordicFiltersPrivacy.txt | 19 ++--- .../NordicFiltersPrivoxy.action | 13 +--- .../XYZPrepareFilters.py | 74 ++++++++++++++++++- 10 files changed, 90 insertions(+), 99 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/AdawayHosts b/NorwegianExperimentalList alternate versions/AdawayHosts index c77816839..fd6cd67a2 100644 --- a/NorwegianExperimentalList alternate versions/AdawayHosts +++ b/NorwegianExperimentalList alternate versions/AdawayHosts @@ -1,6 +1,6 @@ # Title: Dandelion Sprouts nordiske filtre («hosts»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts» file version) -# Version: 03September2019v1 +# Version: 13September2019v1 # Description: This is a slimmer version of "Dandelion Sprout's Nordic Filters", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers. # Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including Blokada, DNS66, Gas Mask, Diversion, and many others; as well as those who edit their OS' «hosts» system file. # For mere informasjon og detaljer om denne listen og om andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk @@ -26,7 +26,6 @@ 127.0.0.1 allergyfl.com 127.0.0.1 apcleverstore.com 127.0.0.1 apvoc-ga.com -127.0.0.1 arendalfotball.no 127.0.0.1 arvetellefsen.no 127.0.0.1 ashskonorge.com 127.0.0.1 assassinfitness.com @@ -40,11 +39,9 @@ 127.0.0.1 bncentertainment.com 127.0.0.1 boligkanalen-maestro-new.azurewebsites.net 127.0.0.1 bostongrnhsflowers.com -127.0.0.1 brannloftet.no 127.0.0.1 breakoutstory24.com 127.0.0.1 breakoutstory24.com 127.0.0.1 brightertrade.com -127.0.0.1 butikk.losnaspelet.no 127.0.0.1 caperforaciones.com 127.0.0.1 charpente-ramel.com 127.0.0.1 cluster.chart.dk @@ -74,7 +71,6 @@ 127.0.0.1 euroads.dk 127.0.0.1 euroads.no 127.0.0.1 eurosko.net -127.0.0.1 fanadyreklinikk.no 127.0.0.1 fatalfailblog.com 127.0.0.1 festmusikk.com 127.0.0.1 forum1.no @@ -85,7 +81,6 @@ 127.0.0.1 godsfillingstation.org 127.0.0.1 gokkw.com 127.0.0.1 gsport.com -127.0.0.1 handelihalden.no 127.0.0.1 helseprodukt.co 127.0.0.1 hernoclothing.com 127.0.0.1 hollisternorge.com @@ -103,7 +98,6 @@ 127.0.0.1 joseph-holland.com 127.0.0.1 kjolenorge.com 127.0.0.1 klmyu.com -127.0.0.1 komtilmil.no 127.0.0.1 kundklubb-se.com 127.0.0.1 legarralazcoz.com 127.0.0.1 lillevinkelsko.net @@ -146,7 +140,6 @@ 127.0.0.1 omgrm.com 127.0.0.1 ontariokitcarbuilders.com 127.0.0.1 openadex.dk -127.0.0.1 oyelege.no 127.0.0.1 parajumperjakke.net 127.0.0.1 parajumpers-longbear.com 127.0.0.1 parajumpers-norge.site @@ -181,7 +174,6 @@ 127.0.0.1 skonmdnorge.com 127.0.0.1 ssrodeolivestock.com 127.0.0.1 static.itrack.it -127.0.0.1 streetdance.no 127.0.0.1 swellsup.com 127.0.0.1 sykkeltrøye.com 127.0.0.1 testgruppens.com @@ -197,7 +189,6 @@ 127.0.0.1 um-bs.com 127.0.0.1 userneeds.dk 127.0.0.1 vansnorge.com -127.0.0.1 vetscan.no 127.0.0.1 vevlysingar.fo 127.0.0.1 wausauorthopedics.com 127.0.0.1 webclick.no diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 207a25cc3..391bd8158 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,6 +1,6 @@ msFilterList -# Version: 08September2019v1-Beta -# Version: 080920191 (for Adblock Plus' issue report system) +# Version: 13September2019v1-Beta +# Version: 130920191 (for Adblock Plus' issue report system) # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -247,21 +247,12 @@ contentMarketing -d norwayexpress24.com -d prisjakt.org -d postnord-norge.com --d streetdance.no -d 102.112.2o7.net --d vetscan.no -d tromselementbygg.no --d brannloftet.no --d butikk.losnaspelet.no -d no.zxxyw.com --d oyelege.no --d fanadyreklinikk.no -d digitoday.com --d komtilmil.no -d apple-account-locked.losjevegen.no --d arendalfotball.no -d arvetellefsen.no curry --d handelihalden.no -d holmedalblikk.no - dnb11111 -d nymelding.com diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index 325457f66..141c5a50c 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -22,7 +22,6 @@ { "action": "deny", "process": "any", "remote-hosts": "allergyfl.com" }, { "action": "deny", "process": "any", "remote-hosts": "apcleverstore.com" }, { "action": "deny", "process": "any", "remote-hosts": "apvoc-ga.com" }, -{ "action": "deny", "process": "any", "remote-hosts": "arendalfotball.no" }, { "action": "deny", "process": "any", "remote-hosts": "arvetellefsen.no" }, { "action": "deny", "process": "any", "remote-hosts": "ashskonorge.com" }, { "action": "deny", "process": "any", "remote-hosts": "assassinfitness.com" }, @@ -36,11 +35,9 @@ { "action": "deny", "process": "any", "remote-hosts": "bncentertainment.com" }, { "action": "deny", "process": "any", "remote-hosts": "boligkanalen-maestro-new.azurewebsites.net" }, { "action": "deny", "process": "any", "remote-hosts": "bostongrnhsflowers.com" }, -{ "action": "deny", "process": "any", "remote-hosts": "brannloftet.no" }, { "action": "deny", "process": "any", "remote-hosts": "breakoutstory24.com" }, { "action": "deny", "process": "any", "remote-hosts": "breakoutstory24.com" }, { "action": "deny", "process": "any", "remote-hosts": "brightertrade.com" }, -{ "action": "deny", "process": "any", "remote-hosts": "butikk.losnaspelet.no" }, { "action": "deny", "process": "any", "remote-hosts": "caperforaciones.com" }, { "action": "deny", "process": "any", "remote-hosts": "charpente-ramel.com" }, { "action": "deny", "process": "any", "remote-hosts": "cluster.chart.dk" }, @@ -70,7 +67,6 @@ { "action": "deny", "process": "any", "remote-hosts": "euroads.dk" }, { "action": "deny", "process": "any", "remote-hosts": "euroads.no" }, { "action": "deny", "process": "any", "remote-hosts": "eurosko.net" }, -{ "action": "deny", "process": "any", "remote-hosts": "fanadyreklinikk.no" }, { "action": "deny", "process": "any", "remote-hosts": "fatalfailblog.com" }, { "action": "deny", "process": "any", "remote-hosts": "festmusikk.com" }, { "action": "deny", "process": "any", "remote-hosts": "forum1.no" }, @@ -81,7 +77,6 @@ { "action": "deny", "process": "any", "remote-hosts": "godsfillingstation.org" }, { "action": "deny", "process": "any", "remote-hosts": "gokkw.com" }, { "action": "deny", "process": "any", "remote-hosts": "gsport.com" }, -{ "action": "deny", "process": "any", "remote-hosts": "handelihalden.no" }, { "action": "deny", "process": "any", "remote-hosts": "helseprodukt.co" }, { "action": "deny", "process": "any", "remote-hosts": "hernoclothing.com" }, { "action": "deny", "process": "any", "remote-hosts": "hollisternorge.com" }, @@ -99,7 +94,6 @@ { "action": "deny", "process": "any", "remote-hosts": "joseph-holland.com" }, { "action": "deny", "process": "any", "remote-hosts": "kjolenorge.com" }, { "action": "deny", "process": "any", "remote-hosts": "klmyu.com" }, -{ "action": "deny", "process": "any", "remote-hosts": "komtilmil.no" }, { "action": "deny", "process": "any", "remote-hosts": "kundklubb-se.com" }, { "action": "deny", "process": "any", "remote-hosts": "legarralazcoz.com" }, { "action": "deny", "process": "any", "remote-hosts": "lillevinkelsko.net" }, @@ -142,7 +136,6 @@ { "action": "deny", "process": "any", "remote-hosts": "omgrm.com" }, { "action": "deny", "process": "any", "remote-hosts": "ontariokitcarbuilders.com" }, { "action": "deny", "process": "any", "remote-hosts": "openadex.dk" }, -{ "action": "deny", "process": "any", "remote-hosts": "oyelege.no" }, { "action": "deny", "process": "any", "remote-hosts": "parajumperjakke.net" }, { "action": "deny", "process": "any", "remote-hosts": "parajumpers-longbear.com" }, { "action": "deny", "process": "any", "remote-hosts": "parajumpers-norge.site @@ -177,7 +170,6 @@ { "action": "deny", "process": "any", "remote-hosts": "skonmdnorge.com" }, { "action": "deny", "process": "any", "remote-hosts": "ssrodeolivestock.com" }, { "action": "deny", "process": "any", "remote-hosts": "static.itrack.it" }, -{ "action": "deny", "process": "any", "remote-hosts": "streetdance.no" }, { "action": "deny", "process": "any", "remote-hosts": "swellsup.com" }, { "action": "deny", "process": "any", "remote-hosts": "sykkeltrøye.com" }, { "action": "deny", "process": "any", "remote-hosts": "testgruppens.com" }, @@ -193,7 +185,6 @@ { "action": "deny", "process": "any", "remote-hosts": "um-bs.com" }, { "action": "deny", "process": "any", "remote-hosts": "userneeds.dk" }, { "action": "deny", "process": "any", "remote-hosts": "vansnorge.com" }, -{ "action": "deny", "process": "any", "remote-hosts": "vetscan.no" }, { "action": "deny", "process": "any", "remote-hosts": "vevlysingar.fo" }, { "action": "deny", "process": "any", "remote-hosts": "wausauorthopedics.com" }, { "action": "deny", "process": "any", "remote-hosts": "webclick.no" }, diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index b35a0e72f..a68435682 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,6 +1,6 @@ [Adblock Plus 3.4] -! Version: 08September2019v1 -! Version: 080920191 (for Adblock Plus' issue report system) +! Version: 13September2019v1 +! Version: 130920191 (for Adblock Plus' issue report system) ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -905,21 +905,12 @@ fuglelyder.net#@##banner_ad ||norwayexpress24.com^ ||prisjakt.org^ ||postnord-norge.com^ -||streetdance.no^ ||102.112.2o7.net^ -||vetscan.no^ ||tromselementbygg.no^ -||brannloftet.no^ -||butikk.losnaspelet.no^ ||no.zxxyw.com^ -||oyelege.no^ -||fanadyreklinikk.no^ ||digitoday.com^ -||komtilmil.no^ ||apple-account-locked.losjevegen.no^ -||arendalfotball.no^ ||arvetellefsen.no/curry^ -||handelihalden.no^ ||holmedalblikk.no^ ||vipps-sikkerhet.*^ ||*/dnb11111/^ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 80c66193f..1244e4c2e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,5 +1,5 @@ [AdGuard ≥6] -! Version: 08September2019v1 +! Version: 13September2019v1 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) @@ -962,22 +962,13 @@ fuglelyder.net#@##banner_ad ||norwayexpress24.com^empty,important ||prisjakt.org^empty,important ||postnord-norge.com^empty,important -||streetdance.no^ ||102.112.2o7.net^empty,important -||vetscan.no^ -||tromselementbygg.no^ -||brannloftet.no^ -||butikk.losnaspelet.no^ +||tromselementbygg.no^empty,important ||no.zxxyw.com^ -||oyelege.no^ -||fanadyreklinikk.no^ ||digitoday.com^empty,important -||komtilmil.no^ ||apple-account-locked.losjevegen.no^empty,important -||arendalfotball.no^ -||arvetellefsen.no/curry^ -||handelihalden.no^ -||holmedalblikk.no^ +||arvetellefsen.no/curry^empty,important +||holmedalblikk.no^empty,important ||vipps-sikkerhet.*^empty,important ||*/dnb11111/^empty,important ||nymelding.com^empty,important diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf index bc974d58e..6df649eca 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf @@ -19,7 +19,6 @@ address=/airmaxskobillige.com/127.0.0.1 address=/allergyfl.com/127.0.0.1 address=/apcleverstore.com/127.0.0.1 address=/apvoc-ga.com/127.0.0.1 -address=/arendalfotball.no/127.0.0.1 address=/arvetellefsen.no/127.0.0.1 address=/ashskonorge.com/127.0.0.1 address=/assassinfitness.com/127.0.0.1 @@ -33,11 +32,9 @@ address=/bloggannonser.no/127.0.0.1 address=/bncentertainment.com/127.0.0.1 address=/boligkanalen-maestro-new.azurewebsites.net/127.0.0.1 address=/bostongrnhsflowers.com/127.0.0.1 -address=/brannloftet.no/127.0.0.1 address=/breakoutstory24.com/127.0.0.1 address=/breakoutstory24.com/127.0.0.1 address=/brightertrade.com/127.0.0.1 -address=/butikk.losnaspelet.no/127.0.0.1 address=/caperforaciones.com/127.0.0.1 address=/charpente-ramel.com/127.0.0.1 address=/cluster.chart.dk/127.0.0.1 @@ -67,7 +64,6 @@ address=/emerio.no/127.0.0.1 address=/euroads.dk/127.0.0.1 address=/euroads.no/127.0.0.1 address=/eurosko.net/127.0.0.1 -address=/fanadyreklinikk.no/127.0.0.1 address=/fatalfailblog.com/127.0.0.1 address=/festmusikk.com/127.0.0.1 address=/forum1.no/127.0.0.1 @@ -78,7 +74,6 @@ address=/godeskonettbutikk.com/127.0.0.1 address=/godsfillingstation.org/127.0.0.1 address=/gokkw.com/127.0.0.1 address=/gsport.com/127.0.0.1 -address=/handelihalden.no/127.0.0.1 address=/helseprodukt.co/127.0.0.1 address=/hernoclothing.com/127.0.0.1 address=/hollisternorge.com/127.0.0.1 @@ -96,7 +91,6 @@ address=/jessicaivory.com/127.0.0.1 address=/joseph-holland.com/127.0.0.1 address=/kjolenorge.com/127.0.0.1 address=/klmyu.com/127.0.0.1 -address=/komtilmil.no/127.0.0.1 address=/kundklubb-se.com/127.0.0.1 address=/legarralazcoz.com/127.0.0.1 address=/lillevinkelsko.net/127.0.0.1 @@ -139,7 +133,6 @@ address=/oflike.com/127.0.0.1 address=/omgrm.com/127.0.0.1 address=/ontariokitcarbuilders.com/127.0.0.1 address=/openadex.dk/127.0.0.1 -address=/oyelege.no/127.0.0.1 address=/parajumperjakke.net/127.0.0.1 address=/parajumpers-longbear.com/127.0.0.1 address=/parajumpers-norge.site @@ -174,7 +167,6 @@ address=/skoeccosandaler.com/127.0.0.1 address=/skonmdnorge.com/127.0.0.1 address=/ssrodeolivestock.com/127.0.0.1 address=/static.itrack.it/127.0.0.1 -address=/streetdance.no/127.0.0.1 address=/swellsup.com/127.0.0.1 address=/sykkeltrøye.com/127.0.0.1 address=/testgruppens.com/127.0.0.1 @@ -190,7 +182,6 @@ address=/tromselementbygg.no/127.0.0.1 address=/um-bs.com/127.0.0.1 address=/userneeds.dk/127.0.0.1 address=/vansnorge.com/127.0.0.1 -address=/vetscan.no/127.0.0.1 address=/vevlysingar.fo/127.0.0.1 address=/wausauorthopedics.com/127.0.0.1 address=/webclick.no/127.0.0.1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny index b4d353593..ae701f5f7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny +++ b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre («hosts.deny»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts.deny» version) -# Version: 03September2019v1-Beta +# Version: 13September2019v1-Beta # Description: This is a slimmer version of "Dandelion Sprout's Nordic Filters", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers. # Platform notes: This list version is intended for those who still use a Linux system function called «hosts.deny». # For mere informasjon og detaljer om denne listen og om andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk @@ -26,7 +26,6 @@ ALL: airmaxskobillige.com ALL: allergyfl.com ALL: apcleverstore.com ALL: apvoc-ga.com -ALL: arendalfotball.no ALL: arvetellefsen.no ALL: ashskonorge.com ALL: assassinfitness.com @@ -40,11 +39,9 @@ ALL: bloggannonser.no ALL: bncentertainment.com ALL: boligkanalen-maestro-new.azurewebsites.net ALL: bostongrnhsflowers.com -ALL: brannloftet.no ALL: breakoutstory24.com ALL: breakoutstory24.com ALL: brightertrade.com -ALL: butikk.losnaspelet.no ALL: caperforaciones.com ALL: charpente-ramel.com ALL: cluster.chart.dk @@ -74,7 +71,6 @@ ALL: emerio.no ALL: euroads.dk ALL: euroads.no ALL: eurosko.net -ALL: fanadyreklinikk.no ALL: fatalfailblog.com ALL: festmusikk.com ALL: forum1.no @@ -85,7 +81,6 @@ ALL: godeskonettbutikk.com ALL: godsfillingstation.org ALL: gokkw.com ALL: gsport.com -ALL: handelihalden.no ALL: helseprodukt.co ALL: hernoclothing.com ALL: hollisternorge.com @@ -103,7 +98,6 @@ ALL: jessicaivory.com ALL: joseph-holland.com ALL: kjolenorge.com ALL: klmyu.com -ALL: komtilmil.no ALL: kundklubb-se.com ALL: legarralazcoz.com ALL: lillevinkelsko.net @@ -146,7 +140,6 @@ ALL: oflike.com ALL: omgrm.com ALL: ontariokitcarbuilders.com ALL: openadex.dk -ALL: oyelege.no ALL: parajumperjakke.net ALL: parajumpers-longbear.com ALL: parajumpers-norge.site @@ -181,7 +174,6 @@ ALL: skoeccosandaler.com ALL: skonmdnorge.com ALL: ssrodeolivestock.com ALL: static.itrack.it -ALL: streetdance.no ALL: swellsup.com ALL: sykkeltrøye.com ALL: testgruppens.com @@ -197,7 +189,6 @@ ALL: tromselementbygg.no ALL: um-bs.com ALL: userneeds.dk ALL: vansnorge.com -ALL: vetscan.no ALL: vevlysingar.fo ALL: wausauorthopedics.com ALL: webclick.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index f5d0f3532..06b1d0bdf 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,5 +1,5 @@ -! Version: 08September2019v1 +! Version: 13September2019v1 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) @@ -926,7 +926,7 @@ fuglelyder.net#@##banner_ad ! 🇩🇰: Fupsider og virussider (Besøg dem ikke, hvis du sætter pris på dine computere og tegnebøger) ! 🇬🇧: Scam sites and virus sites (Do not visit them if you value your computers and wallets) ! Quick 101: Many scam sites use addresses that resemble those of major sites, but which contain random extra tidbits that make them a whole different address. "||vg.no." will block vg.no.iphone-scam-example.xyz, but not vg.no or vg.no/sport -||kjolenorge.com^$doc,domain=~ Advarselen vises grunnet: Falsk nettbutikksvindel +||kjolenorge.com^$doc,domain=~ Advarselen vises grunnet: Falsk klesbutikksvindel ||paypal.*.no^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av PayPal ||vg.no.$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av VG ||elkjop.no.$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av nettsidene deres @@ -962,22 +962,13 @@ fuglelyder.net#@##banner_ad ||norwayexpress24.com^$doc,domain=~ Advarselen vises grunnet: Falske artikler som fører til pengesvindling ||prisjakt.org^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av Prisjakt ||postnord-norge.com^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av Postnord -||streetdance.no^ ||102.112.2o7.net^$doc -||vetscan.no^ -||tromselementbygg.no^ -||brannloftet.no^ -||butikk.losnaspelet.no^ +||tromselementbygg.no^$doc,domain=~ Advarselen vises grunnet: Ansett av Maltiverse som phishing ||no.zxxyw.com^ -||oyelege.no^ -||fanadyreklinikk.no^ ||digitoday.com^$doc -||komtilmil.no^ ||apple-account-locked.losjevegen.no^$doc -||arendalfotball.no^ -||arvetellefsen.no/curry^ -||handelihalden.no^ -||holmedalblikk.no^ +||arvetellefsen.no/curry^$doc,domain=~ Advarselen vises grunnet: Ansett av Pulsedive som phishing +||holmedalblikk.no^$doc,domain=~ Advarselen vises grunnet: Falsk klesbutikksvindel ||vipps-sikkerhet.*^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av Vipps ||*/dnb11111/^$doc,domain=~ Advarselen vises grunnet: Falsk lureversjon av DNB ||nymelding.com^$doc diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 47291182f..cd36b1425 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,6 +1,6 @@ {+block} -# Version: 08September2019v1-Alpha -# Version: 080920191 (for Adblock Plus' issue report system) +# Version: 13September2019v1-Alpha +# Version: 130920191 (for Adblock Plus' issue report system) # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -326,21 +326,12 @@ contentMarketing .norwayexpress24.com .prisjakt.org .postnord-norge.com -.streetdance.no .102.112.2o7.net -.vetscan.no .tromselementbygg.no -.brannloftet.no -.butikk.losnaspelet.no .no.zxxyw.com -.oyelege.no -.fanadyreklinikk.no .digitoday.com -.komtilmil.no .apple-account-locked.losjevegen.no -.arendalfotball.no .arvetellefsen.no/curry -.handelihalden.no .holmedalblikk.no .vipps-sikkerhet.* .*/dnb11111/ diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 8f1320429..cfc3df3ad 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -510,6 +510,78 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"://(.*?) ", + r"://\1/", + line + ) + + line = re.sub( + r"([a-z])//", + r"\1/ ", + line + ) + + line = re.sub( + r"://(.*?) ", + r"://\1/", + line + ) + + line = re.sub( + r"([a-z])//", + r"\1/ ", + line + ) + + line = re.sub( + r"://(.*?) ", + r"://\1/", + line + ) + + line = re.sub( + r"([a-z])//", + r"\1/ ", + line + ) + + line = re.sub( + r"://(.*?) ", + r"://\1/", + line + ) + + line = re.sub( + r"([a-z])//", + r"\1/ ", + line + ) + + line = re.sub( + r"://(.*?) ", + r"://\1/", + line + ) + + line = re.sub( + r"([a-z])//", + r"\1/ ", + line + ) + + line = re.sub( + r"://(.*?) ", + r"://\1/", + line + ) + + line = re.sub( + r"([a-z])//", + r"\1/ ", + line + ) + if is_supported_tpl(line) and not line == '': text += line + '\r\n' @@ -1485,7 +1557,7 @@ def prepare_tpl(lines) -> str: ) line = re.sub( - r"\$domain.*", + r"\$.*", "", line )