From fb8e918aa4bad00ce48bc709af3463277c4d338e Mon Sep 17 00:00:00 2001 From: Imre Eilertsen Date: Sun, 6 Oct 2024 02:48:07 +0200 Subject: [PATCH] Add files via upload --- .../NordicFiltersAdGuardHome.txt | 2 +- .../NordicFiltersDomainsAllowlist.txt | 2 +- .../NordicFiltersForMinerBlock.txt | 2 +- .../NordicFiltersHostsDeny.deny | 2 +- .../NordicFiltersHostsIPv6.txt | 2 +- .../NordicFiltersPiHole.txt | 2 +- .../NordicFiltersRPZ.txt | 2 +- .../NordicFiltersSocks5.list | 2 +- .../NordicFiltersUnbound.conf | 2 +- .../NordicHosts.txt | 5 +++-- .../XYZPrepareFilters.py | 10 +++++----- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt index 5b864014c..3e0f17fb8 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, AdGuard for Android/Windows/macOS sine DNS-filtreringer, AdGuard Private DNS, og Pi-Hole FTL ≥5.22) # Translated title: Dandelion Sprout's Nordic Filters (for AdGuard Home, AdGuard for Android/Windows/macOS' DNS filtering, AdGuard Private DNS, and Pi-Hole FTL ≥5.22) -# Version: 05September2024v1 +# Version: 06October2024v1 # 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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt b/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt index 186c71d7f..f86c3f4c2 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (Domenehviteliste) # Translated title: Dandelion Sprout's Nordic Filters (Domains allowlist) -# Version: 05September2024v1-Beta +# Version: 06October2024v1-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. !#if !env_mv3 # 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. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt index ed6cb6d04..e302c7394 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: 05September2024v1-Alpha +# Version: 06October2024v1-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. !#if !env_mv3 # 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. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny index e0b006d19..029969fad 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: 05September2024v1-Deprecated +# Version: 06October2024v1-Deprecated # 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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt index 7655838e1..070f8181e 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: 05September2024v1 +# Version: 06October2024v1 # 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. !#if !env_mv3 # 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. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt index 8a7d498f3..386491b61 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 v5.21 og tidligere) # Translated title: Dandelion Sprout's Nordic Filters (for Pi-hole v5.21 and earlier) -# Version: 05September2024v1-Deprecated +# Version: 06October2024v1-Deprecated # Users of Pi-Hole FTL 5.22 and later are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt, unless otherwise proven. # 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. !#if !env_mv3 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt index 087536200..3b8d3f32b 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: 05September2024v1-Alpha +; Version: 06October2024v1-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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list b/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list index a0aef69bc..8793a9ffa 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: 05September2024v1-Alpha +# Version: 06October2024v1-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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf index 696cbf17f..966fd21bd 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: 05September2024v1-Alpha +# Version: 06October2024v1-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 diff --git a/NorwegianExperimentalList alternate versions/NordicHosts.txt b/NorwegianExperimentalList alternate versions/NordicHosts.txt index 4ec46c114..dbd4177f5 100644 --- a/NorwegianExperimentalList alternate versions/NordicHosts.txt +++ b/NorwegianExperimentalList alternate versions/NordicHosts.txt @@ -1,7 +1,8 @@ # Title: Dandelion Sprouts nordiske filtre («hosts»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts» file version) -# Version: 05September2024v1 -# Users of Pi-Hole FTL 5.22 and later are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt, unless otherwise proven. +# Version: 06October2024v1 +# Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt, unless otherwise proven. +# Users of uBlock Origin are STRONGLY RECOMMENDED to switch to the uBO list version at https://raw.githubusercontent.com/DandelionSprout/adfilt/refs/heads/master/NorwegianList.txt, unless otherwise proven. # 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. !#if !env_mv3 # 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. diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 676b20f11..01f0aaf6e 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -3427,7 +3427,7 @@ def prepare_hosts(lines) -> str: line = re.sub( r"(# (Version|Last[ -]?[Mm]odified):.*)", - r"\1\n# Users of Pi-Hole FTL 5.22 and later are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt, unless otherwise proven.", + r"\1\n# Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt, unless otherwise proven.\n# Users of uBlock Origin are STRONGLY RECOMMENDED to switch to the uBO list version at https://raw.githubusercontent.com/DandelionSprout/adfilt/refs/heads/master/NorwegianList.txt, unless otherwise proven.", line ) @@ -6208,7 +6208,7 @@ def prepare_hosts(lines) -> str: line = re.sub( r"^(.*Description: .*)$", - r"\1\n# Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.\n!#if !env_mv3", + r"\1\n# Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.\n# Users of uBlock Origin are STRONGLY RECOMMENDED to switch to the uBO list version at https://raw.githubusercontent.com/DandelionSprout/adfilt/refs/heads/master/Dandelion%20Sprout's%20Anti-Malware%20List.txt, unless otherwise proven.\n!#if !env_mv3", line ) @@ -6225,7 +6225,7 @@ def prepare_hosts(lines) -> str: ) line = re.sub( - r"^:.{1,5}(\$.*)$", + r"^:.{1,5}(\$.*)?$", r"", line ) @@ -6432,7 +6432,7 @@ def prepare_domains(lines) -> str: line = re.sub( r"(# Description.*$)", - r"\1\n# Note: The very limited syntax available to raw domains lists, considering it's, well, raw, means that outright anti-MV3 measures (which'd as of February 2024 only affect Minus, a project whose name is unworthy of the uBO label; AdGuard browser extensions has no relevant support for raw domains either way) cannot be done. However, at some 20,000 entries, Team Chromium's shameful leaders aren't liking this list anyway.\n# Note 2: Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.", + r"\1\n# Note: The very limited syntax available to raw domains lists, considering it's, well, raw, means that outright anti-MV3 measures (which'd as of February 2024 only affect Minus, a project whose name is unworthy of the uBO label; AdGuard browser extensions has no relevant support for raw domains either way) cannot be done. However, at some 20,000 entries, Team Chromium's shameful leaders aren't liking this list anyway.\n# Note 2: Users of Pi-Hole FTL 5.22 and later, and of AdGuard Home, are STRONGLY RECOMMENDED to switch to the || version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt, unless otherwise proven.\n# Note 3: Users of uBlock Origin are STRONGLY RECOMMENDED to switch to the uBO list version at https://raw.githubusercontent.com/DandelionSprout/adfilt/refs/heads/master/Dandelion%20Sprout's%20Anti-Malware%20List.txt, unless otherwise proven.", line ) @@ -6467,7 +6467,7 @@ def prepare_domains(lines) -> str: ) line = re.sub( - r"^:.{1,5}(\$.*)$", + r"^:.{1,5}(\$.*)?$", r"", line )