From owner-svn-ports-all@freebsd.org Thu Dec 17 10:58:15 2015 Return-Path: Delivered-To: svn-ports-all@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 436E1A49FAB; Thu, 17 Dec 2015 10:58:15 +0000 (UTC) (envelope-from amdmi3@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 03A131AFC; Thu, 17 Dec 2015 10:58:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHAwEE9017405; Thu, 17 Dec 2015 10:58:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHAwDjp017399; Thu, 17 Dec 2015 10:58:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512171058.tBHAwDjp017399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 17 Dec 2015 10:58:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403904 - in head: . security/tor security/tor-devel security/tor-devel/files security/tor/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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 10:58:15 -0000 Author: amdmi3 Date: Thu Dec 17 10:58:13 2015 New Revision: 403904 URL: https://svnweb.freebsd.org/changeset/ports/403904 Log: - Don't override/force logfile configuration PR: 204739 Submitted by: amdmi3 Approved by: bf (maintainer) Modified: head/UPDATING head/security/tor-devel/Makefile head/security/tor-devel/files/tor.in head/security/tor/Makefile head/security/tor/files/tor.in Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Dec 17 10:53:25 2015 (r403903) +++ head/UPDATING Thu Dec 17 10:58:13 2015 (r403904) @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20151217: + AFFECTS: users of security/tor, security/tor-devel + AUTHOR: amdmi3 + + Tor rc.d script no longer overrides or forces logfile configuration, + you now need to setup logging by hand. To preserve old behavior, add + the following line to /usr/local/etc/tor/torrc: + + Log notice file /var/log/tor + 20151215: AFFECTS: All users of www/node AUTHOR: koobs Modified: head/security/tor-devel/Makefile ============================================================================== --- head/security/tor-devel/Makefile Thu Dec 17 10:53:25 2015 (r403903) +++ head/security/tor-devel/Makefile Thu Dec 17 10:58:13 2015 (r403904) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.6.7 +PORTVERSION= 0.2.6.7 +PORTREVISION= 1 CATEGORIES= security net ipv6 MASTER_SITES= TOR PKGNAMESUFFIX= -devel Modified: head/security/tor-devel/files/tor.in ============================================================================== --- head/security/tor-devel/files/tor.in Thu Dec 17 10:53:25 2015 (r403903) +++ head/security/tor-devel/files/tor.in Thu Dec 17 10:58:13 2015 (r403904) @@ -15,8 +15,6 @@ # Default: %%PREFIX%%/etc/tor/torrc # 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 @@ -30,21 +28,14 @@ load_rc_config ${name} : ${tor_conf="%%PREFIX%%/etc/tor/torrc"} : ${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 ${tor_loglevel}\ file\ ${tor_logfile}" -extra_commands="log reload" -log_cmd="${name}_log" - -tor_log() { - cat ${tor_logfile} -} +command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}" +extra_commands="reload" run_rc_command "$1" Modified: head/security/tor/Makefile ============================================================================== --- head/security/tor/Makefile Thu Dec 17 10:53:25 2015 (r403903) +++ head/security/tor/Makefile Thu Dec 17 10:58:13 2015 (r403904) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.2.6.10 +PORTVERSION= 0.2.6.10 +PORTREVISION= 1 CATEGORIES= security net ipv6 MASTER_SITES= TOR Modified: head/security/tor/files/tor.in ============================================================================== --- head/security/tor/files/tor.in Thu Dec 17 10:53:25 2015 (r403903) +++ head/security/tor/files/tor.in Thu Dec 17 10:58:13 2015 (r403904) @@ -15,8 +15,6 @@ # Default: %%PREFIX%%/etc/tor/torrc # 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 @@ -30,21 +28,14 @@ load_rc_config ${name} : ${tor_conf="%%PREFIX%%/etc/tor/torrc"} : ${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 ${tor_loglevel}\ file\ ${tor_logfile}" -extra_commands="log reload" -log_cmd="${name}_log" - -tor_log() { - cat ${tor_logfile} -} +command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}" +extra_commands="reload" run_rc_command "$1"