adblock: update 1.0.2

* fix corner case during shallalist backup/restore

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

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index cffa23d3759a079689206e3ce7fe70e4d5d45818..3fcbc9d8445a971f96fb01aa916a4842da76014d 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <openwrt@brenken.org>

diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh
index 56ea4a0fe82222dd5fdcf326b7d51e60f2cdbc36..f516e414def74b0dbc250bbc24f1fc95664d60a3 100755 (executable)
--- a/net/adblock/files/adblock-update.sh
+++ b/net/adblock/files/adblock-update.sh
@@ -36,7 +36,7 @@ fi
 # get current directory, script- and openwrt version
 #
 adb_scriptdir="${0%/*}"
-adb_scriptver="1.0.1"
+adb_scriptver="1.0.2"
 openwrt_version="$(cat /etc/openwrt_version)"
 
 # source in adblock function library
@@ -124,9 +124,12 @@ then
                 f_log "   source archive (pre-)processing finished"
             else
                 rc=0
+                adb_srclist="! -name ${adb_dnsprefix}.${src_name}"
+                adb_errsrclist="-name ${adb_dnsprefix}.${src_name}"
             fi
         else
             rc=0
+            adb_srclist="! -name ${adb_dnsprefix}.${src_name}"
             adb_errsrclist="-name ${adb_dnsprefix}.${src_name}"
             f_log "   source archive download failed"
         fi