Attachment 171578 Details for Bug 210389 – Proposed patch

[patch] Proposed patch

0001-Fix-210389-Remove-unwise-build-options.patch (text/plain), 2.34 KB, created by U+039b on 2016-06-19 16:01:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: U+039b

Created: 2016-06-19 16:01:37 UTC

Size: 2.34 KB

patch

obsolete

>From 4930ad26bd97898bca5e9b49989cc1b0b0e62524 Mon Sep 17 00:00:00 2001
>From: U+039b <*@0x39b.fr>
>Date: Sun, 19 Jun 2016 17:58:00 +0200
>Subject: [PATCH] Fix #210389 Remove unwise build options
>
>---
> security/tor/Makefile | 25 +------------------------
> 1 file changed, 1 insertion(+), 24 deletions(-)
>
>diff --git a/security/tor/Makefile b/security/tor/Makefile
>index 4a4991a..1275e2f 100644
>--- a/security/tor/Makefile
>+++ b/security/tor/Makefile
>@@ -23,14 +23,10 @@ CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
> 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
> 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
> 
>-OPTIONS_DEFINE=	BUFFEREVENTS INSTR_DOWNLOADS \
>-		STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
>+OPTIONS_DEFINE=	STATIC_TOR TCMALLOC TRANSPARENT
> 
>-BUFFEREVENTS_DESC=	Use libevent's buffered IO
>-INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
> STATIC_TOR_DESC=	Build a static tor
> TCMALLOC_DESC=		Use the tcmalloc memory allocation library
>-TOR2WEB_DESC=		Faster but non-anonymous hidden services
> TRANSPARENT_DESC=	Transparent proxy support
> 
> OPTIONS_DEFAULT=	THREADS TRANSPARENT
>@@ -58,33 +54,18 @@ CONFIGURE_ARGS+=	--enable-gcc-hardening
> CONFIGURE_ARGS+=	--disable-gcc-hardening
> .endif
> 
>-.if ${PORT_OPTIONS:MBUFFEREVENTS}
>-CONFIGURE_ARGS+=	--enable-bufferevents
>-.else
> CONFIGURE_ARGS+=	--disable-bufferevents
>-.endif
>-
>-.if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
>-CONFIGURE_ARGS+=	--enable-instrument-downloads
>-.else
> CONFIGURE_ARGS+=	--disable-instrument-downloads
>-.endif
> 
> .if ${PORT_OPTIONS:MSTATIC_TOR}
> BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
> CONFIGURE_ARGS+=	--enable-static-tor \
> 			--with-zlib-dir=/usr/lib --disable-linker-hardening
> TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
>-.if ${PORT_OPTIONS:MBUFFEREVENTS}
>-TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
>-.endif
> .else
> CONFIGURE_ARGS+=	--enable-linker-hardening
> LIB_DEPENDS+=		libevent.so:devel/libevent2
> TOR_LIBEVENT_LIBS=	-levent
>-.if ${PORT_OPTIONS:MBUFFEREVENTS}
>-TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
>-.endif
> .endif
> 
> .if ${PORT_OPTIONS:MTCMALLOC}
>@@ -96,10 +77,6 @@ LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
> .endif
> .endif
> 
>-.if ${PORT_OPTIONS:MTOR2WEB}
>-CONFIGURE_ARGS+=	--enable-tor2web-mode
>-.endif
>-
> .if ${PORT_OPTIONS:MTRANSPARENT}
> CONFIGURE_ARGS+=	--enable-transparent
> .else
>-- 
>2.1.4
>

Actions: View | Diff

Attachments on bug 210389: 171578