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

Merge pull request #19710 from stangri/openwrt-22.03-simple-adblock

Browse source 
[22.03] simple-adblock: rename wan6_trigger option
This commit is contained in:
Stan Grishin 2022-11-04 19:05:38 -07:00 committed by GitHub
commit 1b384f4c48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 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_VERSION:=1.9.2
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later

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

@ -1,10 +1,17 @@
config simple-adblock 'config'
option enabled '0'
list allowed_domain 'cdn.jsdelivr.net'
option allow_non_ascii '0'
option canary_domains_icloud '0'
option canary_domains_mozilla '0'
option compressed_cache '0'
option config_update_enabled '0'
option config_update_url 'https://cdn.jsdelivr.net/gh/openwrt/packages/net/simple-adblock/files/simple-adblock.conf.update'
option curl_retry '3'
option download_timeout '10'
option debug '0'
option dns 'dnsmasq.servers'
option dns_instance '0'
option verbosity '2'
option force_dns '1'
list force_dns_port '53'
list force_dns_port '853'
@ -16,16 +23,10 @@ config simple-adblock 'config'
# list force_dns_port '4434'
# list force_dns_port '5443'
# list force_dns_port '8443'
option canary_domains_icloud '0'
option canary_domains_mozilla '0'
option led 'none'
option boot_delay '120'
option download_timeout '10'
option curl_retry '3'
option parallel_downloads '1'
option debug '0'
option compressed_cache '0'
list allowed_domain 'cdn.jsdelivr.net'
option procd_trigger_wan6 '0'
option verbosity '2'
# File size: 16.0K
list blocked_hosts_url 'https://adaway.org/hosts.txt'

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

@ -1319,14 +1319,14 @@ stop_service() { load_validate_config 'config' adb_stop "'$*'"; }
status_service() { load_validate_config 'config' adb_status "''"; }
service_triggers() {
local wan wan6 i
local wan6_trigger
local procd_trigger_wan6
config_load "$packageName"
config_get_bool wan6_trigger 'config' 'wan6_trigger' '0'
config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0'
. /lib/functions/network.sh
network_flush_cache
network_find_wan wan
wan="${wan:-wan}"
if [ "$wan6_trigger" -ne 0 ]; then
if [ "$procd_trigger_wan6" -ne 0 ]; then
network_find_wan6 wan6
wan6="${wan6:-wan6}"
fi
@ -1404,7 +1404,7 @@ load_validate_config() {
'download_timeout:range(1,40):20' \
'curl_retry:range(1,5):3' \
'verbosity:range(0,2):2' \
'wan6_trigger:bool:0' \
'procd_trigger_wan6:bool:0' \
'led:or("", "none", file, device, string)' \
'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \
'dns_instance:or(list(integer, string)):0' \