View | Details | Raw Unified | Return to bug 222431 | Differences between
and this patch

Collapse All | Expand All

(-)security/tor/Makefile (-8 / +19 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	tor
4
PORTNAME=	tor
5
PORTVERSION=	0.3.0.10
5
PORTVERSION=	0.3.1.7
6
CATEGORIES=	security net ipv6
6
CATEGORIES=	security net ipv6
7
MASTER_SITES=	TOR
7
MASTER_SITES=	TOR
8
8
Lines 25-36 Link Here
25
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
25
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
26
26
27
OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
27
OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
28
OPTIONS_DEFAULT=MANPAGES
28
OPTIONS_GROUP=	COMPRESSION
29
OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
30
OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
29
OPTIONS_SUB=	yes
31
OPTIONS_SUB=	yes
30
31
STATIC_TOR_DESC=	Build a static tor
32
STATIC_TOR_DESC=	Build a static tor
32
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
33
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
33
TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
34
TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
35
COMPRESSION_DESC=	Supported compression libraries
34
36
35
USE_RC_SUBR=	tor
37
USE_RC_SUBR=	tor
36
SUB_FILES=	pkg-message
38
SUB_FILES=	pkg-message
Lines 40-50 Link Here
40
GROUPS=		_tor
42
GROUPS=		_tor
41
USERS=		_tor
43
USERS=		_tor
42
44
43
CONFLICTS=	tor-devel-[0-9]*
45
CONFLICTS_INSTALL=	tor-devel-[0-9]*
44
46
45
STATIC_TOR_USES=	ssl:build
47
STATIC_TOR_USES=	ssl:build
46
STATIC_TOR_USES_OFF=	ssl
48
STATIC_TOR_USES_OFF=	ssl
47
49
50
TOR2WEB_CONFIGURE_ENABLE=	tor2web-mode
51
ZSTD_CONFIGURE_ENABLE=		zstd
52
ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
53
LZMA_CONFIGURE_ENABLE=		lzma
54
48
.include <bsd.port.options.mk>
55
.include <bsd.port.options.mk>
49
56
50
.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
57
.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
Lines 65-74 Link Here
65
CONFIGURE_ARGS+=	--enable-static-tor \
72
CONFIGURE_ARGS+=	--enable-static-tor \
66
			--with-zlib-dir=/usr/lib --disable-linker-hardening
73
			--with-zlib-dir=/usr/lib --disable-linker-hardening
67
TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
74
TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
75
.  if ${PORT_OPTIONS:MZSTD}
76
BUILD_DEPENDS+=		${LOCALBASE}/lib/libzstd.a:archivers/zstd
77
TOR_ZSTD_LIBS=		${LOCALBASE}/lib/libzstd.a
78
.  endif
68
.else
79
.else
69
CONFIGURE_ARGS+=	--enable-linker-hardening
80
CONFIGURE_ARGS+=	--enable-linker-hardening
70
LIB_DEPENDS+=		libevent.so:devel/libevent
81
LIB_DEPENDS+=		libevent.so:devel/libevent
71
TOR_LIBEVENT_LIBS=	-levent
82
TOR_LIBEVENT_LIBS=	-levent
83
.  if ${PORT_OPTIONS:MZSTD}
84
LIB_DEPENDS+=		libzstd.so:archivers/zstd
85
TOR_ZSTD_LIBS=		-lzstd
86
.  endif
72
.endif
87
.endif
73
88
74
.if ${PORT_OPTIONS:MTCMALLOC}
89
.if ${PORT_OPTIONS:MTCMALLOC}
Lines 80-89 Link Here
80
.endif
95
.endif
81
.endif
96
.endif
82
97
83
.if ${PORT_OPTIONS:MTOR2WEB}
84
CONFIGURE_ARGS+=	--enable-tor2web-mode
85
.endif
86
87
pre-everything::
98
pre-everything::
88
.if ${PORT_OPTIONS:MTOR2WEB}
99
.if ${PORT_OPTIONS:MTOR2WEB}
89
	@${ECHO_MSG}
100
	@${ECHO_MSG}
(-)security/tor/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1502098144
1
TIMESTAMP = 1505762209
2
SHA256 (tor-0.3.0.10.tar.gz) = 9a8e6e49a1688dae64dca10f84a414ec9a4f393fb2256ae28e0c2e3239185ab1
2
SHA256 (tor-0.3.1.7.tar.gz) = 1df5dd4894bb2f5e0dc96c466955146353cf33ac50cd997cfc1b28ea3ed9c08f
3
SIZE (tor-0.3.0.10.tar.gz) = 5845205
3
SIZE (tor-0.3.1.7.tar.gz) = 6058284

Return to bug 222431