From: Jemy Zhang <jemy.zhang@gmail.com>
Date: Wed, 7 Mar 2018 09:22:19 +0000 (+0800)
Subject: net/https-dns-proxy: Update to 2018-01-28
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1831d97cf10196fe3b4c174f54b508efb4e76b28;p=feed%2Fpackages.git

net/https-dns-proxy: Update to 2018-01-28

+ initial DNS resolve via proxy
+ option of subnet address
+ option of proxy server

Signed-off-by: Jemy Zhang <jemy.zhang@gmail.com>
---

diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile
index daecceba75..3bc8f9f8e2 100644
--- a/net/https-dns-proxy/Makefile
+++ b/net/https-dns-proxy/Makefile
@@ -1,15 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=https_dns_proxy
-PKG_VERSION:=2018-01-24
+PKG_VERSION:=2018-01-28
 PKG_RELEASE=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=0eef98106c584b986117f33458e8d1e2447a8b6eb12a2e3bfc5df06d45114144
+PKG_MIRROR_HASH:=627f468230a02d8c36915978cc4dce9f1458590aa30e2df723d59cb860acb192
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f08b51d7c07c0156794e2c23d7a4d1a5344b2e07
+PKG_SOURCE_VERSION:=843b768f0cd3aa6fa5aed4fa992776657bc18d14
 PKG_MAINTAINER:=Aaron Drew <aarond10@gmail.com>
 PKG_LICENSE:=MIT
 
diff --git a/net/https-dns-proxy/files/https_dns_proxy.config b/net/https-dns-proxy/files/https_dns_proxy.config
index 17f3557387..7f5aaa6693 100644
--- a/net/https-dns-proxy/files/https_dns_proxy.config
+++ b/net/https-dns-proxy/files/https_dns_proxy.config
@@ -3,3 +3,5 @@ config https_dns_proxy
 	option listen_port '5053'
 	option user 'nobody'
 	option group 'nogroup'
+	option subnet_addr ''
+	option proxy_server ''
diff --git a/net/https-dns-proxy/files/https_dns_proxy.init b/net/https-dns-proxy/files/https_dns_proxy.init
index 333f3cac3e..29bd71ed73 100644
--- a/net/https-dns-proxy/files/https_dns_proxy.init
+++ b/net/https-dns-proxy/files/https_dns_proxy.init
@@ -13,11 +13,21 @@ start_instance() {
 	config_get listen_port "$cfg" listen_port
 	config_get user "$cfg" user
 	config_get group "$cfg" group
+	config_get subnet_addr "$cfg" subnet_addr
+	config_get proxy_server "$cfg" proxy_server
+
+	if [ -n "$subnet_addr" ]; then
+		subnet_param="-e $subnet_addr"
+	fi
+
+	if [ -n "$proxy_server" ]; then
+		proxy_param="-t $proxy_server"
+	fi
 
 	procd_open_instance
 	procd_set_param command ${PROG} \
 		-a "$listen_addr" -p "$listen_port" \
-		-u "$user" -g "$group"
+		-u "$user" -g "$group" $subnet_param $proxy_param
 	procd_set_param respawn
 	procd_close_instance
 }