From: Dirk Brenken <dev@brenken.org>
Date: Wed, 1 Apr 2020 03:43:56 +0000 (+0200)
Subject: adblock: re-release 4.0.1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9d053003fdc3e431dc32565d6b1002c36d3f1f98;p=feed%2Fpackages.git

adblock: re-release 4.0.1

* fixed an oversight introduced in the last 3.99 pre-release series,
  only relevant for "raw" mode e.g. dnscrypt-proxy users

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index cce57ec217..445c22cd2e 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 8ab369475f..95d7c80b54 100755
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -262,13 +262,13 @@ f_dns()
 		esac
 	fi
 
-	if [ -z "${adb_dns}" ] || [ ! -x "$(command -v "${adb_dns}")" ]
+	if [ "${adb_dns}" != "raw" ] && { [ -z "${adb_dns}" ] || [ ! -x "$(command -v "${adb_dns}")" ]; }
 	then
 		f_log "err" "dns backend not found, please set 'adb_dns' manually"
 	fi
 
 	if [ "${adb_dns}" != "raw" ] && { [ "${adb_dnsdir}" = "${adb_tmpbase}" ] || [ "${adb_dnsdir}" = "${adb_backupdir}" ] || \
-		[ "${adb_dnsdir}" = "${adb_reportdir}" ] || [ "${adb_dnsdir}" = "${adb_jaildir}" ] ; }
+		[ "${adb_dnsdir}" = "${adb_reportdir}" ] || [ "${adb_dnsdir}" = "${adb_jaildir}" ]; }
 	then
 		f_log "err" "dns directory '${adb_dnsdir}' has been misconfigured, it must not point to the 'adb_tmpbase', 'adb_backupdir', 'adb_reportdir' or 'adb_jaildir'"
 	fi