MFH: r446482

dns/dnscrypt-proxy: Update to 1.9.5

Changelog:	https://github.com/jedisct1/dnscrypt-proxy/releases/tag/1.9.5

PR:		220547

Approved by:	port-secteam (with hat)

5 files changed, 25 insertions, 7 deletions

diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index 0b4b547..3f8d61c 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	dnscrypt-proxy
-PORTVERSION=	1.9.1
-PORTREVISION=	3
+PORTVERSION=	1.9.5
+PORTREVISION=	0
 CATEGORIES=	dns
 MASTER_SITES=	https://download.dnscrypt.org/dnscrypt-proxy/ \
 		http://download.dnscrypt.org/dnscrypt-proxy/ \
@@ -57,5 +57,6 @@ post-install:
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/man/dnscrypt-proxy.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/man/hostip.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${MV} ${STAGEDIR}${PREFIX}/etc/dnscrypt-proxy.conf ${STAGEDIR}${PREFIX}/etc/dnscrypt-proxy.conf.sample
 
 .include <bsd.port.mk>
diff --git a/dns/dnscrypt-proxy/distinfo b/dns/dnscrypt-proxy/distinfo
index 1fa16be..acf1ba5 100644
--- a/dns/dnscrypt-proxy/distinfo
+++ b/dns/dnscrypt-proxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483533207
-SHA256 (dnscrypt-proxy-1.9.1.tar.gz) = 3a319e8bfff5ac15a1c5a80af71755380b1fb869cb8fd86b33b7ed928db65195
-SIZE (dnscrypt-proxy-1.9.1.tar.gz) = 1647902
+TIMESTAMP = 1499458817
+SHA256 (dnscrypt-proxy-1.9.5.tar.gz) = 64021fabb7d5bab0baf681796d90ecd2095fb81381e6fb317a532039025a9399
+SIZE (dnscrypt-proxy-1.9.5.tar.gz) = 1663954
diff --git a/dns/dnscrypt-proxy/files/dnscrypt-proxy.in b/dns/dnscrypt-proxy/files/dnscrypt-proxy.in
index 33f38f7..6bc8e05 100644
--- a/dns/dnscrypt-proxy/files/dnscrypt-proxy.in
+++ b/dns/dnscrypt-proxy/files/dnscrypt-proxy.in
@@ -11,6 +11,8 @@
 #
 # dnscrypt_proxy_enable (bool):	Set to NO by default.
 #				Set to YES to enable dnscrypt-proxy.
+# dnscrypt_proxy_conf (str):    Unset by default. Will override all other
+#                               settings and only use the config file.
 # dnscrypt_proxy_uid (str):	Set to "_dnscrypt-proxy" by default.
 #                              	User to switch to after starting.
 # dnscrypt_proxy_resolver (str):Set to "cisco" by default.
@@ -39,7 +41,11 @@ load_rc_config ${name}
 : ${dnscrypt_proxy_logfile=/var/log/dnscrypt-proxy.log} # Path to log file
 
 command=%%PREFIX%%/sbin/dnscrypt-proxy
+if [ ${dnscrypt_proxy_conf} ]; then
+command_args="${dnscrypt_proxy_conf}"
+else
 command_args="-d -p ${dnscrypt_proxy_pidfile} -l ${dnscrypt_proxy_logfile} -u ${dnscrypt_proxy_uid} -R ${dnscrypt_proxy_resolver}"
+fi
 procname=%%PREFIX%%/sbin/dnscrypt-proxy
 pidfile=${dnscrypt_proxy_pidfile}
 
diff --git a/dns/dnscrypt-proxy/files/pkg-message.in b/dns/dnscrypt-proxy/files/pkg-message.in
index 5553582..4704bb0 100644
--- a/dns/dnscrypt-proxy/files/pkg-message.in
+++ b/dns/dnscrypt-proxy/files/pkg-message.in
@@ -7,6 +7,15 @@ To enable dnscrypt-proxy at boot:
 sysrc dnscrypt_proxy_enable=YES
 sysrc dnscrypt_proxy_flags='-a 127.0.0.2'
 
+or
+
+sysrc dnscrypt_proxy_enable=YES
+sysrc dnscrypt_proxy_conf="/usr/local/etc/dnscrypt-proxy.conf"
+
+
+** You cannot mix the config file with the other rc.conf flags / settings. **
+
+
 To view available options, run:
 %%PREFIX%%/sbin/dnscrypt-proxy --help
 or read the manual: `man dnscrypt-proxy`
diff --git a/dns/dnscrypt-proxy/pkg-plist b/dns/dnscrypt-proxy/pkg-plist
index 5285410..0bbcd7a 100644
--- a/dns/dnscrypt-proxy/pkg-plist
+++ b/dns/dnscrypt-proxy/pkg-plist
@@ -1,6 +1,5 @@
 bin/hostip
-%%ETCDIR%%.conf
-%%ETCDIR%%.conf.example
+@sample etc/dnscrypt-proxy.conf.sample
 %%PLUGINS%%include/dnscrypt/plugin.h
 %%PLUGINS%%include/dnscrypt/private.h
 %%PLUGINS%%include/dnscrypt/version.h
@@ -17,3 +16,6 @@ man/man8/hostip.8.gz
 sbin/dnscrypt-proxy
 %%DATADIR%%/dnscrypt-resolvers.csv
 %%DATADIR%%/minisign.pub
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/DNSCRYPT-V2-PROTOCOL.txt
+%%PORTDOCS%%%%DOCSDIR%%/dnscrypt-proxy.conf