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: update 4.4.4-3

Browse Source 
* fixed a typo in the allowlist/blocklist regex
* limit the f_switch function to only the suspend/resume actions

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2025-12-04 22:17:44 +01:00
parent 09951a9cfd
commit cd5f13e922
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/adblock/Makefile
View File

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=4.4.4 PKG_VERSION:=4.4.4
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

18
net/adblock/files/adblock.sh
View File

@@ -703,7 +703,7 @@ f_list() {
;; ;;
"blocklist" | "allowlist") "blocklist" | "allowlist")
src_name="${mode}" src_name="${mode}"
rset="/^(([[:alnum:]_-]{1,63}\.)*[[:alpha:]][[:alnum:]-]{1,62}([[:space:]]|$))/{print tolower(\$1)}" rset="/^(([[:alnum:]_-]{1,63}\\.)*[[:alpha:]][[:alnum:]-]{1,62}([[:space:]]|$))/{print tolower(\$1)}"
case "${src_name}" in case "${src_name}" in
"blocklist") "blocklist")
if [ -f "${adb_blocklist}" ]; then if [ -f "${adb_blocklist}" ]; then
@@ -927,14 +927,14 @@ f_tld() {
# suspend/resume adblock processing # suspend/resume adblock processing
# #
f_switch() { f_switch() {
local status entry done="false" mode="${1}" local status done="false" mode="${1}"
json_init json_init
json_load_file "${adb_rtfile}" >/dev/null 2>&1 json_load_file "${adb_rtfile}" >/dev/null 2>&1
json_select "data" >/dev/null 2>&1 json_select "data" >/dev/null 2>&1
json_get_var status "adblock_status" json_get_var status "adblock_status"
f_env f_env
if [ "${mode}" = "suspend" ] && [ "${status}" = "enabled" ]; then if [ "${status}" = "enabled" ] && [ "${mode}" = "suspend" ]; then
if [ "${adb_dnsshift}" = "0" ] && [ -f "${adb_finaldir}/${adb_dnsfile}" ]; then if [ "${adb_dnsshift}" = "0" ] && [ -f "${adb_finaldir}/${adb_dnsfile}" ]; then
mv -f "${adb_finaldir}/${adb_dnsfile}" "${adb_backupdir}/${adb_dnsfile}" mv -f "${adb_finaldir}/${adb_dnsfile}" "${adb_backupdir}/${adb_dnsfile}"
printf "%b" "${adb_dnsheader}" >"${adb_finaldir}/${adb_dnsfile}" printf "%b" "${adb_dnsheader}" >"${adb_finaldir}/${adb_dnsfile}"
@@ -944,14 +944,14 @@ f_switch() {
printf "%b" "${adb_dnsheader}" >"${adb_dnsdir}/${adb_dnsfile}" printf "%b" "${adb_dnsheader}" >"${adb_dnsdir}/${adb_dnsfile}"
done="true" done="true"
fi fi
elif [ "${mode}" = "resume" ] && [ "${status}" = "paused" ]; then elif [ "${status}" = "paused" ] && [ "${mode}" = "resume" ]; then
if [ "${adb_dnsshift}" = "0" ] && [ -f "${adb_backupdir}/${adb_dnsfile}" ]; then if [ "${adb_dnsshift}" = "0" ] && [ -f "${adb_backupdir}/${adb_dnsfile}" ]; then
mv -f "${adb_backupdir}/${adb_dnsfile}" "${adb_finaldir}/${adb_dnsfile}" mv -f "${adb_backupdir}/${adb_dnsfile}" "${adb_finaldir}/${adb_dnsfile}"
f_count "resume" "${adb_finaldir}/${adb_dnsfile}" f_count "switch" "${adb_finaldir}/${adb_dnsfile}"
done="true" done="true"
elif [ "${adb_dnsshift}" = "1" ] && [ ! -L "${adb_finaldir}/${adb_dnsfile}" ]; then elif [ "${adb_dnsshift}" = "1" ] && [ ! -L "${adb_finaldir}/${adb_dnsfile}" ]; then
ln -fs "${adb_finaldir}/${adb_dnsfile}" "${adb_dnsdir}/${adb_dnsfile}" ln -fs "${adb_finaldir}/${adb_dnsfile}" "${adb_dnsdir}/${adb_dnsfile}"
f_count "resume" "${adb_finaldir}/${adb_dnsfile}" f_count "switch" "${adb_finaldir}/${adb_dnsfile}"
done="true" done="true"
fi fi
fi fi
@@ -959,11 +959,11 @@ f_switch() {
f_dnsup f_dnsup
f_jsnup "${mode}" f_jsnup "${mode}"
f_log "info" "${mode} adblock service" f_log "info" "${mode} adblock service"
f_rmtemp
else else
f_jsnup "stopped" f_count "switch" "${adb_finaldir}/${adb_dnsfile}"
f_rmdns f_jsnup "${status}"
fi fi
f_rmtemp
} }
# query blocklist for certain (sub-)domains # query blocklist for certain (sub-)domains