svn commit: r403904 - in head: . security/tor security/tor-devel security/tor-devel/files security/tor/files

[Dmitry Marakasov]

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"