Merge pull request #23716 from stangri/master-https-dns-proxy

https-dns-proxy: prepare migration to APK
This commit is contained in:
Stan Grishin 2024-03-24 07:55:05 -06:00 committed by GitHub
commit aa802e82d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions

View File

@ -1,14 +1,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=https-dns-proxy PKG_NAME:=https-dns-proxy
PKG_VERSION:=2023-11-19 PKG_VERSION:=2023.11.19
PKG_RELEASE:=1 PKG_RELEASE:=r1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ 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_SOURCE_VERSION:=489c57efd46983e688579974a2ab7aeaa7df8d83
PKG_MIRROR_HASH:=6c8e0e158dfbfde29b1c22f1a1c90a7deae540111c26daac13c8fbb5a49081a5 PKG_MIRROR_HASH:=0ef2008a2d328ad28e30e7b4d63fa7f769fc0daf2b8f4caf45f6e530655d3726
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
@ -17,7 +18,7 @@ PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.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 define Package/https-dns-proxy
SECTION:=net SECTION:=net

View File

@ -300,7 +300,9 @@ service_triggers() {
local wan wan6 i local wan wan6 i
local procd_trigger_wan6 local procd_trigger_wan6
if [ "$on_boot_trigger" = '1' ]; then 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' procd_add_raw_trigger "interface.*.up" 3000 "/etc/init.d/${packageName}" restart 'on_interface_up'
output_okn
else else
config_load "$packageName" config_load "$packageName"
config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0' config_get_bool procd_trigger_wan6 'config' 'procd_trigger_wan6' '0'

View File

@ -5,7 +5,7 @@
return SW_VERSION; return SW_VERSION;
#else #else
- return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year - 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 #endif
} }