projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4e873aa)
adblock: update 1.4.6 3084/head
authorDirk Brenken <dev@brenken.org>
Sun, 21 Aug 2016 18:56:47 +0000 (20:56 +0200)
committerDirk Brenken <dev@brenken.org>
Sun, 21 Aug 2016 18:56:47 +0000 (20:56 +0200)
* 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 <dev@brenken.org>
net/adblock/Makefile patch | blob | history
net/adblock/files/adblock-helper.sh patch | blob | history
net/adblock/files/adblock-update.sh patch | blob | history
net/adblock/files/www/adblock/index.html patch | blob | history

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 293d6028116bf4fea410f13c1674bd47656b31b8..f95d0ee0c9adedfec0439f9e2566c7d3756d85c5 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.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
index e500c92b504a3bb77139fbb50416128b70005d20..f43fe312b2f22583fd200c1a51e1b2eb61687c08 100644 (file)
--- 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 1d08333cfcc123b0d5af538b2e0002d5dbf25b01..b25b981c42dbaf2f283ca1121a12c3933fd06cf7 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.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 2f8ba6e4e9b838039a9843c19b27298dd0f22f25..ff6c903424ecb3fd63109f1716e531f484212bf3 100644 (file)
--- 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>
Mirror of packages feed