ports/137119: [PATCH]security/tor: update to 0.2.1.18

[bf]

>Number:         137119
>Category:       ports
>Synopsis:       [PATCH]security/tor: update to 0.2.1.18
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 25 12:00:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        8-BETA2 amd64
>Organization:
-
>Environment:
>Description:
For a full description of the changes, see the relevant parts of:

https://git.torproject.org/checkout/tor/master/ChangeLog

There have been many improvements and bugfixes.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN tor.orig/Makefile tor/Makefile
--- tor.orig/Makefile	2009-07-25 06:31:03.000000000 -0400
+++ tor/Makefile	2009-07-25 07:19:03.000000000 -0400
@@ -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 @@
 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+=	--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 @@
 	${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 -ruN tor.orig/distinfo tor/distinfo
--- tor.orig/distinfo	2009-07-25 06:31:03.000000000 -0400
+++ tor/distinfo	2009-07-25 06:35:04.000000000 -0400
@@ -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 -ruN tor.orig/files/pkg-message.in tor/files/pkg-message.in
--- tor.orig/files/pkg-message.in	2009-07-25 06:31:03.000000000 -0400
+++ tor/files/pkg-message.in	2009-07-25 07:00:04.000000000 -0400
@@ -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.
 ================================================================================


>Release-Note:
>Audit-Trail:
>Unformatted: