From fcc91afc65df5913dbd4fc17d7840d5c112415c0 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Sun, 16 Apr 2017 08:25:42 +0200
Subject: [PATCH] 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>
---
 net/adblock/Makefile           | 2 +-
 net/adblock/files/adblock.conf | 2 +-
 net/adblock/files/adblock.init | 5 +++--
 net/adblock/files/adblock.sh   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 5b25930c0..e197127c7 100644
--- 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 acc5518ac..7c1143483 100644
--- 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 ad22abb97..ee94aa822 100755
--- 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 c81f6ac0b..f886723bb 100755
--- 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