Attachment 163417 Details for Bug 204739 – Patch

[patch] Patch

tor.patch (text/plain), 1.88 KB, created by Dmitry Marakasov on 2015-11-22 12:51:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-11-22 12:51:32 UTC

Size: 1.88 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 390640)
>+++ Makefile	(working copy)
>@@ -2,7 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	tor
>-DISTVERSION=	0.2.6.9
>+PORTVERSION=	0.2.6.9
>+PORTREVISION=	1
> CATEGORIES=	security net ipv6
> MASTER_SITES=	TOR
> 
>@@ -44,9 +45,8 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ( (${OSVERSION} < 900000) || \
>-(${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
>-empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
>+.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
>+	empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
> CONFIGURE_ARGS+=	--enable-gcc-hardening
> .else
> CONFIGURE_ARGS+=	--disable-gcc-hardening
>Index: files/tor.in
>===================================================================
>--- files/tor.in	(revision 390640)
>+++ files/tor.in	(working copy)
>@@ -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,8 +28,6 @@
> : ${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}
>@@ -38,13 +34,8 @@
> 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"
>+command_args="-f ${tor_conf} --PidFile ${tor_pidfile} --RunAsDaemon 1 --DataDirectory ${tor_datadir}"
>+extra_commands="reload"
> 
>-tor_log() {
>-	cat ${tor_logfile}
>-}
>-
> run_rc_command "$1"
>

Actions: View | Diff

Attachments on bug 204739: 163417 | 163517 | 163518