OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <dev@brenken.org>
pull/24846/head^2
Dirk Brenken 2024-08-20 16:02:26 +02:00
parent 5f46bdd57f
commit 9428ef4320
No known key found for this signature in database
GPG Key ID: 9D71CD547BFAE684
3 changed files with 4 additions and 13 deletions
Show Stats 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_VERSION:=4.2.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

2
net/adblock/files/README.md
View File

@ -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.
<b>Please note:</b> Devices with less than 128 MByte RAM are _not_ supported!
<b>Please note:</b> For performance reasons, adblock depent on gnu awk (gawk) by default.
<b>Please note:</b> 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

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

@ -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)"