https-dns-proxy: prepare migration to APK

Signed-off-by: Stan Grishin <[email protected]>

diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile
index 3d9ff61fb2e98f2f161b2f0703672c94a5d83662..3ceb8ddd665289a14f6e7094ec9ce5ac7f980297 100644 (file)
--- 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 <[email protected]>
 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 9a2cd4b42762d7cc7baf6cede5abefe50f8d9e2b..ff81655d46d37f24c1c4a0c4b513c7a3188bfcbc 100755 (executable)
--- 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 219fd8101ce1d3fb34a80edca3205ea78ecd2675..100b3b499d66e27b342601415277ce8c4b5e99f4 100644 (file)
--- 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
  }