Index: head/dns/dnscrypt-proxy/Makefile =================================================================== --- head/dns/dnscrypt-proxy/Makefile (revision 446481) +++ head/dns/dnscrypt-proxy/Makefile (revision 446482) @@ -1,60 +1,61 @@ # Created by: Leo Vandewoestijne # $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/ \ http://dns-lab.com/downloads/dnscrypt-proxy/ MAINTAINER= freebsd@dns-lab.com COMMENT= Boost privacy and security of DNS LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsodium.so:security/libsodium BROKEN_powerpc64= fails to compile: fpst.c: error: redefinition of typedef 'FPST' USERS= _dnscrypt-proxy GNU_CONFIGURE= yes USES= execinfo gmake INSTALL_TARGET= install-strip PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README* THANKS OPTIONS_DEFINE= DOCS PLUGINS PLUGINS_RELAXED PLUGINS_ROOT OPTIONS_SINGLE= RCWHICH OPTIONS_SINGLE_RCWHICH= RCSINGLE RCMULTI OPTIONS_DEFAULT= PLUGINS RCSINGLE OPTIONS_SUB= yes PLUGINS_CONFIGURE_ENABLE= plugins PLUGINS_LIB_DEPENDS= libltdl.so:devel/libltdl \ libldns.so:dns/ldns PLUGINS_USE= LDCONFIG=${PREFIX}/lib/dnscrypt-proxy PLUGINS_USES= libtool PLUGINS_RELAXED_DESC= Allow loading plugins owned by other users PLUGINS_RELAXED_CONFIGURE_ENABLE= relaxed-plugins-permissions PLUGINS_ROOT_DESC= Only load plugins sitting in the default plugins directory PLUGINS_ROOT_CONFIGURE_ENABLE= plugins-root RCWHICH_DESC= Rc script to use: RCSINGLE_DESC= Use default rc script for single daemon RCSINGLE_VARS= USE_RC_SUBR=${PORTNAME} RCSINGLE_SUB_FILES= pkg-message RCMULTI_DESC= Use experimental rc script for multiple instances RCMULTI_VARS= USE_RC_SUBR=${PORTNAME}_multi RCMULTI_SUB_FILES= pkg-message_multi post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${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 Index: head/dns/dnscrypt-proxy/distinfo =================================================================== --- head/dns/dnscrypt-proxy/distinfo (revision 446481) +++ head/dns/dnscrypt-proxy/distinfo (revision 446482) @@ -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: head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in =================================================================== --- head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in (revision 446481) +++ head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in (revision 446482) @@ -1,46 +1,52 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: dnscrypt_proxy # REQUIRE: SERVERS cleanvar ldconfig # BEFORE: named local_unbound unbound # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable dnscrypt-proxy: # # 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. # Choose a different upstream resolver. # dnscrypt_proxy_pidfile (str): default: "/var/run/dnscrypt-proxy.pid" # Location of pid file. # dnscrypt_proxy_logfile (str): default: "/var/log/dnscrypt-proxy.log" # Location of log file. # # To redirect a local resolver through dnscrypt-proxy, point it at 127.0.0.2 # and add the following to rc.conf: # ifconfig_lo0_alias0="inet 127.0.0.2 netmask 0xffffffff" # dnscrypt_proxy_flags='-a 127.0.0.2' . /etc/rc.subr name=dnscrypt_proxy rcvar=dnscrypt_proxy_enable load_rc_config ${name} : ${dnscrypt_proxy_enable:=NO} : ${dnscrypt_proxy_uid=_dnscrypt-proxy} # User to run daemon as : ${dnscrypt_proxy_resolver=cisco} # resolver to use : ${dnscrypt_proxy_pidfile=/var/run/dnscrypt-proxy.pid} # Path to pid file : ${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} run_rc_command "$1" Index: head/dns/dnscrypt-proxy/files/pkg-message.in =================================================================== --- head/dns/dnscrypt-proxy/files/pkg-message.in (revision 446481) +++ head/dns/dnscrypt-proxy/files/pkg-message.in (revision 446482) @@ -1,13 +1,22 @@ This port/software comes all 'working out of the box'. By default this port is using OpenDNS' resolvers, other services are possible. 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` Index: head/dns/dnscrypt-proxy/pkg-plist =================================================================== --- head/dns/dnscrypt-proxy/pkg-plist (revision 446481) +++ head/dns/dnscrypt-proxy/pkg-plist (revision 446482) @@ -1,19 +1,21 @@ 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 %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_cache.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_aaaa_blocking.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_blocking.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_forwarding.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_deviceid.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_ldns_opendns_set_client_ip.so %%PLUGINS%%lib/dnscrypt-proxy/libdcplugin_example_logging.so man/man8/dnscrypt-proxy.8.gz 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