From a029b3f9f42af62e22a262b171a0fa5675b716a7 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 21 Aug 2016 20:56:47 +0200 Subject: [PATCH] adblock: update 1.4.6 * added a 'window.close()' to adblock landing page to automatically close any pop-ups that might get loaded with a blocked ad * simplified dnsmasq check in ap mode Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 2 +- net/adblock/files/adblock-helper.sh | 2 +- net/adblock/files/adblock-update.sh | 2 +- net/adblock/files/www/adblock/index.html | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 293d602811..f95d0ee0c9 100644 --- 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 diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh index e500c92b50..f43fe312b2 100644 --- 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 index 1d08333cfc..b25b981c42 100755 --- 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 index 2f8ba6e4e9..ff6c903424 100644 --- a/net/adblock/files/www/adblock/index.html +++ b/net/adblock/files/www/adblock/index.html @@ -1,5 +1,8 @@ - + + + +