Browse Source

Merge pull request #10406 from dibdot/adblock

adblock: update 3.8.7
lilik-openwrt-22.03
Dirk Brenken 5 years ago
committed by GitHub
parent
commit
1b4f838815
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 12 deletions
  1. +2
    -2
      net/adblock/Makefile
  2. +23
    -9
      net/adblock/files/adblock.init
  3. +1
    -1
      net/adblock/files/adblock.sh

+ 2
- 2
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_RELEASE:=2
PKG_VERSION:=3.8.7
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>


+ 23
- 9
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
elif [ -z "${trigger}" ]
. "/lib/functions/network.sh"
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"
} }

+ 1
- 1
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


Loading…
Cancel
Save