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

simple-adblock: update to 1.9.2-1

Browse source 
* make PKG_VERSION of the init script readonly to remove shellcheck
  exception
* replace exit with return in the the procd scripts per:
  https://github.com/openwrt/packages/pull/19617
* remove custom boot() function as it prevented creation of procd
  firewall object on start on boot
* improve performance of allowing domains code

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin 2022-10-18 08:43:19 +00:00
parent ab898a1656
commit 3ba54553ca
2 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/simple-adblock/Makefile
View file

@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.9.1
PKG_RELEASE:=2
PKG_VERSION:=1.9.2
PKG_RELEASE:=1
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later
@ -42,7 +42,7 @@ define Package/simple-adblock/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/tmp
$(INSTALL_BIN) ./files/simple-adblock.init $(1)/etc/init.d/simple-adblock
$(SED) "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(1)/etc/init.d/simple-adblock
$(SED) "s|^\(readonly PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(1)/etc/init.d/simple-adblock
$(INSTALL_CONF) ./files/simple-adblock.conf $(1)/etc/config/simple-adblock
$(INSTALL_DATA) ./files/simple-adblock.conf.update $(1)/tmp/simple-adblock.conf.update
endef

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

@ -1,7 +1,6 @@
#!/bin/sh /etc/rc.common
# Copyright 2017-2022 Stan Grishin (stangri@melmac.ca)
# shellcheck disable=SC2039,SC1091,SC2016,SC3043,SC3057,SC3060
PKG_VERSION='dev-test'
# shellcheck disable=SC1091,SC2016,SC3043,SC3057,SC3060
# shellcheck disable=SC2034
START=94
@ -26,6 +25,7 @@ else
sizes Displays the file-sizes of enabled block-lists'
fi
readonly PKG_VERSION='dev-test'
readonly packageName='simple-adblock'
readonly serviceName="$packageName $PKG_VERSION"
readonly packageConfigFile="/etc/config/${packageName}"
@ -189,7 +189,7 @@ load_environment() {
if [ "$validation_result" != '0' ]; then
output "${_ERROR_}: $packageName config validation failed!\\n"
output "Please check if the '$packageConfigFile' contains correct values for config options.\\n"
exit 1
return 1
fi
if [ "$enabled" -eq 0 ]; then
@ -644,7 +644,7 @@ process_url() {
}
download_lists() {
local hf w_filter j=0 R_TMP
local hf allow_filter j=0 R_TMP
json set message "$(get_status_text "statusDownloading")..."
json set status "statusDownloading"
@ -701,7 +701,7 @@ download_lists() {
for hf in $blocked_domain $canaryDomains; do echo "$hf" | sed "$domainsFilter" >> $B_TMP; done
allowed_domain="${allowed_domain}
$(cat $A_TMP)"
for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; w_filter="$w_filter/^${hf}$/d;/\.${hf}$/d;"; done
for hf in ${allowed_domain}; do hf="$(echo "$hf" | sed 's/\./\\./g')"; allow_filter="$allow_filter/^(.*\.)?${hf}$/d;"; done
[ ! -s "$B_TMP" ] && return 1
@ -768,7 +768,7 @@ $(cat $A_TMP)"
output 2 'Allowing domains '
json set message "$(get_status_text "statusProcessing"): allowing domains"
if sed -i "$w_filter" "$B_TMP"; then
if sed -i -E "$allow_filter" "$B_TMP"; then
output_ok
else
output_failn
@ -858,7 +858,7 @@ $(cat $A_TMP)"
adb_allow() {
local c hf string="$1"
local validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
if [ ! -s "$outputFile" ]; then
output "No block-list ('$outputFile') found.\\n"
elif [ -z "$string" ]; then
@ -946,7 +946,7 @@ adb_allow() {
adb_check() {
local c param="$1"
local validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
if [ ! -s "$outputFile" ]; then
output "No block-list ('$outputFile') found.\\n"
elif [ -z "$param" ]; then
@ -986,7 +986,7 @@ adb_check() {
adb_config_update() {
local R_TMP label
local param="$1" validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
label="${config_update_url##*//}"
label="${label%%/*}";
[ "$config_update_enabled" -ne 0 ] || return 0
@ -1020,7 +1020,7 @@ adb_config_update() {
adb_sizes() {
local i
local validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
echo "# $(date)"
for i in $blocked_domains_url; do
@ -1064,7 +1064,7 @@ adb_start() {
local action status error message stats c
local validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
status="$(json get status)"
error="$(json get error)"
@ -1090,7 +1090,7 @@ adb_start() {
action='restart'
elif [ -s "$outputFile" ] && [ "$status" = "statusSuccess" ] && [ -z "$error" ]; then
status_service
exit 0
return 0
else
action='download'
fi
@ -1254,7 +1254,7 @@ adb_start() {
adb_status() {
local c url status message error stats
local validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
status="$(json get status)"
message="$(json get message)"
error="$(json get error)"
@ -1285,7 +1285,7 @@ adb_status() {
adb_stop() {
local validation_result="$3"
load_environment "$validation_result"
load_environment "$validation_result" || return 1
if [ -s "$outputFile" ]; then
output "Stopping $serviceName... "
cache 'create'
@ -1307,13 +1307,6 @@ adb_stop() {
fi
}
boot() {
local boot_delay
config_load "$packageName"
config_get boot_delay 'config' 'boot_delay' '120'
sleep "$boot_delay" >/dev/null 2>&1
rc_procd start_service 'on_boot' && rc_procd service_triggers
}
service_started() { procd_set_config_changed firewall; }
service_stopped() { procd_set_config_changed firewall; }
restart_service() { rc_procd start_service 'restart'; }