commit 6b699a809e6bc87a2643e8bf93ced6e9e380ac24
parent ec133992b73d9fdc11c3c5444fc8e4b06138ae72
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 21 Aug 2016 22:45:51 +0300
Merge pull request #3084 from dibdot/adblock
adblock: update 1.4.6
Diffstat:
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/net/adblock/Makefile b/net/adblock/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=adblock
-PKG_VERSION:=1.4.5
+PKG_VERSION:=1.4.6
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh
@@ -175,7 +175,7 @@ f_envcheck()
rc=-1
f_log "AP mode detected, please set local LuCI instance to ports <> 80/443"
f_exit
- elif [ -z "$(pgrep -f "dnsmasq")" ]
+ elif [ ! -f "/etc/init.d/dnsmasq" ]
then
rc=-1
f_log "please enable the local dnsmasq instance to use adblock"
diff --git 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.5"
+adb_scriptver="1.4.6"
adb_mincfgver="2.4"
adb_scriptdir="${0%/*}"
if [ -r "${adb_pidfile}" ]
diff --git a/net/adblock/files/www/adblock/index.html b/net/adblock/files/www/adblock/index.html
@@ -1,5 +1,8 @@
<html>
- <body>
+ <head>
+ <script>window.close();</script>
+ </head>
+ <body>
<img src="data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA=" alt=""></img>
</body>
</html>
