mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Don't override/force logfile configuration

Browse Source 
PR:		204739
Submitted by:	amdmi3
Approved by:	bf (maintainer)
This commit is contained in:
Dmitry Marakasov 2015-12-17 10:58:13 +00:00
parent c0ea229003
commit 8ff2ca1457
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=403904
5 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UPDATING
View File

@ -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

3
security/tor-devel/Makefile
View File

@ -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

13
security/tor-devel/files/tor.in
View File

@ -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"

3
security/tor/Makefile
View File

@ -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

13
security/tor/files/tor.in
View File

@ -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"