simple-adblock: bugfix: detect dnsmasq ipset support

* Fixes https://github.com/openwrt/packages/issues/19978, thank you
  @parona-source for the report/patch!

Signed-off-by: Stan Grishin <[email protected]>

diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile
index a2f05f792dc137ffc53e6eb4d3ccbefcd23375d7..6778f3a7b2c525841487e28207c6ea8b2a18d327 100644 (file)
--- 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:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Stan Grishin <[email protected]>
 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 58c8eb7a7d0c0f2d69050e3dbc57b603431de942..7c9829d159c3e26132b84307e914efe68cd66983 100644 (file)
--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@@ -393,7 +393,7 @@ load_environment() {
        output "$_ERROR_: $serviceName failed to discover WAN gateway.\\n"; return 1;
 }
 
-dnsmasq() {
+resolver() {
        local cfg="$1" param="$2"
        case "$param" in
                dnsmasq.addnhosts)
@@ -430,10 +430,10 @@ dns() {
 
                        config_load 'dhcp'
                        if [ "$dns_instance" = "*" ]; then
-                               config_foreach dnsmasq 'dnsmasq' "$dns"
+                               config_foreach resolver 'dnsmasq' "$dns"
                        elif [ -n "$dns_instance" ]; then
                                for i in $dns_instance; do
-                                       dnsmasq "@dnsmasq[$i]" "$dns" || dnsmasq "$i" "$dns"
+                                       resolver "@dnsmasq[$i]" "$dns" || resolver "$i" "$dns"
                                done
                        fi
 
@@ -1426,7 +1426,7 @@ killcache() {
        rm -f "$dnsmasqServersCache" "$dnsmasqServersGzip"
        rm -f "$unboundCache" "$unboundGzip"
        config_load 'dhcp'
-       config_foreach dnsmasq 'dnsmasq' 'cleanup'
+       config_foreach resolver 'dnsmasq' 'cleanup'
        uci_commit 'dhcp'
        return 0
 }