diff --git a/NorwegianExperimentalList alternate versions/AdawayHosts b/NorwegianExperimentalList alternate versions/AdawayHosts index 5a098fed5..044a61a4b 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: 28January2021v1 +# Version: 29January2021v1 # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # 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 @@ -404,3 +404,4 @@ + diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index 8de1ebf3e..7665f2f2d 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -393,6 +393,7 @@ { "action": "allow", "process": "any", "remote-domains": "dnb.no.edgekey.net" }, { "action": "allow", "process": "any", "remote-domains": "skatteetaten.no.cdn.cloudflare.net" }, { "action": "allow", "process": "any", "remote-domains": "norwegian.com.cdn.cloudflare.net" }, +{ "action": "allow", "process": "any", "remote-domains": "vg.no.cdn.cloudflare.net" }, { "action": "allow", "process": "any", "remote-domains": "ad.dep.no" }, { "action": "allow", "process": "any", "remote-domains": "ad.hem.no" }, { "action": "allow", "process": "any", "remote-domains": "ads.mst.dk" }, diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt index 7a0ff3df4..63c163b88 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for AdGuard Home) # Translated title: Dandelion Sprout's Nordic Filters (for AdGuard Home) -# Version: 28January2021v1 +# Version: 29January2021v1 # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who use AdGuard Home and its oddly specific subset of adblocker syntaxes. # 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 @@ -460,6 +460,7 @@ @@||dnb.no.edgekey.net^ @@||skatteetaten.no.cdn.cloudflare.net^ @@||norwegian.com.cdn.cloudflare.net^ +@@||vg.no.cdn.cloudflare.net^ @@||ad.dep.no^ @@||ad.hem.no^ @@||ads.mst.dk^ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf index de8ce2f77..8ff324ff9 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf @@ -384,6 +384,7 @@ server=/elkjop.no.edgekey.net/89.233.43.71 server=/dnb.no.edgekey.net/89.233.43.71 server=/skatteetaten.no.cdn.cloudflare.net/89.233.43.71 server=/norwegian.com.cdn.cloudflare.net/89.233.43.71 +server=/vg.no.cdn.cloudflare.net/89.233.43.71 server=/ad.dep.no/89.233.43.71 server=/ad.hem.no/89.233.43.71 server=/ads.mst.dk/89.233.43.71 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt b/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt index 7435ee475..b2d002ab2 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt @@ -1,11 +1,10 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (Domenehviteliste) # Translated title: Dandelion Sprout's Nordic Filters (Domains allowlist) -# Version: 28January2021v1-Beta +# Version: 29January2021v1-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for users of Pi-hole, Blokada and DNS66, as a recommended supplement to their regular list versions. For AdGuard Home, the allowlistings are already incorporated in its regular list version. # 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 -/^[a-z]{10,12}\.easy\.co$/ 5d404.v.fwmrm.net elkjop.no.edgekey.net dnb.no.edgekey.net diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt index 86c9f9f6d..a1955c79f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for MinerBlock) # Translated title: Dandelion Sprout's Nordic Filters (for MinerBlock) -# Version: 28January2021v1-Alpha +# Version: 29January2021v1-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: So, let's say your company boss is not letting you install any adblocker on your awful work laptop, but (s)he lets you install MinerBlock for some indeterminable reason? In this very unlikely case, I've saved your day. # Note: This list does not actually block any mining-related stuff. @@ -462,6 +462,7 @@ !dnb.no.edgekey.net !skatteetaten.no.cdn.cloudflare.net !norwegian.com.cdn.cloudflare.net +!vg.no.cdn.cloudflare.net !ad.dep.no !ad.hem.no !ads.mst.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny index 3e2c72619..4da87094d 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: 28January2021v1-Beta +# Version: 29January2021v1-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # 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 @@ -403,3 +403,4 @@ ALL: 2001:67c:21e0::ad + diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt index 21c31896d..1f16770ae 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt @@ -1,6 +1,6 @@ # Title: Dandelion Sprouts nordiske filtre (IPv6-«hosts»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The IPv6 «hosts» file version) -# Version: 28January2021v1 +# Version: 29January2021v1 # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # 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 @@ -403,3 +403,4 @@ + diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt index 6053adc01..ae950e169 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for Pi-hole) # Translated title: Dandelion Sprout's Nordic Filters (for Pi-hole) -# Version: 28January2021v1-Alpha +# Version: 29January2021v1-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who make use of the Regex functionality in Pi-Hole. # 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 @@ -460,6 +460,7 @@ signup-*vpns.com !dnb.no.edgekey.net !skatteetaten.no.cdn.cloudflare.net !norwegian.com.cdn.cloudflare.net +!vg.no.cdn.cloudflare.net !ad.dep.no !ad.hem.no !ads.mst.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt index 0228dbbb5..e41c96150 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt @@ -1,6 +1,6 @@ ; Title: 📔 Dandelion Sprouts nordiske filtre (for BIND/RPZ) ; Translated title: Dandelion Sprout's Nordic Filters (for BIND/RPZ) -; Version: 28January2021v1-Alpha +; Version: 29January2021v1-Alpha ; 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. ; Platform notes: This list version is intended for those who use BIND or other DNS server tools that support RPZ files. ; 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 @@ -460,6 +460,7 @@ elkjop.no.edgekey.net CNAME rpz-passthru. dnb.no.edgekey.net CNAME rpz-passthru. skatteetaten.no.cdn.cloudflare.net CNAME rpz-passthru. norwegian.com.cdn.cloudflare.net CNAME rpz-passthru. +vg.no.cdn.cloudflare.net CNAME rpz-passthru. ad.dep.no CNAME rpz-passthru. ad.hem.no CNAME rpz-passthru. ads.mst.dk CNAME rpz-passthru. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list b/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list index bee0a8c8a..8dc6adebd 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list +++ b/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for Shadowsocks) # Translated title: Dandelion Sprout's Nordic Filters (for Shadowsocks) -# Version: 28January2021v1-Alpha +# Version: 29January2021v1-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who use Shadowsocks, Shadowrocket, Surge, and other Socks5-based tools that have become popular in PR-China for several reasons. # 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 @@ -460,6 +460,7 @@ DOMAIN-SUFFIX,elkjop.no.edgekey.net,resolve DOMAIN-SUFFIX,dnb.no.edgekey.net,resolve DOMAIN-SUFFIX,skatteetaten.no.cdn.cloudflare.net,resolve DOMAIN-SUFFIX,norwegian.com.cdn.cloudflare.net,resolve +DOMAIN-SUFFIX,vg.no.cdn.cloudflare.net,resolve DOMAIN-SUFFIX,ad.dep.no,resolve DOMAIN-SUFFIX,ad.hem.no,resolve DOMAIN-SUFFIX,ads.mst.dk,resolve diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf index 78bca803c..b65371bb3 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for Unbound) # Translated title: Dandelion Sprout's Nordic Filters (for Unbound) -# Version: 28January2021v1-Alpha +# Version: 29January2021v1-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who use the DNS server tool Unbound. # 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 @@ -460,6 +460,7 @@ local-zone: "elkjop.no.edgekey.net" transparent local-zone: "dnb.no.edgekey.net" transparent local-zone: "skatteetaten.no.cdn.cloudflare.net" transparent local-zone: "norwegian.com.cdn.cloudflare.net" transparent +local-zone: "vg.no.cdn.cloudflare.net" transparent local-zone: "ad.dep.no" transparent local-zone: "ad.hem.no" transparent local-zone: "ads.mst.dk" transparent diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 2cbab9b90..61dbd3ccc 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -3648,7 +3648,7 @@ def prepare_domainsallowlist(lines) -> str: ) line = re.sub( - r"^[a-z0-9*].*", + r"^[a-z0-9*/].*", r"", line )