Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simple-adblock: update init file and config

Browse source 
* move network.sh and jshn.sh includes into load_validate_config function
  to prevent errors when adding the package to image with the Image Builder
* add @bongochong compressed domains block-list to the config

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin 2023-03-11 10:43:48 +00:00
parent 68af9ed3ba
commit 35f4830de7
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/simple-adblock/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock PKG_NAME:=simple-adblock
PKG_VERSION:=1.9.4 PKG_VERSION:=1.9.4
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later

4
net/simple-adblock/files/simple-adblock.conf
View file

@ -64,6 +64,10 @@ config simple-adblock 'config'
# block-list too big for most routers # block-list too big for most routers
# list blocked_hosts_url 'https://cdn.jsdelivr.net/gh/StevenBlack/hosts/hosts' # list blocked_hosts_url 'https://cdn.jsdelivr.net/gh/StevenBlack/hosts/hosts'
# File size: 2.0M
# block-list too big for most routers
# list blocked_domains_url https://cdn.jsdelivr.net/gh/bongochong/CombinedPrivacyBlockLists/NoFormatting/cpbl-ctld.txt
# File size: 3.1M # File size: 3.1M
# block-list too big for most routers # block-list too big for most routers
# list blocked_hosts_url 'https://hostsfile.mine.nu/Hosts' # list blocked_hosts_url 'https://hostsfile.mine.nu/Hosts'

5
net/simple-adblock/files/simple-adblock.init
View file

@ -88,9 +88,6 @@ outputCache=
awk='awk' awk='awk'
load_environment_flag= load_environment_flag=
. /lib/functions/network.sh
. /usr/share/libubox/jshn.sh
debug() { local i j; for i in "$@"; do eval "j=\$$i"; echo "${i}: ${j} "; done; } debug() { local i j; for i in "$@"; do eval "j=\$$i"; echo "${i}: ${j} "; done; }
uci_add_list_if_new() { uci_add_list_if_new() {
@ -1562,6 +1559,8 @@ stop_service() { load_validate_config 'config' adb_stop "'$*'"; }
version() { echo "$PKG_VERSION"; } version() { echo "$PKG_VERSION"; }
load_validate_config() { load_validate_config() {
. /lib/functions/network.sh
. /usr/share/libubox/jshn.sh
local enabled local enabled
local force_dns local force_dns
local force_dns_port local force_dns_port