Attachment 184160 Details for Bug 220547 – dnscrypt patch

[patch] dnscrypt patch

dnscrypt.patch (text/plain), 3.46 KB, created by Mark Felder on 2017-07-07 20:41:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2017-07-07 20:41:15 UTC

Size: 3.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 445282)
>+++ Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	dnscrypt-proxy
>-PORTVERSION=	1.9.1
>-PORTREVISION=	2
>+PORTVERSION=	1.9.5
>+PORTREVISION=	0
> CATEGORIES=	dns
> MASTER_SITES=	https://download.dnscrypt.org/dnscrypt-proxy/ \
> 		http://download.dnscrypt.org/dnscrypt-proxy/ \
>@@ -56,5 +56,6 @@
> 	${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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 445282)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/dnscrypt-proxy.in
>===================================================================
>--- files/dnscrypt-proxy.in	(revision 445282)
>+++ files/dnscrypt-proxy.in	(working copy)
>@@ -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 @@
> : ${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}
> 
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 445282)
>+++ files/pkg-message.in	(working copy)
>@@ -7,6 +7,15 @@
> 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`
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 445282)
>+++ pkg-plist	(working copy)
>@@ -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 @@
> sbin/dnscrypt-proxy
> %%DATADIR%%/dnscrypt-resolvers.csv
> %%DATADIR%%/minisign.pub
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/DNSCRYPT-V2-PROTOCOL.txt
>+%%PORTDOCS%%%%DOCSDIR%%/dnscrypt-proxy.conf

Actions: View | Diff

Attachments on bug 220547: 184160