From: Stan Grishin <stangri@melmac.ca>
Date: Sun, 1 Oct 2023 23:52:15 +0000 (+0000)
Subject: adblock-fast: update to 1.0.0-5
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e805d653dc473c5b871a97ab95f36dfe94b791da;p=feed%2Fpackages.git

adblock-fast: update to 1.0.0-5

* improve processing of dnsmasq config files
* do not run sed/show error if allow_filter is empty

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

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index 23ec3acad3..bd7ad9845b 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.0.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 b0ce905033..ccb63bb4f0 100755
--- a/net/adblock-fast/files/etc/init.d/adblock-fast
+++ b/net/adblock-fast/files/etc/init.d/adblock-fast
@@ -66,6 +66,7 @@ readonly domainsFilter='/^#/d;s/[[:space:]]*#.*$//;s/[[:space:]]*$//;s/[[:cntrl:
 readonly adBlockPlusFilter='/^#/d;/^!/d;s/[[:space:]]*#.*$//;s/^||//;s/\^$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;'
 readonly dnsmasqFileFilter='\|^server=/[[:alnum:]_.-].*/|!d'
 readonly dnsmasq2FileFilter='\|^local=/[[:alnum:]_.-].*/|!d'
+readonly dnsmasq3FileFilter='\|^address=/[[:alnum:]_.-].*/|!d'
 readonly _OK_='\033[0;32m\xe2\x9c\x93\033[0m'
 readonly _FAIL_='\033[0;31m\xe2\x9c\x97\033[0m'
 readonly __OK__='\033[0;32m[\xe2\x9c\x93]\033[0m'
@@ -279,6 +280,8 @@ append_url() {
  		echo 'dnsmasq'
  	elif grep -q '^local=' "$file"; then
  		echo 'dnsmasq2'
+ 	elif grep -q '^address=' "$file"; then
+ 		echo 'dnsmasq3'
  	elif grep -q '^0.0.0.0' "$file" || grep -q '^127.0.0.1' "$file"; then
  		echo 'hosts'
  	elif [ -n "$(sed "$domainsFilter" "$file" | head -1)" ]; then
@@ -868,6 +871,7 @@ process_file_url() {
 			adblockplus) filter="$adBlockPlusFilter";;
 			dnsmasq) filter="$dnsmasqFileFilter";;
 			dnsmasq2) filter="$dnsmasq2FileFilter";;
+			dnsmasq3) filter="$dnsmasq3FileFilter";;
 			domains) filter="$domainsFilter";;
 			hosts) filter="$hostsFilter";;
 			*)
@@ -878,7 +882,9 @@ process_file_url() {
 				return 0
 			;;
 		esac
-		sed -i "$filter" "$R_TMP"
+		if [ -n "$filter" ] && [ "$action" != 'file' ]; then
+			sed -i "$filter" "$R_TMP"
+		fi
 		if [ ! -s "$R_TMP" ]; then
 			output 1 "$_FAIL_"
 			output 2 "[DL] $type $label ($format) $__FAIL__\\n"
@@ -1038,15 +1044,16 @@ $(cat $A_TMP)"
 		mv "$A_TMP" "$B_TMP"
 	fi
 
-	output 2 'Allowing domains '
-	json set message "$(get_text "statusProcessing"): allowing domains"
-	if sed -i -E "$allow_filter" "$B_TMP"; then
-		output_ok
-	else
-		output_failn
-		json add error "errorAllowListProcessing"
+	if [ -n "$allow_filter" ]; then
+		output 2 'Allowing domains '
+		json set message "$(get_text "statusProcessing"): allowing domains"
+		if sed -i -E "$allow_filter" "$B_TMP"; then
+			output_ok
+		else
+			output_failn
+			json add error "errorAllowListProcessing"
+		fi
 	fi
-
 	output 2 'Formatting merged file '
 	json set message "$(get_text "statusProcessing"): formatting merged file"
 	if [ -z "$outputFilterIPv6" ]; then