Attempted to improve the dnsmasq version

This commit is contained in:
Imre Kristoffer Eilertsen
2020-03-14 18:12:59 +01:00
committed by GitHub
parent 486008f206
commit 7459c0d8e8
7 changed files with 28 additions and 13 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'