diff options
| author | Stan Grishin <stangri@melmac.ca> | 2024-01-18 23:22:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 23:22:48 -0700 |
| commit | 5a64a1b9abee0b777241ed077d1f07d4a963a142 (patch) | |
| tree | 3deb0dfc672199eb27c62cd041d94c74005862a0 | |
| parent | ca6216ef0718856d186efba2a6d7add50750142b (diff) | |
| parent | 0f059b6523f3720441cf608cbd9769265d859de6 (diff) | |
Merge pull request #23126 from stangri/master-adblock-fast
adblock-fast: update to 1.1.1-3
| -rw-r--r-- | net/adblock-fast/Makefile | 2 | ||||
| -rwxr-xr-x | net/adblock-fast/files/etc/init.d/adblock-fast | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile index 50de95d95..c6b574c3a 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.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 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 2ec53ec28..a95f49977 100755 --- a/net/adblock-fast/files/etc/init.d/adblock-fast +++ b/net/adblock-fast/files/etc/init.d/adblock-fast @@ -60,7 +60,7 @@ readonly runningConfigFile="/dev/shm/${packageName}.config" readonly runningErrorFile="/dev/shm/${packageName}.error" readonly runningStatusFile="/dev/shm/${packageName}.status" readonly hostsFilter='/localhost/d;/^#/d;/^[^0-9]/d;s/^0\.0\.0\.0.//;s/^127\.0\.0\.1.//;s/[[:space:]]*#.*$//;s/[[:cntrl:]]$//;s/[[:space:]]//g;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;' -readonly domainsFilter='/^#/d;s/[[:space:]]*#.*$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;' +readonly domainsFilter='/^#/d;s/[[:space:]]*#.*$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/^$/d;/[^[:alnum:]_.-]/d;' 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;s|server=/||;s|/.*$||' readonly dnsmasq2FileFilter='\|^local=/[[:alnum:]_.-].*/|!d;s|local=/||;s|/.*$||' @@ -1351,7 +1351,7 @@ $(sed '/^[[:space:]]*$/d' "$A_TMP")" if sed "$outputFilter" "$B_TMP" > "$A_TMP"; then output_ok else - output_failn + output_failn json add error 'errorDataFileFormatting' fi else |