Index: dns/dnscrypt-proxy/Makefile =================================================================== --- dns/dnscrypt-proxy/Makefile (revision 452768) +++ dns/dnscrypt-proxy/Makefile (working copy) @@ -1,62 +1,62 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= dnscrypt-proxy PORTVERSION= 1.9.5 -PORTREVISION= 2 +PORTREVISION= 3 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 GROUPS= _dnscrypt-proxy GNU_CONFIGURE= yes USES= 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: dns/dnscrypt-proxy/files/dnscrypt-proxy.in =================================================================== --- dns/dnscrypt-proxy/files/dnscrypt-proxy.in (revision 452768) +++ dns/dnscrypt-proxy/files/dnscrypt-proxy.in (working copy) @@ -1,52 +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. +# dnscrypt_proxy_resolver (str):Set to "random" 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_resolver=random} # 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: dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in =================================================================== --- dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in (revision 452768) +++ dns/dnscrypt-proxy/files/dnscrypt-proxy_multi.in (working copy) @@ -1,71 +1,71 @@ #!/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_instances (str): Set to "dnscrypt_proxy" by default. # List of dnscrypt_proxy instance id's, # e.g. "dnscrypt_proxy_1 dnscrypt_proxy_2", etc. # {instance_id}_enable (bool): Set to NO by default. # Set to YES to enable dnscrypt-proxy. # {instance_id}_uid (str): Set to "_dnscrypt-proxy" by default. # User to switch to after starting. # {instance_id}_resolver (str): Set to "opendns" by default. # Choose a different upstream resolver. # {instance_id}_pidfile (str): default: "/var/run/dnscrypt-proxy.pid" # Location of pid file. # {instance_id}_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_instances="${name}"} : ${dnscrypt_proxy_enable:=NO} dnscrypt_proxy_enable_tmp=${dnscrypt_proxy_enable} command=%%PREFIX%%/sbin/dnscrypt-proxy procname=%%PREFIX%%/sbin/dnscrypt-proxy for i in $dnscrypt_proxy_instances; do name=${i} eval ${name}_enable=${dnscrypt_proxy_enable_tmp} rcvar=${name}_enable load_rc_config ${i} eval dnscrypt_proxy_uid_tmp=\${${i}_uid} eval dnscrypt_proxy_resolver_tmp=\${${i}_resolver} eval dnscrypt_proxy_pidfile_tmp=\${${i}_pidfile} eval dnscrypt_proxy_logfile_tmp=\${${i}_logfile} : ${dnscrypt_proxy_uid_tmp:=_dnscrypt-proxy} # User to run daemon as -: ${dnscrypt_proxy_resolver_tmp:=cisco} # resolver to use +: ${dnscrypt_proxy_resolver_tmp:=random} # resolver to use : ${dnscrypt_proxy_pidfile_tmp:=/var/run/${i}.pid} # Path to pid file : ${dnscrypt_proxy_logfile_tmp:=/var/log/${i}.log} # Path to log file command_args="-d -p ${dnscrypt_proxy_pidfile_tmp} -l ${dnscrypt_proxy_logfile_tmp} -u ${dnscrypt_proxy_uid_tmp} -R ${dnscrypt_proxy_resolver_tmp}" pidfile=${dnscrypt_proxy_pidfile_tmp} _rc_restart_done=false # workaround for: service dnscrypt-proxy restart run_rc_command "$1" done