Attachment 186516 Details for Bug 222431 – svn diff for security/tor

[patch] svn diff for security/tor

patch-security_tor-3.1.7 (text/plain), 3.54 KB, created by Bernard Spil on 2017-09-18 19:01:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-09-18 19:01:30 UTC

Size: 3.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 449587)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tor
>-PORTVERSION=	0.3.0.10
>+PORTVERSION=	0.3.1.7
> CATEGORIES=	security net ipv6
> MASTER_SITES=	TOR
> 
>@@ -19,13 +19,14 @@
> USES=		cpe gmake pkgconfig
> CPE_VENDOR=	torproject
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}"
>+CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" \
>+		--with-libevent-dir="${LOCALBASE}"
> CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
> 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
> 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
> 
>-OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
>-OPTIONS_DEFAULT=MANPAGES
>+OPTIONS_DEFINE=	MANPAGES DOCS LZMA STATIC_TOR TCMALLOC TOR2WEB ZSTD
>+OPTIONS_DEFAULT=MANPAGES LZMA
> OPTIONS_SUB=	yes
> 
> STATIC_TOR_DESC=	Build a static tor
>@@ -42,9 +43,25 @@
> 
> CONFLICTS=	tor-devel-[0-9]*
> 
>-STATIC_TOR_USES=	ssl:build
>-STATIC_TOR_USES_OFF=	ssl
>+LZMA_CONFIGURE_ENABLE=		lzma
> 
>+STATIC_TOR_USES=		ssl:build
>+STATIC_TOR_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent
>+STATIC_TOR_CONFIGURE_ON=	--enable-static-tor \
>+				--with-zlib-dir=/usr/lib --disable-linker-hardening
>+STATIC_TOR_VARS=		tor_libevent_libs={LOCALBASE}/lib/libevent.a
>+STATIC_TOR_CONFIGURE_OFF=	--enable-linker-hardening
>+STATIC_TOR_USES_OFF=		ssl
>+STATIC_TOR_LIB_DEPENDS_OFF=	libevent.so:devel/libevent
>+STATIC_TOR_VARS_OFF=		tor_libevent_libs=-levent
>+
>+TCMALLOC_CONFIGURE_ON=		--with-tcmalloc
>+
>+TOR2WEB_CONFIGURE_ENABLE=	tor2web-mode
>+
>+ZSTD_CONFIGURE_ENABLE=		zstd
>+ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
>@@ -60,32 +77,13 @@
> CONFIGURE_ARGS+=	--disable-gcc-hardening
> .endif
> 
>-.if ${PORT_OPTIONS:MSTATIC_TOR}
>-BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent
>-CONFIGURE_ARGS+=	--enable-static-tor \
>-			--with-zlib-dir=/usr/lib --disable-linker-hardening
>-TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
>-.else
>-CONFIGURE_ARGS+=	--enable-linker-hardening
>-LIB_DEPENDS+=		libevent.so:devel/libevent
>-TOR_LIBEVENT_LIBS=	-levent
>-.endif
>-
>-.if ${PORT_OPTIONS:MTCMALLOC}
>-CONFIGURE_ARGS+=	--with-tcmalloc
>-.if ${PORT_OPTIONS:MSTATIC_TOR}
>+.if !empty(PORT_OPTIONS:MTCMALLOC) && !empty(PORT_OPTIONS:MSTATIC_TOR)
> BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
>-.else
>+.elif ${PORT_OPTIONS:MTCMALLOC}
> LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
> .endif
>-.endif
> 
>-.if ${PORT_OPTIONS:MTOR2WEB}
>-CONFIGURE_ARGS+=	--enable-tor2web-mode
>-.endif
>-
>-pre-everything::
>-.if ${PORT_OPTIONS:MTOR2WEB}
>+pre-everything-TOR2WEB-on::
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen."
> 	@${ECHO_MSG} "         With this option tor cannot be used for regular traffic,"
>@@ -92,7 +90,6 @@
> 	@${ECHO_MSG} "         only for non-anonymous hidden service traffic."
> 	@${ECHO_MSG} "         Please make sure you understand this option."
> 	@${ECHO_MSG}
>-.endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 449587)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1502098144
>-SHA256 (tor-0.3.0.10.tar.gz) = 9a8e6e49a1688dae64dca10f84a414ec9a4f393fb2256ae28e0c2e3239185ab1
>-SIZE (tor-0.3.0.10.tar.gz) = 5845205
>+TIMESTAMP = 1505758464
>+SHA256 (tor-0.3.1.7.tar.gz) = 1df5dd4894bb2f5e0dc96c466955146353cf33ac50cd997cfc1b28ea3ed9c08f
>+SIZE (tor-0.3.1.7.tar.gz) = 6058284

Actions: View | Diff

Attachments on bug 222431: 186516 | 186518