Update tor to 0.2.0.32.

Based on PR 40241 by Taylor R Campbell.
While here, add DESTDIR support.

Changes in version 0.2.0.32 - 2008-11-20
  o Security fixes:
    - The "User" and "Group" config options did not clear the
      supplementary group entries for the Tor process. The "User" option
      is now more robust, and we now set the groups to the specified
      user's primary group. The "Group" option is now ignored. For more
      detailed logging on credential switching, set CREDENTIAL_LOG_LEVEL
      in common/compat.c to LOG_NOTICE or higher. Patch by Jacob Appelbaum
      and Steven Murdoch. Bugfix on 0.0.2pre14. Fixes bug 848 and 857.
    - The "ClientDNSRejectInternalAddresses" config option wasn't being
      consistently obeyed: if an exit relay refuses a stream because its
      exit policy doesn't allow it, we would remember what IP address
      the relay said the destination address resolves to, even if it's
      an internal IP address. Bugfix on 0.2.0.7-alpha; patch by rovv.

  o Major bugfixes:
    - Fix a DOS opportunity during the voting signature collection process
      at directory authorities. Spotted by rovv. Bugfix on 0.2.0.x.

  o Major bugfixes (hidden services):
    - When fetching v0 and v2 rendezvous service descriptors in parallel,
      we were failing the whole hidden service request when the v0
      descriptor fetch fails, even if the v2 fetch is still pending and
      might succeed. Similarly, if the last v2 fetch fails, we were
      failing the whole hidden service request even if a v0 fetch is
      still pending. Fixes bug 814. Bugfix on 0.2.0.10-alpha.
    - When extending a circuit to a hidden service directory to upload a
      rendezvous descriptor using a BEGIN_DIR cell, almost 1/6 of all
      requests failed, because the router descriptor has not been
      downloaded yet. In these cases, do not attempt to upload the
      rendezvous descriptor, but wait until the router descriptor is
      downloaded and retry. Likewise, do not attempt to fetch a rendezvous
      descriptor from a hidden service directory for which the router
      descriptor has not yet been downloaded. Fixes bug 767. Bugfix
      on 0.2.0.10-alpha.

  o Minor bugfixes:
    - Fix several infrequent memory leaks spotted by Coverity.
    - When testing for libevent functions, set the LDFLAGS variable
      correctly. Found by Riastradh.
    - Avoid a bug where the FastFirstHopPK 0 option would keep Tor from
      bootstrapping with tunneled directory connections. Bugfix on
      0.1.2.5-alpha. Fixes bug 797. Found by Erwin Lam.
    - When asked to connect to A.B.exit:80, if we don't know the IP for A
      and we know that server B rejects most-but-not all connections to
      port 80, we would previously reject the connection. Now, we assume
      the user knows what they were asking for. Fixes bug 752. Bugfix
      on 0.0.9rc5. Diagnosed by BarkerJr.
    - If we overrun our per-second write limits a little, count this as
      having used up our write allocation for the second, and choke
      outgoing directory writes. Previously, we had only counted this when
      we had met our limits precisely. Fixes bug 824. Patch from by rovv.
      Bugfix on 0.2.0.x (??).
    - Remove the old v2 directory authority 'lefkada' from the default
      list. It has been gone for many months.
    - Stop doing unaligned memory access that generated bus errors on
      sparc64. Bugfix on 0.2.0.10-alpha. Fixes bug 862.
    - Make USR2 log-level switch take effect immediately. Bugfix on
      0.1.2.8-beta.

  o Minor bugfixes (controller):
    - Make DNS resolved events into "CLOSED", not "FAILED". Bugfix on
      0.1.2.5-alpha. Fix by Robert Hogan. Resolves bug 807.

3 files changed, 13 insertions, 12 deletions

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 32e7dd9dfcb..2f6afd664fc 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2008/12/21 11:01:59 obache Exp $
+# $NetBSD: Makefile,v 1.59 2008/12/21 11:10:27 obache Exp $
 #
 
-DISTNAME=		tor-0.2.0.31
-PKGREVISION=		1
+DISTNAME=		tor-0.2.0.32
 CATEGORIES=		net security
 MASTER_SITES=		http://www.torproject.org/dist/
 
@@ -10,6 +9,8 @@ MAINTAINER=		athaba@inode.at
 HOMEPAGE=		http://www.torproject.org/
 COMMENT=		Anonymizing overlay network for TCP
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 USE_LANGUAGES+=		c99
@@ -55,11 +56,11 @@ CFLAGS+=		-c99
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tor
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/tor
 	${INSTALL_DATA} ${WRKSRC}/src/config/torrc.sample		\
-		${PREFIX}/share/examples/tor/torrc.sample
+		${DESTDIR}${PREFIX}/share/examples/tor/torrc.sample
 	${INSTALL_DATA} ${WRKSRC}/contrib/tor-tsocks.conf		\
-		${PREFIX}/share/examples/tor/tor-tsocks.conf
+		${DESTDIR}${PREFIX}/share/examples/tor/tor-tsocks.conf
 
 BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2
 .include "../../devel/libevent/buildlink3.mk"
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 5d9db25dabd..75879a335f9 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2008/09/08 19:28:28 wiz Exp $
+$NetBSD: distinfo,v 1.31 2008/12/21 11:10:27 obache Exp $
 
-SHA1 (tor-0.2.0.31.tar.gz) = a586cc017a791ac481fde836c3cf8e3667fb5cfc
-RMD160 (tor-0.2.0.31.tar.gz) = 584cbbd9f295a8f677bc95a5f05dc78f6184b97a
-Size (tor-0.2.0.31.tar.gz) = 2156305 bytes
+SHA1 (tor-0.2.0.32.tar.gz) = 0e48d0706f1717afc6d19228a8878c3bc379b25d
+RMD160 (tor-0.2.0.32.tar.gz) = e87bee7d7dadf17280bf0b11245b0bad70d68fc2
+Size (tor-0.2.0.32.tar.gz) = 2159864 bytes
 SHA1 (patch-aa) = 630e1e0a9591c136987b504e73c64ff9f53b54e9
 SHA1 (patch-ab) = 3363efdcf8b9918c1249add1046077f2323a11ff
diff --git a/net/tor/files/tor.in b/net/tor/files/tor.in
index 9b6db2206c8..8c7debafcce 100644
--- a/net/tor/files/tor.in
+++ b/net/tor/files/tor.in
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tor.in,v 1.2 2005/09/27 17:44:12 tv Exp $
+# $NetBSD: tor.in,v 1.3 2008/12/21 11:10:27 obache Exp $
 #
 # PROVIDE: tor
 # REQUIRE: DAEMON
@@ -26,7 +26,7 @@ restart_cmd="tor_stop ; tor_start"
 
 tor_start ()
 {
-	${command} --User @TOR_USER@ --Group @TOR_GROUP@ --RunAsDaemon 1 \
+	${command} --User @TOR_USER@ --RunAsDaemon 1 \
 		--DataDirectory @PKG_HOME@ --PIDFile ${pidfile}
 }