adblock-fast: prepare migration to APK
Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
parent
6c3db5d603
commit
706592edcc
|
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=adblock-fast
|
PKG_NAME:=adblock-fast
|
||||||
PKG_VERSION:=1.1.1
|
PKG_VERSION:=1.1.1
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=r7
|
||||||
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
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,7 @@ readonly unboundFilter='s|^|local-zone: "|;s|$|" static|'
|
||||||
readonly A_TMP="/var/${packageName}.a.tmp"
|
readonly A_TMP="/var/${packageName}.a.tmp"
|
||||||
readonly B_TMP="/var/${packageName}.b.tmp"
|
readonly B_TMP="/var/${packageName}.b.tmp"
|
||||||
readonly SED_TMP="/var/${packageName}.sed.tmp"
|
readonly SED_TMP="/var/${packageName}.sed.tmp"
|
||||||
|
readonly uciConfigFile="/etc/config/${packageName}"
|
||||||
readonly runningConfigFile="/dev/shm/${packageName}.config"
|
readonly runningConfigFile="/dev/shm/${packageName}.config"
|
||||||
readonly runningErrorFile="/dev/shm/${packageName}.error"
|
readonly runningErrorFile="/dev/shm/${packageName}.error"
|
||||||
readonly runningStatusFile="/dev/shm/${packageName}.status"
|
readonly runningStatusFile="/dev/shm/${packageName}.status"
|
||||||
|
@ -128,7 +129,7 @@ config_cache() {
|
||||||
local i ret
|
local i ret
|
||||||
case "$param" in
|
case "$param" in
|
||||||
create|set)
|
create|set)
|
||||||
cp -f "/etc/config/${packageName}" "$runningConfigFile"
|
cp -f "$uciConfigFile" "$runningConfigFile"
|
||||||
;;
|
;;
|
||||||
get)
|
get)
|
||||||
case "$var" in
|
case "$var" in
|
||||||
|
@ -145,6 +146,8 @@ config_cache() {
|
||||||
local old_allowed_url old_blocked_url
|
local old_allowed_url old_blocked_url
|
||||||
if [ ! -s "$runningConfigFile" ]; then
|
if [ ! -s "$runningConfigFile" ]; then
|
||||||
ret='on_boot'
|
ret='on_boot'
|
||||||
|
elif cmp -s "$uciConfigFile" "$runningConfigFile"; then
|
||||||
|
ret='restart'
|
||||||
else
|
else
|
||||||
for i in $_reload; do
|
for i in $_reload; do
|
||||||
local val_current val_old UCI_CONFIG_DIR
|
local val_current val_old UCI_CONFIG_DIR
|
||||||
|
@ -199,7 +202,7 @@ config_cache() {
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
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; }
|
||||||
dns_set_output_values() {
|
dns_set_output_values() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
dnsmasq.addnhosts)
|
dnsmasq.addnhosts)
|
||||||
|
@ -315,7 +318,6 @@ is_running() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
ipset() { "$ipset" "$@" >/dev/null 2>&1; }
|
ipset() { "$ipset" "$@" >/dev/null 2>&1; }
|
||||||
get_version() { grep -m1 -A2 -w "^Package: $1$" /usr/lib/opkg/status | sed -n 's/Version: //p'; }
|
|
||||||
get_ram_free() { ubus call system info | jsonfilter -e '@.memory.free'; }
|
get_ram_free() { ubus call system info | jsonfilter -e '@.memory.free'; }
|
||||||
get_ram_total() { ubus call system info | jsonfilter -e '@.memory.total'; }
|
get_ram_total() { ubus call system info | jsonfilter -e '@.memory.total'; }
|
||||||
led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; }
|
led_on(){ if [ -n "${1}" ] && [ -e "${1}/trigger" ]; then echo 'default-on' > "${1}/trigger" 2>&1; fi; }
|
||||||
|
@ -807,11 +809,8 @@ load_environment() {
|
||||||
dl_flag="-O"
|
dl_flag="-O"
|
||||||
fi
|
fi
|
||||||
led="${led:+/sys/class/leds/$led}"
|
led="${led:+/sys/class/leds/$led}"
|
||||||
if curl --version 2>/dev/null | grep -q "https" \
|
if curl --version 2>/dev/null | grep -q "Protocols: .*https.*" \
|
||||||
|| wget --version 2>/dev/null | grep -q "+https" \
|
|| wget --version 2>/dev/null | grep -q "+ssl"; then
|
||||||
|| grep -q "libustream-mbedtls" /usr/lib/opkg/status \
|
|
||||||
|| grep -q "libustream-openssl" /usr/lib/opkg/status \
|
|
||||||
|| grep -q "libustream-wolfssl" /usr/lib/opkg/status; then
|
|
||||||
isSSLSupported=1
|
isSSLSupported=1
|
||||||
else
|
else
|
||||||
unset isSSLSupported
|
unset isSSLSupported
|
||||||
|
|
Loading…
Reference in New Issue