OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dirk Brenken 2016-09-29 18:07:45 +02:00
parent 564dc2294a
commit 23b14e7b4c
5 changed files with 9 additions and 8 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 include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=1.4.9 PKG_VERSION:=1.4.10
PKG_RELEASE:=1 PKG_RELEASE:=1
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-update.sh
View File

@ -10,7 +10,7 @@
# #
adb_pid="${$}" adb_pid="${$}"
adb_pidfile="/var/run/adblock.pid" adb_pidfile="/var/run/adblock.pid"
adb_scriptver="1.4.9" adb_scriptver="1.4.10"
adb_mincfgver="2.5" adb_mincfgver="2.5"
adb_scriptdir="${0%/*}" adb_scriptdir="${0%/*}"
if [ -r "${adb_pidfile}" ] if [ -r "${adb_pidfile}" ]

8
net/adblock/files/adblock.conf
View File

@ -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' option adb_src_desc 'focus on russian ads plus generic easylist additions, weekly updates, approx. 2.000 entries'
config source 'securemecca' config source 'securemecca'
option enabled '0' option enabled '0'
option adb_src 'http://securemecca.com/Downloads/hosts.txt' 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_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 adb_src_desc 'broad blocklist, infrequent updates, approx. 25.000 entries'
config source 'shalla' config source 'shalla'
option enabled '0' option enabled '0'

3
net/adblock/files/adblock.hotplug
View File

@ -4,8 +4,9 @@
adb_pid="${$}" adb_pid="${$}"
adb_helper="/usr/bin/adblock-helper.sh" adb_helper="/usr/bin/adblock-helper.sh"
adb_pidfile="/var/run/adblock.pid" 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 then
exit 0 exit 0
fi fi

2
net/adblock/files/adblock.init
View File

@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# #
START=99 START=90
EXTRA_COMMANDS="toggle stats cfgup query" EXTRA_COMMANDS="toggle stats cfgup query"
EXTRA_HELP=" toggle Toggle adblock 'on' or 'off' EXTRA_HELP=" toggle Toggle adblock 'on' or 'off'
stats Update adblock statistics stats Update adblock statistics