From owner-svn-ports-branches@freebsd.org Thu Aug 3 16:30:54 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE48DDC6F8C; Thu, 3 Aug 2017 16:30:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5227F6C; Thu, 3 Aug 2017 16:30:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v73GUrce017838; Thu, 3 Aug 2017 16:30:53 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v73GUrtZ017833; Thu, 3 Aug 2017 16:30:53 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708031630.v73GUrtZ017833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 3 Aug 2017 16:30:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r447246 - in branches/2017Q3/dns/dnscrypt-proxy: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2017Q3/dns/dnscrypt-proxy: . files X-SVN-Commit-Revision: 447246 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2017 16:30:55 -0000 Author: feld Date: Thu Aug 3 16:30:53 2017 New Revision: 447246 URL: https://svnweb.freebsd.org/changeset/ports/447246 Log: 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) Modified: branches/2017Q3/dns/dnscrypt-proxy/Makefile branches/2017Q3/dns/dnscrypt-proxy/distinfo branches/2017Q3/dns/dnscrypt-proxy/files/dnscrypt-proxy.in branches/2017Q3/dns/dnscrypt-proxy/files/pkg-message.in branches/2017Q3/dns/dnscrypt-proxy/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/dns/dnscrypt-proxy/Makefile ============================================================================== --- branches/2017Q3/dns/dnscrypt-proxy/Makefile Thu Aug 3 16:28:51 2017 (r447245) +++ branches/2017Q3/dns/dnscrypt-proxy/Makefile Thu Aug 3 16:30:53 2017 (r447246) @@ -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 Modified: branches/2017Q3/dns/dnscrypt-proxy/distinfo ============================================================================== --- branches/2017Q3/dns/dnscrypt-proxy/distinfo Thu Aug 3 16:28:51 2017 (r447245) +++ branches/2017Q3/dns/dnscrypt-proxy/distinfo Thu Aug 3 16:30:53 2017 (r447246) @@ -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 Modified: branches/2017Q3/dns/dnscrypt-proxy/files/dnscrypt-proxy.in ============================================================================== --- branches/2017Q3/dns/dnscrypt-proxy/files/dnscrypt-proxy.in Thu Aug 3 16:28:51 2017 (r447245) +++ branches/2017Q3/dns/dnscrypt-proxy/files/dnscrypt-proxy.in Thu Aug 3 16:30:53 2017 (r447246) @@ -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} Modified: branches/2017Q3/dns/dnscrypt-proxy/files/pkg-message.in ============================================================================== --- branches/2017Q3/dns/dnscrypt-proxy/files/pkg-message.in Thu Aug 3 16:28:51 2017 (r447245) +++ branches/2017Q3/dns/dnscrypt-proxy/files/pkg-message.in Thu Aug 3 16:30:53 2017 (r447246) @@ -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` Modified: branches/2017Q3/dns/dnscrypt-proxy/pkg-plist ============================================================================== --- branches/2017Q3/dns/dnscrypt-proxy/pkg-plist Thu Aug 3 16:28:51 2017 (r447245) +++ branches/2017Q3/dns/dnscrypt-proxy/pkg-plist Thu Aug 3 16:30:53 2017 (r447246) @@ -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