aboutsummaryrefslogtreecommitdiffstats
path: root/security/tor
diff options
context:
space:
mode:
Diffstat (limited to 'security/tor')
-rw-r--r--security/tor/Makefile21
-rw-r--r--security/tor/distinfo6
-rw-r--r--security/tor/files/pkg-message.in2
3 files changed, 18 insertions, 11 deletions
diff --git a/security/tor/Makefile b/security/tor/Makefile
index edb42bf2a8d6..8a0ca4cb6cee 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= tor
-DISTVERSION= 0.2.0.35
-CATEGORIES= security net
+DISTVERSION= 0.2.1.18
+CATEGORIES= security net ipv6
MASTER_SITES= http://www.torproject.org/dist/ \
http://tor.cypherpunks.at/dist/ \
http://tor.depthstrike.com/dist/ \
@@ -26,7 +26,8 @@ CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
OPTIONS= BUFFREELISTS "freelists for buffer RAM" on \
- CELLPOOL "memory pool allocator for cells" on \
+ GEOIP "track country data" off \
+ INSTR_DOWNLOADS "instrument downloads for analysis" off \
TCMALLOC "use the tcmalloc memory allocation library" off \
THREADS "multi-threading support" on \
TRANSPARENT "transparent proxy support" on \
@@ -48,10 +49,16 @@ CONFIGURE_ARGS+= --enable-buf-freelists
CONFIGURE_ARGS+= --disable-buf-freelists
.endif
-.if defined(WITH_CELLPOOL)
-CONFIGURE_ARGS+= --enable-cell-pool
+.if defined(WITH_GEOIP)
+CONFIGURE_ARGS+= --enable-geoip-stats
.else
-CONFIGURE_ARGS+= --disable-cell-pool
+CONFIGURE_ARGS+= --disable-geoip-stats
+.endif
+
+.if defined(WITH_INSTR_DOWNLOADS)
+CONFIGURE_ARGS+= --enable-instrument-downloads
+.else
+CONFIGURE_ARGS+= --disable-instrument-downloads
.endif
.if defined(WITH_TCMALLOC)
@@ -105,7 +112,7 @@ post-install:
${CHOWN} _tor:_tor /var/db/tor
${CAT} ${PKGMESSAGE}
-regression-test:
+regression-test: build
@( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check )
diff --git a/security/tor/distinfo b/security/tor/distinfo
index 7137474442cd..78e8c6bc13ed 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,3 +1,3 @@
-MD5 (tor-0.2.0.35.tar.gz) = d4841e1b4d54866495fd373e865b2d44
-SHA256 (tor-0.2.0.35.tar.gz) = 7180c56c11e13d1ca860e3773ddfb2c9f951900670224a0850766795ac94b62e
-SIZE (tor-0.2.0.35.tar.gz) = 2221852
+MD5 (tor-0.2.1.18.tar.gz) = 5135c02fa0a1d9a1431680e0102c2548
+SHA256 (tor-0.2.1.18.tar.gz) = 2744304d9cfa6d472bceaaecb2ec983141c1e6bab0779eb2ca79a905c9e13653
+SIZE (tor-0.2.1.18.tar.gz) = 2408820
diff --git a/security/tor/files/pkg-message.in b/security/tor/files/pkg-message.in
index 872f6f0b198c..aa536343704e 100644
--- a/security/tor/files/pkg-message.in
+++ b/security/tor/files/pkg-message.in
@@ -1,5 +1,5 @@
================================================================================
To enable the tor server, set tor_enable="YES" in your /etc/rc.conf
and edit %%PREFIX%%/etc/tor/torrc. Also note that the rc.subr script overrides
-many torrc options and is tunable. See %%PREFIX%%/etc/rc.d/tor.sh for details
+many torrc options and is tunable. See %%PREFIX%%/etc/rc.d/tor for details.
================================================================================