Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adblock: update 3.8.7

Browse source 
* prevent forced parallel adblock service starts
* refine service trigger

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit a9aae9095f)
This commit is contained in:
Dirk Brenken 2019-10-31 12:34:48 +01:00
parent 807c557cf9
commit 4900b2cb2d
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/adblock/Makefile
View file

@ -6,8 +6,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=3.8.6 PKG_VERSION:=3.8.7
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

32
net/adblock/files/adblock.init
View file

@ -15,6 +15,11 @@ adb_init="/etc/init.d/adblock"
adb_script="/usr/bin/adblock.sh" adb_script="/usr/bin/adblock.sh"
adb_pidfile="/var/run/adblock.pid" adb_pidfile="/var/run/adblock.pid"
if [ -s "${adb_pidfile}" ] && [ "${action}" != "help" ] && [ "${action}" != "status" ]
then
exit 1
fi
boot() boot()
{ {
adb_boot=1 adb_boot=1
@ -61,25 +66,21 @@ restart()
suspend() suspend()
{ {
[ -s "${adb_pidfile}" ] && return 1
rc_procd start_service suspend rc_procd start_service suspend
} }
resume() resume()
{ {
[ -s "${adb_pidfile}" ] && return 1
rc_procd start_service resume rc_procd start_service resume
} }
query() query()
{ {
[ -s "${adb_pidfile}" ] && return 1
rc_procd "${adb_script}" query "${1}" rc_procd "${adb_script}" query "${1}"
} }
report() report()
{ {
[ -s "${adb_pidfile}" ] && return 1
rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}" rc_procd "${adb_script}" report "${1:-"+"}" "${2:-"50"}" "${3:-"false"}" "${4:-"true"}"
} }
@ -106,16 +107,29 @@ status_service()
service_triggers() service_triggers()
{ {
local trigger="$(uci_get adblock global adb_trigger)" local trigger trigger_list="$(uci_get adblock global adb_trigger)"
local delay="$(uci_get adblock extra adb_triggerdelay "2")" local delay="$(uci_get adblock extra adb_triggerdelay "2")"
local type="$(uci_get adblock extra adb_starttype "start")"
PROCD_RELOAD_DELAY=$((delay*1000)) PROCD_RELOAD_DELAY=$((delay*1000))
if [ -n "${trigger}" ] && [ "${trigger}" != "none" ] && [ "${trigger}" != "timed" ]
if [ -z "${trigger_list}" ] && [ -r "/lib/functions/network.sh" ]
then then
procd_add_interface_trigger "interface.*.up" "${trigger}" "${adb_init}" start . "/lib/functions/network.sh"
elif [ -z "${trigger}" ] network_find_wan trigger_list
fi
if [ -n "${trigger_list}" ]
then then
procd_add_raw_trigger "interface.*.up" ${PROCD_RELOAD_DELAY} "${adb_init}" start for trigger in ${trigger_list}
do
if [ "${trigger}" != "none" ] && [ "${trigger}" != "timed" ]
then
procd_add_interface_trigger "interface.*.up" "${trigger}" "${adb_init}" "${type}"
fi
done
else
procd_add_raw_trigger "interface.*.up" ${PROCD_RELOAD_DELAY} "${adb_init}" "${type}"
fi fi
procd_add_reload_trigger "adblock" procd_add_reload_trigger "adblock"
} }

2
net/adblock/files/adblock.sh
View file

@ -13,7 +13,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="3.8.6-2" adb_ver="3.8.7"
adb_basever="" adb_basever=""
adb_enabled=0 adb_enabled=0
adb_debug=0 adb_debug=0