From 65f4d3a0b4a950d47698a1009e9baa0c388294cb Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 15 Aug 2023 16:31:21 +0000 Subject: [PATCH] simple-adblock: bugfixes for uci_load_validate * fix validation for force_dns_port when missing in config * fix validation for dns_instance when * or - are used Signed-off-by: Stan Grishin (cherry picked from commit ad8aa084c18af6fd878e578453d7077deb5c223e) --- net/simple-adblock/Makefile | 2 +- net/simple-adblock/files/simple-adblock.init | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index 5037303ec8..b3820ac818 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.9.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index 25240c8c10..ce51af0d79 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -1393,7 +1393,7 @@ adb_start() { fi json_add_array firewall if [ "$force_dns" -ne 0 ]; then - for c in $force_dns_port; do + for c in ${force_dns_port/,/ }; do if netstat -tuln | grep LISTEN | grep ":${c}" >/dev/null 2>&1; then json_add_object "" json_add_string type redirect @@ -1640,7 +1640,7 @@ load_validate_config() { uci_load_validate "$packageName" "$packageName" "$1" "${2}${3:+ $3}" \ 'enabled:bool:0' \ 'force_dns:bool:1' \ - 'force_dns_port:list(integer):"53 853"' \ + 'force_dns_port:list(integer):53,853' \ 'parallel_downloads:bool:1' \ 'debug:bool:0' \ 'compressed_cache:bool:0' \ @@ -1661,7 +1661,7 @@ load_validate_config() { 'procd_boot_wan_timeout:integer:60' \ 'led:or("", "none", file, device, string)' \ 'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.nftset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \ - 'dns_instance:or(list(integer, string)):0' \ + 'dns_instance:list(or(integer, string)):0' \ 'allowed_domain:list(string)' \ 'allowed_domains_url:list(string)' \ 'blocked_domain:list(string)' \