Attachment 186518 Details for Bug 222431 – patch

[patch] patch

tor.patch (text/plain), 2.49 KB, created by Yuri Victorovich on 2017-09-18 19:41:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-09-18 19:41:05 UTC

Size: 2.49 KB

patch

obsolete

>Index: security/tor/Makefile
>===================================================================
>--- security/tor/Makefile	(revision 448177)
>+++ security/tor/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
> 
>@@ -25,12 +25,14 @@
> 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
> 
> OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
>-OPTIONS_DEFAULT=MANPAGES
>+OPTIONS_GROUP=	COMPRESSION
>+OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
>+OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
> OPTIONS_SUB=	yes
>-
> STATIC_TOR_DESC=	Build a static tor
> TCMALLOC_DESC=		Use the tcmalloc memory allocation library
> TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
>+COMPRESSION_DESC=	Supported compression libraries
> 
> USE_RC_SUBR=	tor
> SUB_FILES=	pkg-message
>@@ -40,11 +42,16 @@
> GROUPS=		_tor
> USERS=		_tor
> 
>-CONFLICTS=	tor-devel-[0-9]*
>+CONFLICTS_INSTALL=	tor-devel-[0-9]*
> 
> STATIC_TOR_USES=	ssl:build
> STATIC_TOR_USES_OFF=	ssl
> 
>+TOR2WEB_CONFIGURE_ENABLE=	tor2web-mode
>+ZSTD_CONFIGURE_ENABLE=		zstd
>+ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
>+LZMA_CONFIGURE_ENABLE=		lzma
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
>@@ -65,10 +72,18 @@
> CONFIGURE_ARGS+=	--enable-static-tor \
> 			--with-zlib-dir=/usr/lib --disable-linker-hardening
> TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
>+.  if ${PORT_OPTIONS:MZSTD}
>+BUILD_DEPENDS+=		${LOCALBASE}/lib/libzstd.a:archivers/zstd
>+TOR_ZSTD_LIBS=		${LOCALBASE}/lib/libzstd.a
>+.  endif
> .else
> CONFIGURE_ARGS+=	--enable-linker-hardening
> LIB_DEPENDS+=		libevent.so:devel/libevent
> TOR_LIBEVENT_LIBS=	-levent
>+.  if ${PORT_OPTIONS:MZSTD}
>+LIB_DEPENDS+=		libzstd.so:archivers/zstd
>+TOR_ZSTD_LIBS=		-lzstd
>+.  endif
> .endif
> 
> .if ${PORT_OPTIONS:MTCMALLOC}
>@@ -80,10 +95,6 @@
> .endif
> .endif
> 
>-.if ${PORT_OPTIONS:MTOR2WEB}
>-CONFIGURE_ARGS+=	--enable-tor2web-mode
>-.endif
>-
> pre-everything::
> .if ${PORT_OPTIONS:MTOR2WEB}
> 	@${ECHO_MSG}
>Index: security/tor/distinfo
>===================================================================
>--- security/tor/distinfo	(revision 448177)
>+++ security/tor/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 = 1505762209
>+SHA256 (tor-0.3.1.7.tar.gz) = 1df5dd4894bb2f5e0dc96c466955146353cf33ac50cd997cfc1b28ea3ed9c08f
>+SIZE (tor-0.3.1.7.tar.gz) = 6058284

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 222431: 186516 | 186518