adblock: update 1.4.10

- add 'enabled' check to iface hotplug event handler
- decrease startup priority from 99 to 90
- fix tab indentation in config

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

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

diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh
index c1e467d7c254ea5c850fcd2684c08926d2144de2..4092d84fb6e6c40a46da5006abac945973505ef0 100755 (executable)
--- a/net/adblock/files/adblock-update.sh
+++ b/net/adblock/files/adblock-update.sh
@@ -10,7 +10,7 @@
 #
 adb_pid="${$}"
 adb_pidfile="/var/run/adblock.pid"
-adb_scriptver="1.4.9"
+adb_scriptver="1.4.10"
 adb_mincfgver="2.5"
 adb_scriptdir="${0%/*}"
 if [ -r "${adb_pidfile}" ]

diff --git a/net/adblock/files/adblock.conf b/net/adblock/files/adblock.conf
index da58c2e83384b7b704d999602a0e3fa1619e5feb..cc86b503b03ca8a11f5424398f6059f8ad5a4c83 100644 (file)
--- a/net/adblock/files/adblock.conf
+++ b/net/adblock/files/adblock.conf
@@ -91,10 +91,10 @@ config source 'ruadlist'
        option adb_src_desc 'focus on russian ads plus generic easylist additions, weekly updates, approx. 2.000 entries'
 
 config source 'securemecca'
-    option enabled '0'
-    option adb_src 'http://securemecca.com/Downloads/hosts.txt'
-    option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
-    option adb_src_desc 'broad blocklist, infrequent updates, approx. 25.000 entries'
+       option enabled '0'
+       option adb_src 'http://securemecca.com/Downloads/hosts.txt'
+       option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+       option adb_src_desc 'broad blocklist, infrequent updates, approx. 25.000 entries'
 
 config source 'shalla'
        option enabled '0'

diff --git a/net/adblock/files/adblock.hotplug b/net/adblock/files/adblock.hotplug
index 33377b5e6cc88af5c829f57d277ad870c61cf7a0..ee48bb05c4e381a527806a2ab3e37f839f530bc7 100644 (file)
--- a/net/adblock/files/adblock.hotplug
+++ b/net/adblock/files/adblock.hotplug
@@ -4,8 +4,9 @@
 adb_pid="${$}"
 adb_helper="/usr/bin/adblock-helper.sh"
 adb_pidfile="/var/run/adblock.pid"
+adb_enabled="$(/etc/init.d/adblock enabled; echo $?)"
 
-if [ -f "${adb_pidfile}" ] || [ "${ACTION}" != "ifup" ]
+if [ "${adb_enabled}" = "1" ] || [ -f "${adb_pidfile}" ] || [ "${ACTION}" != "ifup" ]
 then
     exit 0
 fi

diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index f7b707a21bf48d588d61d5cd9bb9281ce1064bbe..e683dfa75b6a9af1dbf99e9ea10bd7d48552febf 100755 (executable)
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 #
 
-START=99
+START=90
 EXTRA_COMMANDS="toggle stats cfgup query"
 EXTRA_HELP="   toggle  Toggle adblock 'on' or 'off'
        stats   Update adblock statistics