openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-26 13:26:17 +04:00
Code Issues Packages Projects Releases Wiki Activity

simple-adblock: bugfix: detect dnsmasq ipset support

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

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
2022-11-28 04:37:42 +00:00
parent c711dea2f4
commit cc10774e6e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/simple-adblock/Makefile
View File

@@ -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 <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later

8
net/simple-adblock/files/simple-adblock.init
View File

@@ -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
}