OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

adblock: update 2.6.2 

* refine 'force dns' handling:
  - enabled-check before firewall reload
  - add rule name (better LuCI experience)

Signed-off-by: Dirk Brenken <dev@brenken.org>
pull/4311/head
Dirk Brenken 2017-04-29 07:56:28 +02:00
parent 95b3c8ba12
commit bf7d1dc85c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/adblock/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=adblock
PKG_VERSION:=2.6.1
PKG_VERSION:=2.6.2
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

8
net/adblock/files/adblock.sh
View File

@ -10,7 +10,7 @@
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="2.6.1"
adb_ver="2.6.2"
adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
adb_enabled=1
adb_debug=0
@ -121,6 +121,7 @@ f_envload()
if [ ${adb_forcedns} -eq 1 ] && [ -z "$(uci -q get firewall.adblock_dns)" ]
then
uci -q set firewall.adblock_dns="redirect"
uci -q set firewall.adblock_dns.name="Adblock DNS"
uci -q set firewall.adblock_dns.src="lan"
uci -q set firewall.adblock_dns.proto="tcp udp"
uci -q set firewall.adblock_dns.src_dport="53"
@ -133,7 +134,10 @@ f_envload()
if [ -n "$(uci -q changes firewall)" ]
then
uci -q commit firewall
/etc/init.d/firewall reload >/dev/null 2>&1
if [ $(/etc/init.d/firewall enabled; printf ${?}) -eq 0 ]
then
/etc/init.d/firewall reload >/dev/null 2>&1
fi
fi
}