From: Stan Grishin <stangri@melmac.ca>
Date: Sun, 10 Dec 2023 02:49:51 +0000 (+0000)
Subject: adblock-fast: bugfix: block domains from config when not using block-lists
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F22854%2Fhead;p=feed%2Fpackages.git

adblock-fast: bugfix: block domains from config when not using block-lists

* remove empty lines from the combined list to allo optimization code
  to work properly

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 1914114ed39f29c8dd81305969741f7636254280)
---

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index 00362ab1d4..3be6d3c34c 100644
--- a/net/adblock-fast/Makefile
+++ b/net/adblock-fast/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock-fast
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=GPL-3.0-or-later
 
diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast
index fff3437f97..12c32c5b0e 100755
--- a/net/adblock-fast/files/etc/init.d/adblock-fast
+++ b/net/adblock-fast/files/etc/init.d/adblock-fast
@@ -1197,6 +1197,7 @@ download_lists() {
 $(cat $A_TMP)"
 	for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; allow_filter="$allow_filter/(^|\.)${hf}$/d;"; done
 
+	sed -i '/^[[:space:]]*$/d' "$B_TMP"
 	[ ! -s "$B_TMP" ] && return 1
 
 	output 1 'Processing downloads '