Attachment 163518 Details for Bug 204739 – Patch

[patch] Patch

tor.patch (text/plain), 2.43 KB, created by Dmitry Marakasov on 2015-11-25 11:22:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-11-25 11:22:02 UTC

Size: 2.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 402391)
>+++ Makefile	(working copy)
>@@ -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
> 
>@@ -83,7 +84,7 @@
> .if ${PORT_OPTIONS:MTCMALLOC}
> CONFIGURE_ARGS+=	--with-tcmalloc
> .if ${PORT_OPTIONS:MSTATIC_TOR}
>-BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
>+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
> .else
> LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
> .endif
>@@ -100,10 +101,17 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
>-		-e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
>+	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
> 		${WRKSRC}/configure
> 
>+post-patch-STATIC_TOR-off:
>+	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
>+		${WRKSRC}/configure
>+
>+post-patch-STATIC_TOR-on:
>+	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
>+		${WRKSRC}/configure
>+
> post-configure:
> 	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
> 		${WRKSRC}/Makefile
>Index: files/tor.in
>===================================================================
>--- files/tor.in	(revision 402391)
>+++ 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