aboutsummaryrefslogtreecommitdiff
path: root/security/tor
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2016-09-07 11:46:01 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2016-09-07 11:46:01 +0000
commita252d05f3e20a9d4c669d9a2eb7c5895d912c111 (patch)
treec362b612814178a515d3d79ee25e2f8e69d48167 /security/tor
parent2311cb2be7471b432b432b224fed42f7f83a0e47 (diff)
downloadports-a252d05f3e20a9d4c669d9a2eb7c5895d912c111.tar.gz
ports-a252d05f3e20a9d4c669d9a2eb7c5895d912c111.zip
Notes
Diffstat (limited to 'security/tor')
-rw-r--r--security/tor/Makefile35
-rw-r--r--security/tor/distinfo6
2 files changed, 9 insertions, 32 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 9493257c75ef..96a19709d22b 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tor
-PORTVERSION= 0.2.8.6
+PORTVERSION= 0.2.8.7
CATEGORIES= security net ipv6
MASTER_SITES= TOR
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_powerpc64= Does not build
-USES= cpe gmake
+USES= cpe gmake ssl
CPE_VENDOR= torproject
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
@@ -22,19 +22,14 @@ 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 TOR2WEB 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
-
-USE_OPENSSL= yes
+OPTIONS_DEFAULT= TRANSPARENT
USE_RC_SUBR= tor
SUB_FILES= pkg-message
@@ -57,33 +52,15 @@ 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}
@@ -131,7 +108,7 @@ post-install:
.if ! ${PORT_OPTIONS:MTOR2WEB}
check regression-test test: build
@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
- ${MAKE_ARGS} check
-
+ ${MAKE_ARGS} check
.endif
+
.include <bsd.port.mk>
diff --git a/security/tor/distinfo b/security/tor/distinfo
index 84bb781cfefa..efa14213b296 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470238261
-SHA256 (tor-0.2.8.6.tar.gz) = 3dc9fc02f7cd22ed5fce707e0d9b26a72b1bd0976766a804cb13078d32e3ab5a
-SIZE (tor-0.2.8.6.tar.gz) = 5163500
+TIMESTAMP = 1472080840
+SHA256 (tor-0.2.8.7.tar.gz) = ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6
+SIZE (tor-0.2.8.7.tar.gz) = 5179093