adblock: update 1.1.15

* toggle to quickly switch adblocking 'on' or 'off' (/etc/init.d/adblock
toggle)
* new config option 'fetchttl' to set download timeouts (default: 5
seconds)
* better config check, distinct between major/minor changes
* documentation update

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 4f3f239ff2)
This commit is contained in:
Dirk Brenken
2016-06-03 10:14:48 +03:00
committed by Hannu Nyman
parent 72d2cfe064
commit 6b5a320bed
6 changed files with 75 additions and 15 deletions
+4 -3
View File
@@ -37,8 +37,8 @@ fi
# get current directory and set script/config version
#
adb_scriptdir="${0%/*}"
adb_scriptver="1.1.12"
adb_mincfgver="1.3"
adb_scriptver="1.1.15"
adb_mincfgver="2.0"
# source in adblock function library
#
@@ -298,8 +298,9 @@ fi
#
f_cntconfig
adb_count="$(${adb_uci} -q get "adblock.global.adb_overall_count")"
if [ -n "${adb_revsrclist}" ] || [ -n "${rm_done}" ] || [ -n "${restore_done}" ]
if [ -n "${adb_revsrclist}" ] || [ -n "${rm_done}" ] || [ -n "${restore_done}" ] || [ -n "${mv_done}" ]
then
"${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
/etc/init.d/dnsmasq restart
sleep 1
rc="$(ps | grep -q "[d]nsmasq"; printf ${?})"