adblock: update 2.6.0-2

* change start priority to get all interface trigger events, even on
fast hardware
* made default trigger delay more conservative to fix possible start up
issues

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 5b25930c016135045b29d52cb1ccf80737ca6f08..e197127c78f0ab5692a8442e949ea808557618c7 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=2.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/adblock/files/adblock.conf b/net/adblock/files/adblock.conf
index acc5518ac1bded6ab96b5dff8124a7a60b7537cf..7c114348347ce31c322a703fb560f64620e8d08c 100644 (file)
--- a/net/adblock/files/adblock.conf
+++ b/net/adblock/files/adblock.conf
@@ -5,7 +5,7 @@ config adblock 'global'
        option adb_enabled '1'
        option adb_debug '0'
        option adb_iface 'wan'
-       option adb_triggerdelay '1'
+       option adb_triggerdelay '2'
        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_backup '0'

diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index ad22abb9783706d3bb6ddfd85d587311f90b7077..ee94aa8228dabe6574a029c83bee18650cf6c3ab 100755 (executable)
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 #
 
-START=90
+START=50
 USE_PROCD=1
 
 EXTRA_COMMANDS="suspend resume query status"
@@ -72,10 +72,11 @@ service_triggers()
     local iface="$(uci -q get adblock.global.adb_iface)"
     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}
     do
         procd_add_interface_trigger "interface.*.up" "${name}" "${adb_init}" start
     done
+    PROCD_RELOAD_DELAY=1000
     procd_add_config_trigger "config.change" "adblock" "${adb_init}" start
 }

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index c81f6ac0b69cc37892534f42597dee338d3d5588..f886723bb6c1d703ba86e9e3b5822dfe984faa4e 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -10,7 +10,7 @@
 #
 LC_ALL=C
 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_enabled=1
 adb_debug=0