From owner-svn-ports-head@FreeBSD.ORG Sun Jul 14 06:42:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 764A88B0; Sun, 14 Jul 2013 06:42:46 +0000 (UTC) (envelope-from bf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 545586E0; Sun, 14 Jul 2013 06:42:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6E6gjNR018817; Sun, 14 Jul 2013 06:42:45 GMT (envelope-from bf@svn.freebsd.org) Received: (from bf@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6E6gjWs018814; Sun, 14 Jul 2013 06:42:45 GMT (envelope-from bf@svn.freebsd.org) Message-Id: <201307140642.r6E6gjWs018814@svn.freebsd.org> From: Brendan Fabeny Date: Sun, 14 Jul 2013 06:42:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322977 - in head/security/tor-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 06:42:46 -0000 Author: bf Date: Sun Jul 14 06:42:45 2013 New Revision: 322977 URL: http://svnweb.freebsd.org/changeset/ports/322977 Log: Update to 0.2.4.15-rc; make the tor rc.d script log level configurable (as requested by R. Kolar); minor cosmetic changes Modified: head/security/tor-devel/Makefile head/security/tor-devel/distinfo head/security/tor-devel/files/tor.in (contents, props changed) Modified: head/security/tor-devel/Makefile ============================================================================== --- head/security/tor-devel/Makefile Sun Jul 14 02:38:17 2013 (r322976) +++ head/security/tor-devel/Makefile Sun Jul 14 06:42:45 2013 (r322977) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.4.14-alpha +DISTVERSION= 0.2.4.15-rc CATEGORIES= security net ipv6 MASTER_SITES= https://www.torproject.org/dist/ \ ftp://ftp.bit.nl/mirror/tor/ \ @@ -87,7 +87,7 @@ MAN1= tor.1 tor-resolve.1 torify.1 tor- .include .if ${PORT_OPTIONS:MGMAKE} -USE_GMAKE= yes +USES+= gmake .else MAKE_JOBS_UNSAFE= yes .endif Modified: head/security/tor-devel/distinfo ============================================================================== --- head/security/tor-devel/distinfo Sun Jul 14 02:38:17 2013 (r322976) +++ head/security/tor-devel/distinfo Sun Jul 14 06:42:45 2013 (r322977) @@ -1,2 +1,2 @@ -SHA256 (tor-0.2.4.14-alpha.tar.gz) = 2b32f87f1fa14032ebfcc56c4dce49cb5e4f6b5ba8e1bbacdedc8d25bd16f094 -SIZE (tor-0.2.4.14-alpha.tar.gz) = 2832944 +SHA256 (tor-0.2.4.15-rc.tar.gz) = 3221ee1aec84d8ea3c5af9fc915152ea22d8ca7d87b422cc339533c374986559 +SIZE (tor-0.2.4.15-rc.tar.gz) = 2820553 Modified: head/security/tor-devel/files/tor.in ============================================================================== --- head/security/tor-devel/files/tor.in Sun Jul 14 02:38:17 2013 (r322976) +++ head/security/tor-devel/files/tor.in Sun Jul 14 06:42:45 2013 (r322977) @@ -10,13 +10,13 @@ # All these options will overide any settings in your local torrc as # they are command line options. # -# tor_enable (bool): Set to "NO" by default -# Set it to "YES" to enable tor -# tor_conf (str): Points to your tor conf file +# tor_enable (bool): Set it to "YES" to enable tor. Default: NO +# tor_conf (str): Points to your torrc file. # Default: %%PREFIX%%/etc/tor/torrc -# tor_user (str): Tor Daemon user. Default _tor -# tor_datadir (str): Tor DataDir. Defaults /var/db/tor -# tor_logfile (str): Tor Log File. Defaults /var/log/tor +# tor_user (str): Tor daemon user. Default: _tor +# tor_datadir (str): Tor datadir. Default: /var/db/tor +# tor_logfile (str): Tor log file. Default: /var/log/tor +# tor_loglevel (str): Tor log severity level. Default: notice # . /etc/rc.subr @@ -31,13 +31,14 @@ load_rc_config ${name} : ${tor_user="_tor"} : ${tor_pidfile="/var/run/tor/tor.pid"} : ${tor_logfile="/var/log/tor"} +: ${tor_loglevel="notice"} : ${tor_datadir="/var/db/tor"} required_files=${tor_conf} required_dirs=${tor_datadir} pidfile=${tor_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --+Log notice\ file\ ${tor_logfile}" +command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir} --+Log ${tor_loglevel}\ file\ ${tor_logfile}" extra_commands="log" log_cmd="${name}_log"