adblock-fast: Fixed non-printable characters and bump PKG_VERSION

Signed-off-by: Nikolay Manev <redacted>

diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile
index f3f5c19bac0f9a94ed84bbd9bb2f2038349e1b69..d30cbc811da4eb915efc3295a23fa30f261b8df9 100644 (file)
--- 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.3
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=AGPL-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 c7cd6923f447503005a06a0ccb5d8b8588468ac3..24be72cfa4a246c4fb755cfa3f2bf71d85872efb 100755 (executable)
--- a/net/adblock-fast/files/etc/init.d/adblock-fast
+++ b/net/adblock-fast/files/etc/init.d/adblock-fast
@@ -469,7 +469,8 @@ get_url_filesize() {
        is_present 'curl' || return 0
        size_command='curl --silent --insecure --fail --head --request GET'
 #      size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')"
-       size="$($size_command "$url" | grep -Eo '^[cC]ontent-[lL]ength: (.*)' | awk '{print $2}')"
+# shellcheck disable=SC1017
+       size="$($size_command "$url" | awk -F": " '{IGNORECASE=1}/content-length/ {gsub(/\r/, ""); print $2}' )"
 # shellcheck disable=SC3037
        echo -en "$size"
 }