openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

adblock-fast: bugfixes: empty allow-lists, support for swap

Browse Source 
* do not produce an error on empty allow-lists, fixes https://github.com/openwrt/packages/issues/26228
* do not produce an error when swap is available, fixes https://github.com/openwrt/packages/issues/26313

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
2025-04-14 23:50:38 +00:00
parent 9c557d206b
commit 71f596840b
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/adblock-fast/Makefile
View File

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock-fast PKG_NAME:=adblock-fast
PKG_VERSION:=1.1.3 PKG_VERSION:=1.1.3
PKG_RELEASE:=5 PKG_RELEASE:=9
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=AGPL-3.0-or-later PKG_LICENSE:=AGPL-3.0-or-later

31
net/adblock-fast/files/etc/init.d/adblock-fast
View File

@@ -26,6 +26,7 @@ readonly packageName='adblock-fast'
readonly PKG_VERSION='dev-test' readonly PKG_VERSION='dev-test'
readonly packageCompat='4' readonly packageCompat='4'
readonly serviceName="$packageName $PKG_VERSION" readonly serviceName="$packageName $PKG_VERSION"
readonly packageMemoryThreshold='33554432'
readonly packageConfigFile="/etc/config/${packageName}" readonly packageConfigFile="/etc/config/${packageName}"
readonly dnsmasqAddnhostsFile="/var/run/${packageName}/dnsmasq.addnhosts" readonly dnsmasqAddnhostsFile="/var/run/${packageName}/dnsmasq.addnhosts"
readonly dnsmasqAddnhostsCache="/var/run/${packageName}/dnsmasq.addnhosts.cache" readonly dnsmasqAddnhostsCache="/var/run/${packageName}/dnsmasq.addnhosts.cache"
@@ -362,9 +363,18 @@ is_running() {
fi fi
} }
ipset() { "$ipset" "$@" >/dev/null 2>&1; } ipset() { "$ipset" "$@" >/dev/null 2>&1; }
get_ram_available() { ubus call system info | jsonfilter -e '@.memory.available'; } get_mem_available() {
get_ram_free() { ubus call system info | jsonfilter -e '@.memory.free'; } local ram swap
get_ram_total() { ubus call system info | jsonfilter -e '@.memory.total'; } ram="$( ubus call system info | jsonfilter -e '@.memory.available' )"
swap="$( ubus call system info | jsonfilter -e '@.swap.free' )"
echo "$((ram + swap))";
}
get_mem_total() {
local ram swap
ram="$( ubus call system info | jsonfilter -e '@.memory.total' )"
swap="$( ubus call system info | jsonfilter -e '@.swap.total' )"
echo "$((ram + swap))";
}
led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; } led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; }
led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; } led_off(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'none' > "${1}/trigger" 2>&1; fi; }
logger() { /usr/bin/logger -t "$packageName" "$@"; } logger() { /usr/bin/logger -t "$packageName" "$@"; }
@@ -1305,7 +1315,7 @@ download_dnsmasq_file() {
json set status 'statusDownloading' json set status 'statusDownloading'
rm -f "$A_TMP" "$B_TMP" "$SED_TMP" "$outputFile" "$outputCache" "$outputGzip" rm -f "$A_TMP" "$B_TMP" "$SED_TMP" "$outputFile" "$outputCache" "$outputGzip"
if [ "$(get_ram_available)" -lt 32 ]; then if [ "$(get_mem_available)" -lt "$packageMemoryThreshold" ]; then
output 3 'Low free memory, restarting resolver ' output 3 'Low free memory, restarting resolver '
if resolver 'quiet_restart'; then if resolver 'quiet_restart'; then
output_okn output_okn
@@ -1360,7 +1370,7 @@ download_lists() {
[ -n "$size" ] && total_sizes=$((total_sizes+size)) [ -n "$size" ] && total_sizes=$((total_sizes+size))
} }
local i free_mem total_sizes local i free_mem total_sizes
free_mem="$(get_ram_available)" free_mem="$(get_mem_available)"
if [ -z "$free_mem" ]; then if [ -z "$free_mem" ]; then
json add warnning 'warningFreeRamCheckFail' json add warnning 'warningFreeRamCheckFail'
output "${_WARNING_}: $(get_text 'warningFreeRamCheckFail')!\n" output "${_WARNING_}: $(get_text 'warningFreeRamCheckFail')!\n"
@@ -1384,7 +1394,7 @@ download_lists() {
json set status 'statusDownloading' json set status 'statusDownloading'
rm -f "$A_TMP" "$B_TMP" "$SED_TMP" "$outputFile" "$outputCache" "$outputGzip" rm -f "$A_TMP" "$B_TMP" "$SED_TMP" "$outputFile" "$outputCache" "$outputGzip"
if [ "$(get_ram_total)" -lt 33554432 ]; then if [ "$(get_mem_total)" -lt "$packageMemoryThreshold" ]; then
output 3 'Low free memory, restarting resolver ' output 3 'Low free memory, restarting resolver '
if resolver 'quiet_restart'; then if resolver 'quiet_restart'; then
output_okn output_okn
@@ -1420,13 +1430,14 @@ download_lists() {
append_newline "$B_TMP" append_newline "$B_TMP"
for hf in $blocked_domain $canaryDomains; do for hf in $blocked_domain $canaryDomains; do
printf "%s\n" "$(echo "$hf" | sed "$domainsFilter")" >> "$B_TMP" [ -n "$hf" ] && printf "%s\n" "$(echo "$hf" | sed "$domainsFilter")" >> "$B_TMP"
done done
sed -i '/^[[:space:]]*$/d' "$B_TMP" sed -i '/^[[:space:]]*$/d' "$B_TMP"
[ ! -s "$B_TMP" ] && return 1 [ ! -s "$B_TMP" ] && return 1
allowed_domain="${allowed_domain} local allowed_domains_from_dl
$(sed '/^[[:space:]]*$/d' "$A_TMP")" allowed_domains_from_dl="$(sed '/^[[:space:]]*$/d' "$A_TMP")"
allowed_domain="${allowed_domain}${allowed_domains_from_dl:+ $allowed_domains_from_dl}"
output 1 'Processing downloads ' output 1 'Processing downloads '
output 2 'Sorting combined list ' output 2 'Sorting combined list '
@@ -1493,7 +1504,7 @@ $(sed '/^[[:space:]]*$/d' "$A_TMP")"
esac esac
if [ -n "$allowed_domain" ]; then if [ -n "$allowed_domain" ]; then
output 2 'Removing allowed domains from combined list' output 2 'Removing allowed domains from combined list '
json set message "$(get_text 'statusProcessing'): allowing domains" json set message "$(get_text 'statusProcessing'): allowing domains"
for hf in ${allowed_domain}; do for hf in ${allowed_domain}; do
hf="$(echo "$hf" | sed 's/\./\\./g')" hf="$(echo "$hf" | sed 's/\./\\./g')"