From f74f517b9a33924e3430b7daf6f85a3b777279e0 Mon Sep 17 00:00:00 2001 From: Jemy Zhang Date: Thu, 26 Apr 2018 18:19:54 +0800 Subject: [PATCH] net/https-dns-proxy: Update to 2018-04-23 + add option for resolver_url_prefix Signed-off-by: Jemy Zhang --- net/https-dns-proxy/Makefile | 6 +++--- net/https-dns-proxy/files/https_dns_proxy.config | 1 + net/https-dns-proxy/files/https_dns_proxy.init | 8 +++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 3bc8f9f8e..3a8e75404 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-28 +PKG_VERSION:=2018-04-23 PKG_RELEASE=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_MIRROR_HASH:=627f468230a02d8c36915978cc4dce9f1458590aa30e2df723d59cb860acb192 +PKG_MIRROR_HASH:=24b7e4238c37e646f33eee3a374f6b7beb5c167b9c5008cc13b51e5f1f3a44ea PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=843b768f0cd3aa6fa5aed4fa992776657bc18d14 +PKG_SOURCE_VERSION:=bea68401330e611f6e9b75cec84e2dc4e81e52de PKG_MAINTAINER:=Aaron Drew 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 7f5aaa669..b124aeb9d 100644 --- a/net/https-dns-proxy/files/https_dns_proxy.config +++ b/net/https-dns-proxy/files/https_dns_proxy.config @@ -5,3 +5,4 @@ config https_dns_proxy option group 'nogroup' option subnet_addr '' option proxy_server '' + option url_prefix 'https://dns.google.com/resolve?' diff --git a/net/https-dns-proxy/files/https_dns_proxy.init b/net/https-dns-proxy/files/https_dns_proxy.init index 29bd71ed7..9a5f79792 100644 --- a/net/https-dns-proxy/files/https_dns_proxy.init +++ b/net/https-dns-proxy/files/https_dns_proxy.init @@ -15,6 +15,7 @@ start_instance() { config_get group "$cfg" group config_get subnet_addr "$cfg" subnet_addr config_get proxy_server "$cfg" proxy_server + config_get url_prefix "$cfg" url_prefix if [ -n "$subnet_addr" ]; then subnet_param="-e $subnet_addr" @@ -24,10 +25,15 @@ start_instance() { proxy_param="-t $proxy_server" fi + if [ -z "$url_prefix" ]; then + url_prefix="https://dns.google.com/resolve?" + fi + procd_open_instance procd_set_param command ${PROG} \ -a "$listen_addr" -p "$listen_port" \ - -u "$user" -g "$group" $subnet_param $proxy_param + -u "$user" -g "$group" $subnet_param $proxy_param \ + -r "$url_prefix" procd_set_param respawn procd_close_instance }