From 522f7a29aac6fc20c3e041a8bbfe76dcd20087de Mon Sep 17 00:00:00 2001
From: ErikJStaab <54731235+ErikJStaab@users.noreply.github.com>
Date: Mon, 2 Sep 2019 10:23:25 -0500
Subject: [PATCH] bind/dnscrypt-proxy: DNSBL ZeuS Tracker has been discontinued
 (#1479)

---
 dns/bind/Makefile                                      |  2 +-
 dns/bind/pkg-descr                                     |  4 ++++
 .../opnsense/mvc/app/models/OPNsense/Bind/Dnsbl.xml    |  1 -
 dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh   | 10 ----------
 dns/dnscrypt-proxy/Makefile                            |  2 +-
 dns/dnscrypt-proxy/pkg-descr                           |  4 ++++
 .../mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml    |  1 -
 .../opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh   | 10 ----------
 8 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/dns/bind/Makefile b/dns/bind/Makefile
index d7d2eda0b..41b0af268 100644
--- a/dns/bind/Makefile
+++ b/dns/bind/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		bind
-PLUGIN_VERSION=		1.8
+PLUGIN_VERSION=		1.9
 PLUGIN_COMMENT=		BIND domain name service
 PLUGIN_DEPENDS=		bind914
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr
index 0ba0cca32..3ba711967 100644
--- a/dns/bind/pkg-descr
+++ b/dns/bind/pkg-descr
@@ -8,6 +8,10 @@ necessary for asking and answering name service questions.
 Plugin Changelog
 ================
 
+1.9
+
+* Removed discontinued DNSBL Zeus Tracker list
+
 1.8
 
 * Fix template generation when there is only one zone configured
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 ecc1bce30..3d83ec392 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
@@ -36,7 +36,6 @@
                 <wsu>WindowsSpyBlocker (update)</wsu>
                 <wse>WindowsSpyBlocker (extra)</wse>
                 <yy>YoYo List</yy>
-                <za>ZeusTracker Abuse.ch List</za>
             </OptionValues>
         </type>
         <whitelists type="CSVListField">
diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
index e179f1bbd..9376ae725 100755
--- a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
+++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh
@@ -217,13 +217,6 @@ simpletrack() {
 	rm ${WORKDIR}/simpletrack-raw
 }
 
-zeusabuse() {
-	# Zeus Tracker List from abuse.ch
-	${FETCH} https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist -o ${WORKDIR}/zeusabuse-raw
-	sed "/\.$/d" ${WORKDIR}/zeusabuse-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" > ${WORKDIR}/zeusabuse
-	rm ${WORKDIR}/zeusabuse-raw
-}
-
 install() {
 	# Put all files in correct format
 	for FILE in $(find ${WORKDIR} -type f); do
@@ -322,9 +315,6 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
 	yy)
 		yoyo
 		;;
-	za)
-		zeusabuse
-		;;
 	esac
 done
 
diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index fd36e825b..2cf68ac7a 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		dnscrypt-proxy
-PLUGIN_VERSION=		1.5
+PLUGIN_VERSION=		1.6
 PLUGIN_COMMENT=		Flexible DNS proxy supporting DNSCrypt and DoH
 PLUGIN_DEPENDS=		dnscrypt-proxy2
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index 8aab60004..777bc746e 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
 Plugin Changelog
 ================
 
+1.6
+
+* Removed discontinued DNSBL Zeus Tracker list
+
 1.5
 
 * Add update and extra WindowsSpyBlocker list
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
index 179c794d8..35c6c5eca 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Dnsbl.xml
@@ -36,7 +36,6 @@
                 <wsu>WindowsSpyBlocker (update)</wsu>
                 <wse>WindowsSpyBlocker (extra)</wse>
                 <yy>YoYo List</yy>
-                <za>ZeusTracker Abuse.ch List</za>
             </OptionValues>
         </type>
     </items>
diff --git a/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh b/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh
index 9e57b3436..44c72135c 100755
--- a/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh
+++ b/dns/dnscrypt-proxy/src/opnsense/scripts/OPNsense/Dnscryptproxy/dnsbl.sh
@@ -217,13 +217,6 @@ simpletrack() {
 	rm ${WORKDIR}/simpletrack-raw
 }
 
-zeusabuse() {
-	# Zeus Tracker List from abuse.ch
-	${FETCH} https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist -o ${WORKDIR}/zeusabuse-raw
-	sed "/\.$/d" ${WORKDIR}/zeusabuse-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" > ${WORKDIR}/zeusabuse
-	rm ${WORKDIR}/zeusabuse-raw
-}
-
 install() {
 	# Put all files in correct format
 	for FILE in $(find ${WORKDIR} -type f); do
@@ -322,9 +315,6 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
 	yy)
 		yoyo
 		;;
-	za)
-		zeusabuse
-		;;
 	esac
 done