From 9428ef4320919c66dc0759c97033f84c6bb9adb2 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 20 Aug 2024 16:02:26 +0200 Subject: [PATCH] adblock: update to 4.2.2-2 * removal of a superfluous opkg code block (missed in the last commit) * cosmetics Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 2 +- net/adblock/files/README.md | 2 +- net/adblock/files/adblock.sh | 13 ++----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 119746adb1..3db4b5c9e8 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=4.2.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md index 599c287c8c..bdc6bcb8cd 100644 --- a/net/adblock/files/README.md +++ b/net/adblock/files/README.md @@ -104,7 +104,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but ## Prerequisites * [OpenWrt](https://openwrt.org), tested with the stable release series and with the latest snapshot releases. Please note: Devices with less than 128 MByte RAM are _not_ supported! - Please note: For performance reasons, adblock depent on gnu awk (gawk) by default. + Please note: For performance reasons, adblock depend on gnu awk (gawk) by default. If you insist to use the slow busybox awk implementation, remove the gawk package afterwards (_opkg remove gawk --force-depends_) or install adblock without any dependency checks/installation (_opkg install adblock --nodeps_). Both installation variants are officially unsupported. * A usual setup with an enabled DNS backend at minimum - dumb AP modes without a working DNS backend are _not_ supported * A download utility with SSL support: 'wget', 'uclient-fetch' with one of the 'libustream-*' ssl libraries, 'aria2c' or 'curl' is required diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 086e36a211..6227aa14ad 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -188,7 +188,7 @@ f_env() { f_conf() { local cnt="0" cnt_max="10" - [ ! -r "/etc/config/adblock" ] && f_log "err" "no valid adblock config found, please re-install the package via opkg with the '--force-reinstall --force-maintainer' options" + [ ! -r "/etc/config/adblock" ] && f_log "err" "no valid adblock config found, please re-install the adblock package" config_cb() { option_cb() { @@ -223,15 +223,6 @@ f_conf() { } } config_load adblock - - if [ -z "${adb_fetchutil}" ] || [ -z "${adb_dns}" ]; then - while [ -z "${adb_packages}" ] && [ "${cnt}" -le "${cnt_max}" ]; do - adb_packages="$(opkg list-installed 2>/dev/null)" - cnt="$((cnt + 1))" - sleep 1 - done - [ -z "${adb_packages}" ] && f_log "err" "local opkg package repository is not available, please set 'adb_fetchutil' and 'adb_dns' manually" - fi } # status helper function @@ -1476,7 +1467,7 @@ else f_log "err" "system libraries not found" fi -# initial system calls +# reference required system utilities # adb_awkcmd="$(f_cmd gawk awk)" adb_sortcmd="$(f_cmd sort)" -- 2.30.2