From fff884e67f62f0ee16bb95507c782d25a6d91eea Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 12 Dec 2022 21:43:00 +0000 Subject: [PATCH] simple-adblock: bugfix: add dnsmasq.nftset to uci_load_validate * fixes https://github.com/openwrt/openwrt/issues/11481 thanks to: * https://github.com/mistepien for reporting * https://github.com/dave14305 for diagnosing Signed-off-by: Stan Grishin --- net/simple-adblock/Makefile | 2 +- net/simple-adblock/files/simple-adblock.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index ac2854e95b..725ec66b8f 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.3 -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 cdd2dac36a..e57a03b45b 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -1510,7 +1510,7 @@ load_validate_config() { 'verbosity:range(0,2):2' \ 'procd_trigger_wan6:bool:0' \ 'led:or("", "none", file, device, string)' \ - 'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \ + 'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.nftset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \ 'dns_instance:or(list(integer, string)):0' \ 'allowed_domain:list(string)' \ 'allowed_domains_url:list(string)' \ -- 2.30.2