From b8a8c480fcd71144c794415a46264cc22262cc2a Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Sat, 23 Mar 2024 01:02:32 +0000 Subject: [PATCH] https-dns-proxy: prepare migration to APK Signed-off-by: Stan Grishin --- net/https-dns-proxy/Makefile | 11 ++++++----- net/https-dns-proxy/files/etc/init.d/https-dns-proxy | 2 ++ .../patches/020-src-options.c-add-version.patch | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 3d9ff61fb2..3ceb8ddd66 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -1,14 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=https-dns-proxy -PKG_VERSION:=2023-11-19 -PKG_RELEASE:=1 +PKG_VERSION:=2023.11.19 +PKG_RELEASE:=r1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ -PKG_SOURCE_DATE:=$(PKG_VERSION) +PKG_SOURCE_DATE:=$(subst(.,-,$(PKG_VERSION))) +PKG_SOURCE_RELEASE:=$(subst(r,,$(PKG_RELEASE))) PKG_SOURCE_VERSION:=489c57efd46983e688579974a2ab7aeaa7df8d83 -PKG_MIRROR_HASH:=6c8e0e158dfbfde29b1c22f1a1c90a7deae540111c26daac13c8fbb5a49081a5 +PKG_MIRROR_HASH:=0ef2008a2d328ad28e30e7b4d63fa7f769fc0daf2b8f4caf45f6e530655d3726 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=MIT @@ -17,7 +18,7 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS += -DCLANG_TIDY_EXE= -DGIT_VERSION=$(PKG_VERSION)-$(PKG_RELEASE) +CMAKE_OPTIONS += -DCLANG_TIDY_EXE= -DGIT_VERSION=$(PKG_SOURCE_DATE)-$(PKG_SOURCE_RELEASE) define Package/https-dns-proxy SECTION:=net 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 9a2cd4b427..ff81655d46 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 @@ -300,7 +300,9 @@ service_triggers() { local wan wan6 i local procd_trigger_wan6 if [ "$on_boot_trigger" = '1' ]; then + output "Setting $serviceName raw_trigger for 'interface.*.up'" procd_add_raw_trigger "interface.*.up" 3000 "/etc/init.d/${packageName}" restart 'on_interface_up' + output_okn else config_load "$packageName" config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0' 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 219fd8101c..100b3b499d 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-11-19-1"; // update date sometimes, like 1-2 times a year ++ return "2023.11.19-r1"; // update date sometimes, like 1-2 times a year #endif }