Add update and extra WindowsSpyBlocker list (#1405)

This commit is contained in:
CrazyMax
2019-07-16 09:37:19 +02:00
committed by Franco Fichtner
parent 50e7e4ff6d
commit 0ff846fbcb
8 changed files with 68 additions and 16 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= bind
PLUGIN_VERSION= 1.5
PLUGIN_VERSION= 1.6
PLUGIN_COMMENT= BIND domain name service
PLUGIN_DEPENDS= bind914
PLUGIN_MAINTAINER= m.muenz@gmail.com
+4
View File
@@ -8,6 +8,10 @@ necessary for asking and answering name service questions.
Plugin Changelog
================
1.6
* Add update and extra WindowsSpyBlocker list
1.5
* Add basic zone management
@@ -32,7 +32,9 @@
<sa>Simple Ad List</sa>
<st>Simple Tracker List</st>
<sb>Steven Black List</sb>
<ws>Windows Spyware Blocker</ws>
<ws>WindowsSpyBlocker (spy)</ws>
<wsu>WindowsSpyBlocker (update)</wsu>
<wse>WindowsSpyBlocker (extra)</wse>
<yy>YoYo List</yy>
<za>ZeusTracker Abuse.ch List</za>
</OptionValues>
@@ -98,11 +98,25 @@ mwdomains() {
rm ${WORKDIR}/malwaredomains-raw
}
windowsspyblocker() {
# WindowsSpyBlocker
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt -o ${WORKDIR}/windowsspyblocker-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblocker-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblocker
rm ${WORKDIR}/windowsspyblocker-raw
windowsspyblockerspy() {
# WindowsSpyBlocker (spy)
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt -o ${WORKDIR}/windowsspyblockerspy-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblockerspy-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblockerspy
rm ${WORKDIR}/windowsspyblockerspy-raw
}
windowsspyblockerupdate() {
# WindowsSpyBlocker (update)
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/update.txt -o ${WORKDIR}/windowsspyblockerupdate-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblockerupdate-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblockerupdate
rm ${WORKDIR}/windowsspyblockerupdate-raw
}
windowsspyblockerextra() {
# WindowsSpyBlocker (extra)
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/extra.txt -o ${WORKDIR}/windowsspyblockerextra-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblockerextra-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblockerextra
rm ${WORKDIR}/windowsspyblockerextra-raw
}
cameleon() {
@@ -297,7 +311,13 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
simpletrack
;;
ws)
windowsspyblocker
windowsspyblockerspy
;;
wsu)
windowsspyblockerupdate
;;
wse)
windowsspyblockerextra
;;
yy)
yoyo
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= dnscrypt-proxy
PLUGIN_VERSION= 1.4
PLUGIN_VERSION= 1.5
PLUGIN_COMMENT= Flexible DNS proxy supporting DNSCrypt and DoH
PLUGIN_DEPENDS= dnscrypt-proxy2
PLUGIN_MAINTAINER= m.muenz@gmail.com
+4
View File
@@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
Plugin Changelog
================
1.5
* Add update and extra WindowsSpyBlocker list
1.4
* Added 7 new DNSBL blacklists
@@ -32,7 +32,9 @@
<sa>Simple Ad List</sa>
<st>Simple Tracker List</st>
<sb>Steven Black List</sb>
<ws>Windows Spyware Blocker</ws>
<ws>WindowsSpyBlocker (spy)</ws>
<wsu>WindowsSpyBlocker (update)</wsu>
<wse>WindowsSpyBlocker (extra)</wse>
<yy>YoYo List</yy>
<za>ZeusTracker Abuse.ch List</za>
</OptionValues>
@@ -98,11 +98,25 @@ mwdomains() {
rm ${WORKDIR}/malwaredomains-raw
}
windowsspyblocker() {
# WindowsSpyBlocker
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt -o ${WORKDIR}/windowsspyblocker-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblocker-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblocker
rm ${WORKDIR}/windowsspyblocker-raw
windowsspyblockerspy() {
# WindowsSpyBlocker (spy)
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt -o ${WORKDIR}/windowsspyblockerspy-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblockerspy-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblockerspy
rm ${WORKDIR}/windowsspyblockerspy-raw
}
windowsspyblockerupdate() {
# WindowsSpyBlocker (update)
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/update.txt -o ${WORKDIR}/windowsspyblockerupdate-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblockerupdate-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblockerupdate
rm ${WORKDIR}/windowsspyblockerupdate-raw
}
windowsspyblockerextra() {
# WindowsSpyBlocker (extra)
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/extra.txt -o ${WORKDIR}/windowsspyblockerextra-raw
sed "/\.$/d" ${WORKDIR}/windowsspyblockerextra-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/windowsspyblockerextra
rm ${WORKDIR}/windowsspyblockerextra-raw
}
cameleon() {
@@ -297,7 +311,13 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
simpletrack
;;
ws)
windowsspyblocker
windowsspyblockerspy
;;
wsu)
windowsspyblockerupdate
;;
wse)
windowsspyblockerextra
;;
yy)
yoyo