From: Dirk Brenken <dev@brenken.org>
Date: Tue, 21 Jun 2016 03:10:47 +0000 (+0200)
Subject: adbock: update 1.2.6
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=001646e3fe789b6dc0166d4a1aaaee7625e665a4;p=feed%2Fpackages.git

adbock: update 1.2.6

* small addition in case of a failed list download

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 78457ffd6f..56c0d5716a 100644
--- 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
index d03e452180..7c0f574ee9 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.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"