From 01fca9e8b6e01d6a84ff3be9f3d4bb709d6057d7 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Fri, 24 Nov 2023 16:11:57 +0000 Subject: [PATCH] https-dns-proxy: fix unintentional call of service_stopped in boot() Signed-off-by: Stan Grishin (cherry picked from commit 2e9f6c44460a48876cd85cde3557ce373693df6b) --- net/https-dns-proxy/Makefile | 2 +- net/https-dns-proxy/files/etc/init.d/https-dns-proxy | 2 +- net/https-dns-proxy/patches/020-src-options.c-add-version.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 3037bd5a29..69b6bbe878 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=https-dns-proxy PKG_VERSION:=2023-10-25 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ diff --git a/net/https-dns-proxy/files/etc/init.d/https-dns-proxy b/net/https-dns-proxy/files/etc/init.d/https-dns-proxy index 672e837c7a..c9e38cca9a 100755 --- a/net/https-dns-proxy/files/etc/init.d/https-dns-proxy +++ b/net/https-dns-proxy/files/etc/init.d/https-dns-proxy @@ -134,7 +134,7 @@ boot() { ubus -t 30 wait_for network.interface 2>/dev/null on_boot_trigger=1 rc_procd start_service 'on_boot' && service_started 'on_boot' - is_resolver_working || rc_procd stop_service 'on_boot' && service_stopped 'on_boot' + is_resolver_working || { rc_procd stop_service 'on_boot' && service_stopped 'on_boot'; } } start_instance() { diff --git a/net/https-dns-proxy/patches/020-src-options.c-add-version.patch b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch index 72d3dc5dff..8f3b9dfa24 100644 --- a/net/https-dns-proxy/patches/020-src-options.c-add-version.patch +++ b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch @@ -5,7 +5,7 @@ return SW_VERSION; #else - return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year -+ return "2023-10-25-3"; // update date sometimes, like 1-2 times a year ++ return "2023-10-25-4"; // update date sometimes, like 1-2 times a year #endif } -- 2.30.2