From 5092dbd1472c986652f20a3b201f9996582fcb83 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Sun, 25 Sep 2022 21:00:00 +0200
Subject: [PATCH] adblock: update 4.1.4-5

* auto-whitelist ext. dns lookup domain
* add public doh server blocklist source
* whitespace fixes in adblock.sources

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 5603ed923747f7f361be4bf69387317f35f7f548)
---
 net/adblock/Makefile              |  2 +-
 net/adblock/files/adblock.sh      |  8 +++++---
 net/adblock/files/adblock.sources | 17 ++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index f162ac526..0cbc1e016 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.1.4
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 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 0a0c1cd6a..94b7b62b0 100755
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -585,7 +585,7 @@ f_extconf() {
 # restart dns backend
 #
 f_dnsup() {
-	local dns_service dns_up dns_pid restart_rc cnt="0" out_rc="4" in_rc="${1:-0}"
+	local rset dns_service dns_up dns_pid restart_rc cnt="0" out_rc="4" in_rc="${1:-0}"
 
 	if [ "${adb_dns}" = "raw" ]; then
 		out_rc="0"
@@ -621,12 +621,13 @@ f_dnsup() {
 		fi
 	fi
 	if [ "${restart_rc}" = "0" ]; then
+		rset="/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}"
 		while [ "${cnt}" -le "${adb_dnstimeout}" ]; do
 			dns_service="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}")"
 			dns_up="$(printf "%s" "${dns_service}" | jsonfilter -l1 -e "@[\"${adb_dns}\"].instances.*.running")"
 			dns_pid="$(printf "%s" "${dns_service}" | jsonfilter -l1 -e "@[\"${adb_dns}\"].instances.*.pid")"
 			if [ "${dns_up}" = "true" ] && [ -n "${dns_pid}" ] && ! ls "/proc/${dns_pid}/fd/${adb_dnsdir}/${adb_dnsfile}" >/dev/null 2>&1; then
-				if [ -x "${adb_lookupcmd}" ] && [ "${adb_lookupdomain}" != "false" ]; then
+				if [ -x "${adb_lookupcmd}" ] && [ -n "$(printf "%s" "${adb_lookupdomain}" | "${adb_awk}" "${rset}")" ]; then
 					if "${adb_lookupcmd}" "${adb_lookupdomain}" >/dev/null 2>&1; then
 						out_rc="0"
 						break
@@ -692,7 +693,8 @@ f_list() {
 				rm -f "${adb_tmpdir}/tmp.raw.${src_name}"
 			elif [ "${src_name}" = "whitelist" ] && [ -f "${adb_whitelist}" ]; then
 				rset="/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}"
-				"${adb_awk}" "${rset}" "${adb_whitelist}" >"${adb_tmpdir}/tmp.raw.${src_name}"
+				printf "%s\n" "${adb_lookupdomain}" | "${adb_awk}" "${rset}" >"${adb_tmpdir}/tmp.raw.${src_name}"
+				"${adb_awk}" "${rset}" "${adb_whitelist}" >>"${adb_tmpdir}/tmp.raw.${src_name}"
 				out_rc="${?}"
 				if [ "${out_rc}" = "0" ]; then
 					rset="/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\\.\",\"\\\\.\",\$1);print tolower(\"^(|.*\\\\.)\"\$1\"$\")}"
diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources
index 1dce4bda7..fc7115b5b 100644
--- a/net/adblock/files/adblock.sources
+++ b/net/adblock/files/adblock.sources
@@ -62,6 +62,13 @@
 		"focus": "general",
 		"descurl": "https://disconnect.me"
 	},
+	"doh_blocklist": {
+		"url": "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-domains_overall.txt",
+		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
+		"size": "S",
+		"focus": "doh_server",
+		"descurl": "https://github.com/dibdot/DoH-IP-blocklists"
+	},
 	"energized": {
 		"url": "https://block.energized.pro/",
 		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
@@ -91,12 +98,12 @@
 		"descurl": "https://hblock.molinero.dev"
 	},
 	 "lightswitch05": {
-                "url": "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt",
+		"url": "https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt",
 		"rule": "/^0\\.0\\.0\\.0[[:space:]]+([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
-                "size": "XL",
-                "focus": "compilation",
-                "descurl": "https://github.com/lightswitch05/hosts"
-        },
+		"size": "XL",
+		"focus": "compilation",
+		"descurl": "https://github.com/lightswitch05/hosts"
+	},
 	"notracking": {
 		"url": "https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt",
 		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",