lede-packages-rs

commit 8a5b249c2cdeb14c96456174f76f82f0c46862c1
parent 040c345f7a43be9c91da5e972f34fb51bc1a4d55
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Tue, 21 Jun 2016 09:16:30 +0300

Merge pull request #2882 from dibdot/adblock

adbock: update 1.2.6
Diffstat:
M
net/adblock/Makefile
 | 
2
+-
M
net/adblock/files/adblock-update.sh
 | 
7
++++++-

2 files changed, 7 insertions(+), 2 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.2.5
+PKG_VERSION:=1.2.6
 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
@@ -10,7 +10,7 @@
 #
 adb_pid="${$}"
 adb_pidfile="/var/run/adblock.pid"
-adb_scriptver="1.2.5"
+adb_scriptver="1.2.6"
 adb_mincfgver="2.2"
 adb_scriptdir="${0%/*}"
 if [ -r "${adb_pidfile}" ]
@@ -161,6 +161,11 @@ do
             "${adb_uci}" -q set "adblock.${src_name}.adb_src_timestamp=list restored"
             f_log "   source download failed, restored (${count} entries)"
         else
+            if [ -r "${adb_dnsdir}/${adb_dnsprefix}.${src_name}" ]
+            then
+                rm -f "${adb_dnsdir}/${adb_dnsprefix}.${src_name}"
+                rm_done="true"
+            fi
             "${adb_uci}" -q delete "adblock.${src_name}.adb_src_count"
             "${adb_uci}" -q set "adblock.${src_name}.adb_src_timestamp=download failed"
             f_log "   source download failed, skipped"