https-dns-proxy: update to 2022-08-12-1

* update to upstream version 2022-08-12
* add ca_certs_file option for CA certs file for curl
* add procd_add_interface_trigger for wan6 (hopefully fixes
  https://github.com/openwrt/packages/issues/19531)

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 796a3dda800b0d17df06d87995148b934be15e5d)

diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile
index b78c98dc5ec2901d2bdda89de7ed9a600be53434..e3babf68f32a796c3dee74f13b2688605ec485ab 100644 (file)
--- a/net/https-dns-proxy/Makefile
+++ b/net/https-dns-proxy/Makefile
@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=https-dns-proxy
-PKG_VERSION:=2021-11-22
-PKG_RELEASE:=7
+PKG_VERSION:=2022-08-12
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
-PKG_SOURCE_DATE:=2021-11-22
-PKG_SOURCE_VERSION:=9336fd6272d67e8bb6e304fa54f3139a3d26f08f
-PKG_MIRROR_HASH:=60b1ddabaf1db3a9ee19f3294a1df714364d580cef5e3c2161363c371a557456
+PKG_SOURCE_DATE:=2022-08-12
+PKG_SOURCE_VERSION:=a344d192e22e0c133aecfd766fefa7474cf2594f
+PKG_MIRROR_HASH:=d3de80df13157e1f5066689880a7132532895d24b36f16c9f0b2acf764cf773f
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

diff --git a/net/https-dns-proxy/files/https-dns-proxy.init b/net/https-dns-proxy/files/https-dns-proxy.init
index 6bb44512baf408921db1d65fdc500c9496b61a97..f1a980c41110bdd8aef7ae042228707afac794dc 100755 (executable)
--- a/net/https-dns-proxy/files/https-dns-proxy.init
+++ b/net/https-dns-proxy/files/https-dns-proxy.init
@@ -135,13 +135,14 @@ start_instance() {
        local cfg="$1" param listen_addr listen_port ipv6_resolvers_only p
        config_get_bool ipv6_resolvers_only "$cfg" 'use_ipv6_resolvers_only' '0'
        append_parm "$cfg" 'resolver_url' '-r'
-       append_parm "$cfg" 'polling_interval' '-i'
        append_parm "$cfg" 'listen_addr' '-a' '127.0.0.1'
        append_parm "$cfg" 'listen_port' '-p' "$port"
        append_parm "$cfg" 'dscp_codepoint' '-c'
        append_bootstrap "$cfg" 'bootstrap_dns' '-b' "$DEFAULT_BOOTSTRAP"
        append_parm "$cfg" 'user' '-u' 'nobody'
        append_parm "$cfg" 'group' '-g' 'nogroup'
+       append_parm "$cfg" 'ca_certs_file' '-C'
+       append_parm "$cfg" 'polling_interval' '-i'
        append_parm "$cfg" 'proxy_server' '-t'
        append_parm "$cfg" 'logfile' '-l'
        append_bool "$cfg" 'use_http1' '-x'
@@ -246,15 +247,16 @@ stop_service() {
 }
 
 # shellcheck disable=SC1091
-service_triggers() { 
-       local iface
+service_triggers() {
+       local wan wan6 i
        . /lib/functions/network.sh
        network_flush_cache
-       network_find_wan iface
-       iface="${iface:-wan}"
-       if [ -n "$iface" ]; then
-               procd_add_interface_trigger "interface.*" "$iface" "/etc/init.d/${packageName}" restart
-       fi
+       network_find_wan wan
+       network_find_wan6 wan6
+       wan="${wan:-wan}"
+       for i in "$wan" "$wan6"; do
+               procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" restart
+       done
        procd_add_config_trigger "config.change" "$packageName" "/etc/init.d/${packageName}" restart
 }
 

diff --git a/net/https-dns-proxy/patches/010-fix-cmakelists.patch b/net/https-dns-proxy/patches/010-fix-cmakelists.patch
index 106142579c6dbb74d0c09c07a199a1eedbf48888..a765a5bbd7d7f991089d86dffee3d5cc2f98cb04 100644 (file)
--- a/net/https-dns-proxy/patches/010-fix-cmakelists.patch
+++ b/net/https-dns-proxy/patches/010-fix-cmakelists.patch
@@ -1,7 +1,7 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -21,9 +21,9 @@ if(NOT CMAKE_BUILD_TYPE)
-   message(STATUS "Setting build type to '${CMAKE_BUILD_TYPE}' as none was specified.")
+@@ -25,9 +25,9 @@ if (NOT CMAKE_INSTALL_BINDIR)
+   set(CMAKE_INSTALL_BINDIR bin)
  endif()
  
 -set(CMAKE_C_FLAGS "-Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")