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

Merge pull request #4267 from dibdot/package-adblock

Browse source 
adblock: update 2.6.0-2
This commit is contained in:
Hannu Nyman 2017-04-17 20:28:50 +03:00 committed by GitHub
commit 6b8eb9557e
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

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

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

@ -5,7 +5,7 @@ config adblock 'global'
option adb_enabled '1' option adb_enabled '1'
option adb_debug '0' option adb_debug '0'
option adb_iface 'wan' option adb_iface 'wan'
option adb_triggerdelay '1' option adb_triggerdelay '2'
option adb_whitelist '/etc/adblock/adblock.whitelist' option adb_whitelist '/etc/adblock/adblock.whitelist'
option adb_whitelist_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\"^\"\$1\"\\\|[.]\"\$1)}' option adb_whitelist_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\"^\"\$1\"\\\|[.]\"\$1)}'
option adb_backup '0' option adb_backup '0'

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

@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# #
START=90 START=50
USE_PROCD=1 USE_PROCD=1
EXTRA_COMMANDS="suspend resume query status" EXTRA_COMMANDS="suspend resume query status"
@ -72,10 +72,11 @@ service_triggers()
local iface="$(uci -q get adblock.global.adb_iface)" local iface="$(uci -q get adblock.global.adb_iface)"
local delay="$(uci -q get adblock.global.adb_triggerdelay)" local delay="$(uci -q get adblock.global.adb_triggerdelay)"
PROCD_RELOAD_DELAY=$((${delay:=1} * 1000)) PROCD_RELOAD_DELAY=$((${delay:=2} * 1000))
for name in ${iface} for name in ${iface}
do do
procd_add_interface_trigger "interface.*.up" "${name}" "${adb_init}" start procd_add_interface_trigger "interface.*.up" "${name}" "${adb_init}" start
done done
PROCD_RELOAD_DELAY=1000
procd_add_config_trigger "config.change" "adblock" "${adb_init}" start procd_add_config_trigger "config.change" "adblock" "${adb_init}" start
} }

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

@ -10,7 +10,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="2.6.0" adb_ver="2.6.0-2"
adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')" adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
adb_enabled=1 adb_enabled=1
adb_debug=0 adb_debug=0