adblock-fast: update to 1.2.0-26

Makefile:
* nicer DEPENDS

Init Script:
* ensure resolver config is reverted and resolver is restarted on
  service fail

Signed-off-by: Stan Grishin <stangri@melmac.ca>

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index 73f95485835429bf03e1a345de3d3fad2bd1e0cc..62e3c29e098de7d8f5c8f9ba12fbe1d5746877dc 100644 (file)
--- a/net/adblock-fast/Makefile
+++ b/net/adblock-fast/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock-fast
 PKG_VERSION:=1.2.0
-PKG_RELEASE:=22
+PKG_RELEASE:=26
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=AGPL-3.0-or-later
 
@@ -16,12 +16,14 @@ define Package/adblock-fast
   CATEGORY:=Network
   TITLE:=AdBlock Fast Service
   URL:=https://github.com/stangri/adblock-fast/
-  DEPENDS:=+jshn +curl
-       DEPENDS+=+!BUSYBOX_DEFAULT_AWK:gawk
-       DEPENDS+=+!BUSYBOX_DEFAULT_GREP:grep
-       DEPENDS+=+!BUSYBOX_DEFAULT_SED:sed
-       DEPENDS+=+!BUSYBOX_DEFAULT_SORT:coreutils-sort
   PKGARCH:=all
+  DEPENDS:= \
+       +jshn \
+       +curl \
+       +!BUSYBOX_DEFAULT_AWK:gawk \
+       +!BUSYBOX_DEFAULT_GREP:grep \
+       +!BUSYBOX_DEFAULT_SED:sed \
+       +!BUSYBOX_DEFAULT_SORT:coreutils-sort
 endef
 
 define Package/adblock-fast/description

diff --git a/net/adblock-fast/files/README.md b/net/adblock-fast/files/README.md
deleted file mode 100644 (file)
index df26694..0000000
--- a/net/adblock-fast/files/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# adblock-fast
-
-[![OpenWrt](https://img.shields.io/badge/OpenWrt-Compatible-blueviolet)](https://openwrt.org)
-[![Web UI](https://img.shields.io/badge/Web_UI-Available-blue)](https://docs.openwrt.melmac.ca/adblock-fast/)
-[![Lightweight](https://img.shields.io/badge/Size-Lightweight-brightgreen)](https://openwrt.org/packages/pkgdata/adblock-fast)
-[![License](https://img.shields.io/badge/License-AGPL--3.0--or--later-lightgrey)](https://github.com/stangri/adblock-fast/blob/master/LICENSE)
-
-A fast, lightweight DNS-based ad-blocker for OpenWrt that works with dnsmasq, smartdns, or unbound.  
-It runs once to process and install blocklists, then exits — keeping memory usage low.
-
-## Features
-
-- Minimal runtime memory use
-- Parallel blocklist download and processing
-- Persistent cache support
-- Optional Web UI for custom block/allow lists
-- Reverts if DNS resolution fails after restart
-
-📚 **Full documentation:**  
-[https://docs.openwrt.melmac.ca/adblock-fast/](https://docs.openwrt.melmac.ca/adblock-fast/)

diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast
index 40e69bc27b1a2549db37c93674ed251823e22cf4..2e2f281dc7845d03f6ef99df6066ae5b04dd11f3 100755 (executable)
--- a/net/adblock-fast/files/etc/init.d/adblock-fast
+++ b/net/adblock-fast/files/etc/init.d/adblock-fast
@@ -24,7 +24,7 @@ fi
 
 readonly packageName='adblock-fast'
 readonly PKG_VERSION='dev-test'
-readonly packageCompat='8'
+readonly packageCompat='9'
 readonly serviceName="$packageName $PKG_VERSION"
 readonly packageMemoryThreshold='33554432'
 readonly packageConfigFile="/etc/config/${packageName}"
@@ -2008,6 +2008,7 @@ start_service() {
                json set status 'statusFail'
                json add error 'errorOhSnap'
                status_service 'on_start_failure'
+               resolver 'revert'
        fi
 
        adb_config_cache 'create'