Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jun 2014 21:10:18 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356546 - in head: . dns/dnscrypt-proxy dns/dnscrypt-proxy/files
Message-ID:  <201406042110.s54LAI5P018880@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Wed Jun  4 21:10:18 2014
New Revision: 356546
URL: http://svnweb.freebsd.org/changeset/ports/356546
QAT: https://qat.redports.org/buildarchive/r356546/

Log:
  Update to 1.4.0
  Add _dnscrypt-proxy user
  
  PR:		190406
  Approved by:	maintainer

Modified:
  head/UIDs
  head/dns/dnscrypt-proxy/Makefile
  head/dns/dnscrypt-proxy/distinfo
  head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in
  head/dns/dnscrypt-proxy/pkg-plist

Modified: head/UIDs
==============================================================================
--- head/UIDs	Wed Jun  4 21:01:35 2014	(r356545)
+++ head/UIDs	Wed Jun  4 21:10:18 2014	(r356546)
@@ -284,4 +284,5 @@ radicale:*:974:974::0:0:Radicale daemon:
 unifi:*:975:975::0:0:Unifi Wireless Controller:/nonexistent:/usr/sbin/nologin
 minetest:*:976:976::0:0:& server:/nonexistent:/usr/sbin/nologin
 tests:*:977:65534::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin
+_dnscrypt-proxy:*:978:65534::0:0:dnscrypt-proxy user:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

Modified: head/dns/dnscrypt-proxy/Makefile
==============================================================================
--- head/dns/dnscrypt-proxy/Makefile	Wed Jun  4 21:01:35 2014	(r356545)
+++ head/dns/dnscrypt-proxy/Makefile	Wed Jun  4 21:10:18 2014	(r356546)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnscrypt-proxy
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.0
 CATEGORIES=	dns
 MASTER_SITES=	http://download.dnscrypt.org/dnscrypt-proxy/ \
 		http://www.dns-lab.com/downloads/dnscrypt-proxy/
@@ -10,6 +10,8 @@ MASTER_SITES=	http://download.dnscrypt.o
 MAINTAINER=	freebsd@dns-lab.com
 COMMENT=	Boost privacy and security of DNS
 
+LICENSE=	MIT
+
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libsodium.so:${PORTSDIR}/security/libsodium
 
@@ -20,6 +22,8 @@ SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
+USERS=		_dnscrypt-proxy
+
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
 		README-PLUGINS.markdown README-WINDOWS.markdown \
 		README.markdown TECHNOTES THANKS

Modified: head/dns/dnscrypt-proxy/distinfo
==============================================================================
--- head/dns/dnscrypt-proxy/distinfo	Wed Jun  4 21:01:35 2014	(r356545)
+++ head/dns/dnscrypt-proxy/distinfo	Wed Jun  4 21:10:18 2014	(r356546)
@@ -1,2 +1,2 @@
-SHA256 (dnscrypt-proxy-1.3.3.tar.gz) = c36ba6c3277d3438986af1e8d12adf7d35544b56d1747fa93a50b4d72ebf3e4a
-SIZE (dnscrypt-proxy-1.3.3.tar.gz) = 1576428
+SHA256 (dnscrypt-proxy-1.4.0.tar.gz) = 60b57b36aa15706c4cd0c348fc59534c15913c282a2b7d4db0b3787167b33502
+SIZE (dnscrypt-proxy-1.4.0.tar.gz) = 1579426

Modified: head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in
==============================================================================
--- head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in	Wed Jun  4 21:01:35 2014	(r356545)
+++ head/dns/dnscrypt-proxy/files/dnscrypt-proxy.in	Wed Jun  4 21:10:18 2014	(r356546)
@@ -4,8 +4,8 @@
 #
 # PROVIDE: dnscrypt-proxy
 # REQUIRE: SERVERS cleanvar
-# KEYWORD: shutdown
 # BEFORE: named
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable dnscrypt-proxy:
 #
@@ -22,18 +22,23 @@
 name=dnscrypt_proxy
 rcvar=dnscrypt_proxy_enable
 
-stop_cmd="dnscrypt_proxy_stop"
+stop_cmd=dnscrypt_proxy_stop
 
-load_rc_config dnscrypt_proxy
+load_rc_config ${name}
 
-: {dnscrypt_proxy_enable:="NO"}
+: ${dnscrypt_proxy_enable:=NO}
+: ${dnscrypt_proxy_uid=_dnscrypt-proxy} # User to run daemon as
+: ${dnscrypt_proxy_pidfile=/var/run/dnscrypt-proxy.pid} # Path to pid file
+: ${dnscrypt_proxy_logfile=/var/log/dnscrypt-proxy.log} # Path to log file
+
+if [ -n "$dnscrypt_proxy_uid" ]; then
+	dnscrypt_proxy_flags="${dnscrypt_proxy_flags} -u ${dnscrypt_proxy_uid}"
+fi
 
 command=%%PREFIX%%/sbin/dnscrypt-proxy
 procname=%%PREFIX%%/sbin/dnscrypt-proxy
-pidfile=/var/run/dnscrypt-proxy.pid
-logdir=/var/log/dnscrypt-proxy.log
 
-command_args="-d -p ${pidfile} -l ${logdir}"
+command_args="-d -p ${dnscrypt_proxy_pidfile} -l ${dnscrypt_proxy_logfile}"
 
 dnscrypt_proxy_stop() {
         kill -KILL `cat ${pidfile}` 2> /dev/null && echo "Killed ${name}."

Modified: head/dns/dnscrypt-proxy/pkg-plist
==============================================================================
--- head/dns/dnscrypt-proxy/pkg-plist	Wed Jun  4 21:01:35 2014	(r356545)
+++ head/dns/dnscrypt-proxy/pkg-plist	Wed Jun  4 21:10:18 2014	(r356546)
@@ -3,3 +3,5 @@ man/man8/dnscrypt-proxy.8.gz
 man/man8/hostip.8.gz
 sbin/dnscrypt-proxy
 bin/hostip
+%%DATADIR%%/dnscrypt-resolvers.csv
+@dirrmtry %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406042110.s54LAI5P018880>