please review/test "tor" update

[Matthias Drochner <M.Drochner%fz-juelich.de@localhost>]

Hi -
the current "tor" pkg is out of date. I've been playing with the
new 0.1.2.x release versions for a while, and just updated
to 0.1.2.15. Works well so far.
I've tested a standard client configuration, and an "anonymous
service". I can't test a server in a meaningful way at my place
due to a restrictive firewall.
Could someone please try it?
A tor server can also run multithreaded which might give some
performanve gain, or less memory usage. At least with a reliable
pthread library which we have in -current. This is currently
disabled by some dubious conditionals in the configure script,
should be easy to enable anyway. Please test this too if you can.

best regards
Matthias




Forschungszentrum Juelich GmbH
52425 Juelich

Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDirig'in Baerbel Brumme-Bothe
Vorstand: Prof. Dr. Achim Bachem (Vorsitzender), Dr. Ulrich Krafft (stellv. 
Vorsitzender)

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile    4 Jul 2007 20:54:53 -0000       1.42
+++ Makefile    24 Jul 2007 17:49:08 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.42 2007/07/04 20:54:53 jlam Exp $
 #
 
-DISTNAME=              tor-0.1.1.26
-PKGREVISION=           2
+DISTNAME=              tor-0.1.2.15
 CATEGORIES=            net security
 MASTER_SITES=          http://tor.eff.org/dist/
 
@@ -31,6 +30,7 @@ USER_GROUP=           ${TOR_USER} ${TOR_GROUP}
 OWN_DIRS_PERMS+=       ${PKG_HOME} ${USER_GROUP} 0755
 
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=       --with-libevent-dir=${LOCALBASE}
 
 CONF_FILES+=           ${PREFIX}/share/examples/tor/tor-tsocks.conf    \
                                ${PKG_SYSCONFDIR}/tor/tor-tsocks.conf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo    17 Dec 2006 21:53:44 -0000      1.23
+++ distinfo    24 Jul 2007 17:49:08 -0000
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.23 2006/12/17 21:53:44 tv Exp $
 
-SHA1 (tor-0.1.1.26.tar.gz) = 4d754ee52e20ae99179a74245a5288527c179ab6
-RMD160 (tor-0.1.1.26.tar.gz) = cc1ce91d96dc25a963d1f49f7965db106890949a
-Size (tor-0.1.1.26.tar.gz) = 893367 bytes
-SHA1 (patch-ac) = 3e3a6bce4da2a55b60a52fcc4a575eaceb6a2aa8
-SHA1 (patch-ad) = f0ead230249a0341b5d15c47d9361bd6e16ec23a
+SHA1 (tor-0.1.2.15.tar.gz) = 7568798b89eaa32572d0ecdf5b4d2f041f4b7772
+RMD160 (tor-0.1.2.15.tar.gz) = 93ecd601d8d47415491b6377c9bbd58f7c2e21e2
+Size (tor-0.1.2.15.tar.gz) = 1254655 bytes
+SHA1 (patch-ac) = adcc070e4d522143c4d882bd13436cd2b71f289b
+SHA1 (patch-ad) = 72a68cbd00a5febdff82ba9268bdad2b47ea8159
+SHA1 (patch-ae) = 6697fd7fdf5ecf5a1ae40db2d40dee1a169c324a
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/patches/patch-ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ac
--- patches/patch-ac    26 May 2006 02:21:42 -0000      1.3
+++ patches/patch-ac    24 Jul 2007 17:49:08 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2006/05/26 02:21:42 jschauma Exp $
+$NetBSD$
 
---- contrib/Makefile.in.orig   2006-05-23 13:08:04.000000000 -0400
+--- contrib/Makefile.in.orig   2007-05-25 02:52:01.000000000 +0200
 +++ contrib/Makefile.in
-@@ -81,7 +81,7 @@ confdir = $(sysconfdir)/tor
- 
- EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in 
tor.sh torctl rc.subr ExerciseServer.py PathDemo.py
- 
+@@ -176,7 +176,7 @@ SUBDIRS = osx suse
+ DIST_SUBDIRS = osx suse
+ confdir = $(sysconfdir)/tor
+ EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in 
tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in 
package_nsis-mingw.sh tor.ico
 -conf_DATA = tor-tsocks.conf
 +#conf_DATA = tor-tsocks.conf
- 
  bin_SCRIPTS = torify
- 
+ man_MANS = torify.1
+ all: all-recursive
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/patches/patch-ad,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ad
--- patches/patch-ad    26 May 2006 02:21:42 -0000      1.2
+++ patches/patch-ad    24 Jul 2007 17:49:08 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2006/05/26 02:21:42 jschauma Exp $
+$NetBSD$
 
---- src/config/Makefile.in.orig        2006-03-18 23:02:54.000000000 -0500
+--- src/config/Makefile.in.orig        2007-05-25 02:52:01.000000000 +0200
 +++ src/config/Makefile.in
-@@ -78,7 +78,7 @@ confdir = $(sysconfdir)/tor
- 
+@@ -155,7 +155,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ confdir = $(sysconfdir)/tor
  EXTRA_DIST = 
- 
 -conf_DATA = torrc.sample
 +#conf_DATA = torrc.sample
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../orconfig.h
- CONFIG_CLEAN_FILES =  torrc.sample
+ all: all-am
+ 
+ .SUFFIXES:
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ae    24 Jul 2007 17:49:08 -0000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- configure.orig     2007-07-12 13:12:23.000000000 +0200
++++ configure
+@@ -5345,6 +5345,8 @@ done
+ 
+ fi
+ 
++# these checks don't work, assume types are present
++if false; then
+ 
+ { echo "$as_me:$LINENO: checking for u_int64_t" >&5
+ echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; }
+@@ -5598,6 +5600,7 @@ _ACEOF
+ 
+ fi
+ 
++fi
+ 
+ { echo "$as_me:$LINENO: checking for libevent directory" >&5
+ echo $ECHO_N "checking for libevent directory... $ECHO_C" >&6; }