From 7459c0d8e8739abb983678e8df47ca4179abac57 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 14 Mar 2020 18:12:59 +0100 Subject: [PATCH] Attempted to improve the dnsmasq version --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFiltersABP.txt | 5 ++++- .../NordicFiltersAdGuard.txt | 5 ++++- .../NordicFiltersDnsmasq.conf | 16 ++++++++-------- .../NordicFiltersPrivacy.txt | 5 ++++- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 6 ++++++ 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index ea05bfa50..33213a629 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 12March2020v3-Alpha +# Version: 13March2020v1-Alpha # Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index a2694646f..543b1a650 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 120320203 +! Version: 130320201 ! 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 @@ -655,6 +655,9 @@ sva.no##.code-block-1 norskkalender.no##.spacerDesktop 180.no,180.dk##.ad-min-height 180.no,180.dk##.cc-top-ad-outer +180.no,180.dk##.idle-timeout-outer +klikk.no##div[id^=lpc_belowArticle] +hsfo.dk##.adblock ! โ€” โ€” โ€” โ€” โ€” ! ๐Ÿ‡ณ๐Ÿ‡ด: Generelle oppfรธringer med kilder ! ๐Ÿ‡ฌ๐Ÿ‡ง: Generic entries that have sources diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 955ad94b8..0622679cb 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 12March2020v3 +! Version: 13March2020v1 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -673,6 +673,9 @@ sva.no##.code-block-1 norskkalender.no##.spacerDesktop 180.no,180.dk##.ad-min-height 180.no,180.dk##.cc-top-ad-outer +180.no,180.dk##.idle-timeout-outer +klikk.no##div[id^=lpc_belowArticle] +hsfo.dk##.adblock ! โ€” โ€” โ€” โ€” โ€” ! ๐Ÿ‡ณ๐Ÿ‡ด: Generelle oppfรธringer med kilder ! ๐Ÿ‡ฌ๐Ÿ‡ง: Generic entries that have sources diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf index cf77ee6f6..c0ca20b99 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf @@ -1,13 +1,13 @@ address=/101mesh.com/127.0.0.1 address=/102.112.2o7.net/127.0.0.1 -address=/3.248.18.175 -address=/52.216.146.90 -address=/82.118.242.69 -address=/85.17.76.181 -address=/92.42.104.146 -address=/136.243.73.30 -address=/138.201.126.227 -address=/156.236.126.173 +server=/175.18.248.3.in-addr.arpa/127.0.0.1 +server=/90.146.216.52.in-addr.arpa/127.0.0.1 +server=/69.242.118.82.in-addr.arpa/127.0.0.1 +server=/181.76.17.85.in-addr.arpa/127.0.0.1 +server=/146.104.42.92.in-addr.arpa/127.0.0.1 +server=/30.73.243.136.in-addr.arpa/127.0.0.1 +server=/227.126.201.138.in-addr.arpa/127.0.0.1 +server=/173.126.236.156.in-addr.arpa/127.0.0.1 address=/ad.no.doubleclick.net/127.0.0.1 address=/addmoviesnow.com/127.0.0.1 address=/adext.inkclub.com/127.0.0.1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 43527be83..8edd2a379 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 12March2020v3 +! Version: 13March2020v1 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -673,6 +673,9 @@ sva.no##.code-block-1 norskkalender.no##.spacerDesktop 180.*##.ad-min-height 180.*##.cc-top-ad-outer +180.*##.idle-timeout-outer +klikk.no##div[id^=lpc_belowArticle] +hsfo.dk##.adblock ! โ€” โ€” โ€” โ€” โ€” ! ๐Ÿ‡ณ๐Ÿ‡ด: Generelle oppfรธringer med kilder ! ๐Ÿ‡ฌ๐Ÿ‡ง: Generic entries that have sources diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 2b5347d4b..1f7ded9e1 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 12March2020v3-Alpha +# Version: 13March2020v1-Alpha # 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 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index ae8aa65c0..20d96e985 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1408,6 +1408,12 @@ def prepare_dnsmasq(lines) -> str: line ) + line = re.sub( + r"address=/([1-2]?[0-9]?[0-9])\.([1-2]?[0-9]?[0-9])\.([1-2]?[0-9]?[0-9])\.([1-2]?[0-9]?[0-9])$", + r"server=/\4.\3.\2.\1.in-addr.arpa/127.0.0.1", + line + ) + if is_supported_dnsmasq(line): text += line + '\r\n'