From cd681bab09795a060b3fa80b97f4e64372cadfb2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 9 Jan 2020 10:20:25 +0100 Subject: [PATCH] Add files via upload --- .../AdawayHosts | 3 +- .../LittleSnitchNorwegianList.lsrules | 2 +- .../NordicFiltersABP.txt | 2 +- .../NordicFiltersAdGuard.txt | 2 +- .../NordicFiltersHostsIPv6.txt | 201 ++++++++++++++++++ .../XYZPrepareFilters.py | 84 +++++++- 6 files changed, 286 insertions(+), 8 deletions(-) create mode 100644 NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt diff --git a/NorwegianExperimentalList alternate versions/AdawayHosts b/NorwegianExperimentalList alternate versions/AdawayHosts index abd9edc7a..a74547d81 100644 --- a/NorwegianExperimentalList alternate versions/AdawayHosts +++ b/NorwegianExperimentalList alternate versions/AdawayHosts @@ -2,7 +2,8 @@ # Translated title: Dandelion Sprout's Nordic Filters (The «hosts» file version) # Version: 08January2020v1 # 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 pfBlockerNG, Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file. +# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including pfBlockerNG, Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file. +# If you use a tool that edits the system's own hosts file, such as Hosts File Editor, Gas Mask, or Magisk Manager, make sure to also use the IPv6 version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsIPv6.txt # 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 # For more information and details about this list and other lists of mine, go to https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english 127.0.0.1 101mesh.com www.101mesh.com diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index 1047e1b85..d63943fea 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -3,7 +3,7 @@ "rules": [ { "action": "deny", "process": "any", "remote-hosts": "101mesh.com" }, { "action": "deny", "process": "any", "remote-hosts": "102.112.2o7.net" }, -{ "action": "deny", "process": "any", "remote-hosts": "85.17.76.181 +{ "action": "deny", "process": "any", "remote-hosts": "85.17.76.181" }, { "action": "deny", "process": "any", "remote-hosts": "ad.no.doubleclick.net" }, { "action": "deny", "process": "any", "remote-hosts": "addmoviesnow.com" }, { "action": "deny", "process": "any", "remote-hosts": "adext.inkclub.com" }, diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 8a12515bc..e3436e9da 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -7,7 +7,7 @@ ! 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk ! 🇩🇰: Denne liste dækker websider for Danmark, Norge, Island, Færøerne, Grønland, og den samiske befolkning. For mere information-, detaljer-, nyttige værktøjer- og andre lister, jeg har lavet, besøg https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md ! Description: 🇬🇧: This list covers websites for Norway, Denmark, Iceland, Danish territories, and the Sami indigenous population. For more information, details, helpful tools, and other lists that I've made, visit https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english -! CRITICAL NOTE FOR PFBLOCKERNG USERS: This version of my list was never meant to be used with pfBlockerNG in the first place, and I was never asked or inquired about it before it was added to it. Instead I currently recommend https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts. This has been fixed in fresh stock installations of ≥2.2.5_27. For all other pfBlockerNG users, please replace the list link manually. + ! If you wish to remove cookie banners from Nordic websites, check out https://www.i-dont-care-about-cookies.eu/ ! 🇳🇴: Ukategoriserte oppføringer diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 076ff58e4..cd7e8eef8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -6,7 +6,7 @@ ! 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk ! 🇩🇰: Denne liste dækker websider for Danmark, Norge, Island, Færøerne, Grønland, og den samiske befolkning. For mere information-, detaljer-, nyttige værktøjer- og andre lister, jeg har lavet, besøg https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md ! Description: 🇬🇧: This list covers websites for Norway, Denmark, Iceland, Danish territories, and the Sami indigenous population. For more information, details, helpful tools, and other lists that I've made, visit https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english -! CRITICAL NOTE FOR PFBLOCKERNG USERS: This version of my list was never meant to be used with pfBlockerNG in the first place, and I was never asked or inquired about it before it was added to it. Instead I currently recommend https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts. This has been fixed in fresh stock installations of ≥2.2.5_27. For all other pfBlockerNG users, please replace the list link manually. + ! If you wish to remove cookie banners from Nordic websites, check out https://www.i-dont-care-about-cookies.eu/ ! 🇳🇴: Ukategoriserte oppføringer diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt new file mode 100644 index 000000000..91b37c87b --- /dev/null +++ b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt @@ -0,0 +1,201 @@ +# Title: Dandelion Sprouts nordiske filtre (IPv6-«hosts»-versjonen) +# Translated title: Dandelion Sprout's Nordic Filters (The IPv6 «hosts» file version) +# Version: 08January2020v1 +# 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 meant to be used simultaneously of the regular «Hosts» version when using computer/Android system hosts file editors like Hosts File Editor, Gas Mask, Magisk Manager, etc. It is not needed for tools that strip away the entries' IP address, such as Blokada and pfBlockerNG. +# 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 +# For more information and details about this list and other lists of mine, go to https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english +:: 101mesh.com www.101mesh.com +:: 102.112.2o7.net www.102.112.2o7.net +:: 85.17.76.181 www.85.17.76.181 +:: ad.no.doubleclick.net www.ad.no.doubleclick.net +:: addmoviesnow.com www.addmoviesnow.com +:: adext.inkclub.com www.adext.inkclub.com +:: adidasko.com www.adidasko.com +:: ads.no www.ads.no +:: ads.xion.dk www.ads.xion.dk +:: adserver.fbg.dk www.adserver.fbg.dk +:: adserver.karamco.dk www.adserver.karamco.dk +:: adserver.wagawaga.dk www.adserver.wagawaga.dk +:: adservicemedia.dk www.adservicemedia.dk +:: affilicircle.com www.affilicircle.com +:: airmaxskobillige.com www.airmaxskobillige.com +:: allergyfl.com www.allergyfl.com +:: annonser.dagbladet.no www.annonser.dagbladet.no +:: apvoc-ga.com www.apvoc-ga.com +:: arvetellefsen.no www.arvetellefsen.no +:: assassinfitness.com www.assassinfitness.com +:: bannere.oslonett.no www.bannere.oslonett.no +:: benshermanoslo.com www.benshermanoslo.com +:: bestphoneapplication.com www.bestphoneapplication.com +:: billigesalg.com www.billigesalg.com +:: bloggannonser.no www.bloggannonser.no +:: bncentertainment.com www.bncentertainment.com +:: boligkanalen-maestro-new.azurewebsites.net www.boligkanalen-maestro-new.azurewebsites.net +:: bondiblue.co.uk www.bondiblue.co.uk +:: bostongrnhsflowers.com www.bostongrnhsflowers.com +:: brandstudio.inventory.schibsted.io www.brandstudio.inventory.schibsted.io +:: brightertrade.com www.brightertrade.com +:: caperforaciones.com www.caperforaciones.com +:: cdnboligkanalen.azureedge.net www.cdnboligkanalen.azureedge.net +:: charpente-ramel.com www.charpente-ramel.com +:: cluster.chart.dk www.cluster.chart.dk +:: cmt.no www.cmt.no +:: com-airs1.com www.com-airs1.com +:: com-dk.com www.com-dk.com +:: com-fryd.com www.com-fryd.com +:: com-norwegian.com www.com-norwegian.com +:: com-usx.com www.com-usx.com +:: coralls.com www.coralls.com +:: cost2buy.net www.cost2buy.net +:: crossfiterada.com www.crossfiterada.com +:: crownedwithlaurels.com www.crownedwithlaurels.com +:: daradis.com www.daradis.com +:: delivered-by-madington.com www.delivered-by-madington.com +:: denningwelldrilling.com www.denningwelldrilling.com +:: dk-ekstrabladet.vp.videoplaza.tv www.dk-ekstrabladet.vp.videoplaza.tv +:: dk.panel.gemius.dk www.dk.panel.gemius.dk +:: dotbanner.dk www.dotbanner.dk +:: drakternorge.com www.drakternorge.com +:: drcarolyngroff.com www.drcarolyngroff.com +:: dunjakke-no.com www.dunjakke-no.com +:: earnmoneyglobal.com www.earnmoneyglobal.com +:: easy-ad.no www.easy-ad.no +:: easyliving4you.com www.easyliving4you.com +:: elderlyscissors.com www.elderlyscissors.com +:: emediate.eu www.emediate.eu +:: emerio.no www.emerio.no +:: euroads.no www.euroads.no +:: eurosko.net www.eurosko.net +:: fatalfailblog.com www.fatalfailblog.com +:: festmusikk.com www.festmusikk.com +:: fotballsko-salg.com www.fotballsko-salg.com +:: fotballskotilbud.com www.fotballskotilbud.com +:: gantoslo.com www.gantoslo.com +:: geometra-bologna.it www.geometra-bologna.it +:: getheretecblogz.me www.getheretecblogz.me +:: godeskonettbutikk.com www.godeskonettbutikk.com +:: godsfillingstation.org www.godsfillingstation.org +:: gokkw.com www.gokkw.com +:: grabdiscountdeals.com www.grabdiscountdeals.com +:: gsport.com www.gsport.com +:: hcliips.com www.hcliips.com +:: heartbeat.airserve.net www.heartbeat.airserve.net +:: hernoclothing.com www.hernoclothing.com +:: hollisternorge.com www.hollisternorge.com +:: holmedalblikk.no www.holmedalblikk.no +:: horizonbagel.com www.horizonbagel.com +:: i1media.no www.i1media.no +:: is-a-personaltrainer.com www.is-a-personaltrainer.com +:: isweb.no www.isweb.no +:: itsthetrendydealstore.com www.itsthetrendydealstore.com +:: jagerjack.com www.jagerjack.com +:: jakkesalgs.com www.jakkesalgs.com +:: jakkesnorge.com www.jakkesnorge.com +:: jessicaivory.com www.jessicaivory.com +:: joseph-holland.com www.joseph-holland.com +:: kundklubb-se.com www.kundklubb-se.com +:: legarralazcoz.com www.legarralazcoz.com +:: limitedvoucher.com www.limitedvoucher.com +:: lindseysopticians.com www.lindseysopticians.com +:: linkshe.com www.linkshe.com +:: liveshopdealz.com www.liveshopdealz.com +:: locchalet2alpes.com www.locchalet2alpes.com +:: look-like-star.myshopify.com www.look-like-star.myshopify.com +:: lrgst.com www.lrgst.com +:: manasporthorse.com www.manasporthorse.com +:: marissatomei.com www.marissatomei.com +:: marymaclane.net www.marymaclane.net +:: matriell.dm-storage.no www.matriell.dm-storage.no +:: mayor4london.com www.mayor4london.com +:: mbtnorge.com www.mbtnorge.com +:: media.sonymusic.no www.media.sonymusic.no +:: meladermfacts.com www.meladermfacts.com +:: meretro.com www.meretro.com +:: mncprobuild.com www.mncprobuild.com +:: moebel-thiems.com www.moebel-thiems.com +:: moslt.com www.moslt.com +:: moteshoes.com www.moteshoes.com +:: mrarmstrongsclass.com www.mrarmstrongsclass.com +:: mudancaslvc.com www.mudancaslvc.com +:: museuw.com www.museuw.com +:: myad.no www.myad.no +:: mycraftypad.com www.mycraftypad.com +:: myk-news.com www.myk-news.com +:: nasajones.com www.nasajones.com +:: nettklikk.no www.nettklikk.no +:: nikebutikks.com www.nikebutikks.com +:: no.moncleritalien.com www.no.moncleritalien.com +:: no.zxxyw.com www.no.zxxyw.com +:: nodzoom.com www.nodzoom.com +:: nordartisan.com www.nordartisan.com +:: norfotball.com www.norfotball.com +:: norge.parkaoutdoor.com www.norge.parkaoutdoor.com +:: norgefotball.com www.norgefotball.com +:: norgejakke.com www.norgejakke.com +:: norgejakkerbutikk.com www.norgejakkerbutikk.com +:: norgeshoes.com www.norgeshoes.com +:: oflike.com www.oflike.com +:: omgrm.com www.omgrm.com +:: ontariokitcarbuilders.com www.ontariokitcarbuilders.com +:: openadex.dk www.openadex.dk +:: organiclife24.info www.organiclife24.info +:: parajumpers-salg.com www.parajumpers-salg.com +:: parajumpersitoutlet.com www.parajumpersitoutlet.com +:: parajumpersnettbutikk.com www.parajumpersnettbutikk.com +:: parajumpersnorway.com www.parajumpersnorway.com +:: parajumpersoutletnorge.com www.parajumpersoutletnorge.com +:: parajumperssalg.com www.parajumperssalg.com +:: phosphox.com www.phosphox.com +:: pilmedia.ads.visionweb.no www.pilmedia.ads.visionweb.no +:: piwik.onlinemagasinet.no www.piwik.onlinemagasinet.no +:: pjs.outlet.com www.pjs.outlet.com +:: popeurope.com www.popeurope.com +:: posten.club www.posten.club +:: postnord-norge.com www.postnord-norge.com +:: primetime.ad.primetime.net www.primetime.ad.primetime.net +:: prisjakt.org www.prisjakt.org +:: quiltstudiolaren.com www.quiltstudiolaren.com +:: rbgeg.com www.rbgeg.com +:: rbkbb.com www.rbkbb.com +:: retoaudi.com www.retoaudi.com +:: rnbinance.com www.rnbinance.com +:: rsket.com www.rsket.com +:: ruter.top www.ruter.top +:: sannsyn.com www.sannsyn.com +:: scottfamilyministries.org www.scottfamilyministries.org +:: server-no.imrworldwide.com www.server-no.imrworldwide.com +:: server-us.imrworldwide.com www.server-us.imrworldwide.com +:: skoeccosandaler.com www.skoeccosandaler.com +:: skonmdnorge.com www.skonmdnorge.com +:: sky.gs www.sky.gs +:: soda.is www.soda.is +:: ssrodeolivestock.com www.ssrodeolivestock.com +:: static.airserve.net www.static.airserve.net +:: static.itrack.it www.static.itrack.it +:: swellsup.com www.swellsup.com +:: sykkeltrøye.com www.sykkeltrøye.com +:: tankeogteknikk.no www.tankeogteknikk.no +:: tiranaaquapark-eg.com www.tiranaaquapark-eg.com +:: tns-gallup.dk www.tns-gallup.dk +:: tobiascelebritymusicevents.com www.tobiascelebritymusicevents.com +:: top-topic.co www.top-topic.co +:: track.adform.net www.track.adform.net +:: tracking-genesisaffiliates.com www.tracking-genesisaffiliates.com +:: trackvoluum.com www.trackvoluum.com +:: tromselementbygg.no www.tromselementbygg.no +:: tv2a.dk www.tv2a.dk +:: ucrhealthyhearts.com www.ucrhealthyhearts.com +:: ultimate-tech-products.myshopify.com www.ultimate-tech-products.myshopify.com +:: um-bs.com www.um-bs.com +:: userneeds.dk www.userneeds.dk +:: vansnorge.com www.vansnorge.com +:: vevlysingar.fo www.vevlysingar.fo +:: vision-hey.club www.vision-hey.club +:: vouchersnationhub.com www.vouchersnationhub.com +:: webclick.no www.webclick.no +:: webhotell.enivest.no www.webhotell.enivest.no +:: widget.tippebannere.no www.widget.tippebannere.no +:: wo.tc www.wo.tc + + diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index fdf9dd864..dcda18a11 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -152,6 +152,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"^!.*PFBLOCKERNG.*", + r"", + line + ) + text += line + '\r\n' return text @@ -420,6 +426,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"^!.*PFBLOCKERNG.*", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -759,6 +771,11 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^!.*PFBLOCKERNG.*", + r"", + line + ) if is_supported_tpl(line) and not line == '': text += line + '\r\n' @@ -853,6 +870,12 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"^!.*PFBLOCKERNG.*", + r"", + line + ) + if is_supported_privoxy(line): text += line + '\r\n' @@ -1014,6 +1037,7 @@ OUTPUT_SHADOWSOCKS = 'NordicFiltersSocks5.list' OUTPUT_RPZ = 'NordicFiltersRPZ.txt' OUTPUT_UNBOUND = 'NordicFiltersUnbound.conf' OUTPUT_MINERBLOCK = 'NordicFiltersForMinerBlock.txt' +OUTPUT_HOSTSIPV6 = 'NordicFiltersHostsIPv6.txt' # function that downloads the filter list def download_filters() -> str: @@ -1064,7 +1088,7 @@ def prepare_hosts(lines) -> str: line = re.sub( r"# Platform notes:.*", - "# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including pfBlockerNG, Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file.", + "# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including pfBlockerNG, Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file.\n# If you use a tool that edits the system's own hosts file, such as Hosts File Editor, Gas Mask, or Magisk Manager, make sure to also use the IPv6 version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsIPv6.txt", line ) @@ -1119,13 +1143,13 @@ def prepare_ls(lines) -> str: ) line = re.sub( - r"(.*\..*[a-z]$)", + r"(.*\..*[a-z0-9]$)", r"\1\" },", line ) line = re.sub( - "(.*\..*[a-z])\\\"", + "(.*\..*[a-z0-9])\\\"", r"\1\\", line ) @@ -1137,7 +1161,7 @@ def prepare_ls(lines) -> str: ) line = re.sub( - r"([a-z])\\", + r"([a-z0-9])\\", r"\1", line ) @@ -1558,6 +1582,54 @@ def prepare_minerblock(lines) -> str: return text +# ————— IPv6 .\hosts version ————— + +def prepare_hostsipv6(lines) -> str: + text = '' + + # remove or modifiy entries with unsupported modifiers + for line in lines: + + line = re.sub( + r"^(?!#)", + ":: ", + line + ) + + line = re.sub( + r":: $", + "", + line + ) + + line = re.sub( + "📔 Dandelion Sprouts nordiske filtre \(Domenelisteversjonen\)", + "Dandelion Sprouts nordiske filtre (IPv6-«hosts»-versjonen)", + line + ) + + line = re.sub( + "Dandelion Sprout's Nordic Filters \(The domains list version\)", + "Dandelion Sprout's Nordic Filters (The IPv6 «hosts» file version)", + line + ) + + line = re.sub( + r"# Platform notes:.*", + "# Platform notes: This list version is meant to be used simultaneously of the regular «Hosts» version when using computer/Android system hosts file editors like Hosts File Editor, Gas Mask, Magisk Manager, etc. It is not needed for tools that strip away the entries' IP address, such as Blokada and pfBlockerNG.", + line + ) + + line = re.sub( + r"^(::) (.*)", + r"\1 \2 www.\2", + line + ) + + if is_supported_hosts(line): + text += line + '\r\n' + + return text if __name__ == "__main__": @@ -1576,6 +1648,7 @@ if __name__ == "__main__": rpz_filter = prepare_rpz(lines) unbound_filter = prepare_unbound(lines) minerblock_filter = prepare_minerblock(lines) + hostsipv6_filter = prepare_hostsipv6(lines) with open(OUTPUT, "w") as text_file: text_file.write(text) @@ -1610,6 +1683,9 @@ if __name__ == "__main__": with open(OUTPUT_MINERBLOCK, "w") as text_file: text_file.write(minerblock_filter) + with open(OUTPUT_HOSTSIPV6, "w") as text_file: + text_file.write(hostsipv6_filter) + print('The domains-based list versions have been generated.') #/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\/•\