diff --git a/dns/bind/Makefile b/dns/bind/Makefile
index b79692278..750a9f3a9 100644
--- a/dns/bind/Makefile
+++ b/dns/bind/Makefile
@@ -1,5 +1,6 @@
PLUGIN_NAME= bind
PLUGIN_VERSION= 1.2
+PLUGIN_REVISION= 1
PLUGIN_COMMENT= BIND domain name service
PLUGIN_DEPENDS= bind912
PLUGIN_MAINTAINER= m.muenz@gmail.com
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml
index e3a95905d..d0491bfb5 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml
@@ -11,7 +11,9 @@
N
Y
+ AdAway List
AdGuard List
+ Cameleon List
Easy List
EMD Malicious Domains List
Easyprivacy List
@@ -19,6 +21,8 @@
NoCoin List
PornTop1M List
Ransomware Tracker List
+ Windows Spyware Blocker
+ YoYo List
diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
index 65d1c8384..05659a9ff 100755
--- a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
+++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
@@ -98,6 +98,34 @@ 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
+}
+
+cameleon() {
+ # Cameleon List
+ ${FETCH} http://sysctl.org/cameleon/hosts -o ${WORKDIR}/cameleon-raw
+ sed "/\.$/d" ${WORKDIR}/cameleon-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}/cameleon
+ rm ${WORKDIR}/cameleon-raw
+}
+
+adaway() {
+ # AdAway List
+ ${FETCH} https://adaway.org/hosts.txt -o ${WORKDIR}/adaway-raw
+ sed "/\.$/d" ${WORKDIR}/adaway-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}/adaway
+ rm ${WORKDIR}/adaway-raw
+}
+
+yoyo() {
+ # YoYo List
+ ${FETCH} "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext" -o ${WORKDIR}/yoyo-raw
+ sed "/\.$/d" ${WORKDIR}/yoyo-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}/yoyo
+ rm ${WORKDIR}/yoyo-raw
+}
+
install() {
# Put all files in correct format
for FILE in $(find ${WORKDIR} -type f); do
@@ -111,9 +139,15 @@ install() {
for CAT in $(echo ${1} | tr ',' ' '); do
case "${CAT}" in
+ aa)
+ adaway
+ ;;
ag)
adguard
;;
+ ca)
+ cameleon
+ ;;
el)
easylist
;;
@@ -138,6 +172,12 @@ for CAT in $(echo ${1} | tr ',' ' '); do
pt)
porntop
;;
+ ws)
+ windowsspyblocker
+ ;;
+ yy)
+ yoyo
+ ;;
esac
done