Update to 0.1.2.16, which is the top of the new 0.1.2.x stable branch.

Too many changes to list here; most are not visible to client-only
users anyway.
I've tested client and anymous service functions. Couldn't test server
myself. Since noone responded when I asked for testers I'm committing
the update anyway, also because security flaws were reported without
telling whether they apply to the old 0.1.1 branch.

5 files changed, 47 insertions, 25 deletions

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 42ecc6eea87..d3d2c7efad2 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2007/07/04 20:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2007/08/09 19:33:58 drochner Exp $
 #
 
-DISTNAME=		tor-0.1.1.26
-PKGREVISION=		2
+DISTNAME=		tor-0.1.2.16
 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
diff --git a/net/tor/distinfo b/net/tor/distinfo
index bb652269ebe..355ede1f5ca 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.23 2006/12/17 21:53:44 tv Exp $
+$NetBSD: distinfo,v 1.24 2007/08/09 19:33:58 drochner 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.16.tar.gz) = f8eb950612db49b2f7176c068ca69e0091950bdb
+RMD160 (tor-0.1.2.16.tar.gz) = 813a8726470361ee6629e71a10be67be9cfdd325
+Size (tor-0.1.2.16.tar.gz) = 1254796 bytes
+SHA1 (patch-ac) = adcc070e4d522143c4d882bd13436cd2b71f289b
+SHA1 (patch-ad) = 72a68cbd00a5febdff82ba9268bdad2b47ea8159
+SHA1 (patch-ae) = 6697fd7fdf5ecf5a1ae40db2d40dee1a169c324a
diff --git a/net/tor/patches/patch-ac b/net/tor/patches/patch-ac
index ee9dcf8e936..b7ba79768c1 100644
--- a/net/tor/patches/patch-ac
+++ b/net/tor/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2006/05/26 02:21:42 jschauma Exp $
+$NetBSD: patch-ac,v 1.4 2007/08/09 19:33:58 drochner Exp $
 
---- 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
diff --git a/net/tor/patches/patch-ad b/net/tor/patches/patch-ad
index c3422a69390..c5a7939fa40 100644
--- a/net/tor/patches/patch-ad
+++ b/net/tor/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2006/05/26 02:21:42 jschauma Exp $
+$NetBSD: patch-ad,v 1.3 2007/08/09 19:33:58 drochner Exp $
 
---- 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:
diff --git a/net/tor/patches/patch-ae b/net/tor/patches/patch-ae
new file mode 100644
index 00000000000..058dc41313d
--- /dev/null
+++ b/net/tor/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.3 2007/08/09 19:33:58 drochner Exp $
+
+--- 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; }