update to 0.1.0.12

This is a major update, too many improvements to list here, see
the ChangeLog in the distribution for details.

pkgsrc changes:
-remove dependency on tsocks; this is just one possible way to
 make applications use SOCKS; add a hint to MESSAGE
-use the pkgsrc libevent - the NetBSD builtin is old, and tor
 complains loudly if it doesn't like the libevent version
-make the rc.d script executable

5 files changed, 37 insertions, 16 deletions

diff --git a/net/tor/MESSAGE b/net/tor/MESSAGE
index b571b7d94bb..0a196f75107 100644
--- a/net/tor/MESSAGE
+++ b/net/tor/MESSAGE
@@ -1,9 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2005/02/13 20:27:53 jschauma Exp $
+$NetBSD: MESSAGE,v 1.2 2005/08/04 10:55:31 drochner Exp $
 
 You probably want to install www/privoxy to torify your browsers.  Please
 see http://tor.eff.org/cvs/tor/doc/tor-doc.html for details.
 
+Other applications can be torified with the help of libtsocks (net/tsocks).
+A tsocks configuration file for this is installed as
+${PREFIX}/share/examples/tor/tor-tsocks.conf.
+
 If you wish to chroot tor, you may find the following URLs helpful:
   http://pestilenz.org/~bauerm/tor-openbsd-howto.html
   http://wiki.noreply.org/wiki/TheOnionRouter/TorInChroot
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 2a6d0f6d8e7..a5fe059c909 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/22 15:53:24 salo Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/04 10:55:31 drochner Exp $
 #
 
-DISTNAME=		tor-0.0.9.10
+DISTNAME=		tor-0.1.0.12
 CATEGORIES=		net security
 MASTER_SITES=		http://tor.eff.org/dist/
 
@@ -9,8 +9,6 @@ MAINTAINER=		jschauma@NetBSD.org
 HOMEPAGE=		http://tor.eff.org/
 COMMENT=		Anonymizing overlay network for TCP
 
-DEPENDS+=		tsocks>=1.7:../../net/tsocks
-
 .include "../../mk/bsd.prefs.mk"
 
 USE_PKGLOCALEDIR=	yes
@@ -63,8 +61,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/tor-tsocks.conf		\
 		${PREFIX}/share/examples/tor/tor-tsocks.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/tor.pkgsrc.rc ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/tor
+	${INSTALL_SCRIPT} ${WRKSRC}/tor.pkgsrc.rc ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/tor
 
+BUILDLINK_DEPENDS.libevent+= libevent>=1.1a
+# XXX the pkgsrc libevent builtin.mk does not detect the version of a builtin
+# libevent, so we need to force use of the pkgsrc one
+USE_BUILTIN.libevent=	no
+.include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 66cd820bb12..fea6e156135 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/06/22 15:53:24 salo Exp $
+$NetBSD: distinfo,v 1.11 2005/08/04 10:55:31 drochner Exp $
 
-SHA1 (tor-0.0.9.10.tar.gz) = 146af8d7f8649d9f9e092131c9d18645d864caf4
-RMD160 (tor-0.0.9.10.tar.gz) = c78a1c57953d5ec2fca6fff5ed0e605c647f1b42
-Size (tor-0.0.9.10.tar.gz) = 558945 bytes
-SHA1 (patch-ac) = c036da74ca6f842af9c5426b96ee0e65215bb964
+SHA1 (tor-0.1.0.12.tar.gz) = 6b6372acd9c2027e5cbbc1d156025c1332a4b017
+RMD160 (tor-0.1.0.12.tar.gz) = de6cf04636e75736ccc4d18ab4bf16d6068e5bab
+Size (tor-0.1.0.12.tar.gz) = 630549 bytes
+SHA1 (patch-ac) = 56236bb89dc5975beaf24513218acbba39f9fa82
+SHA1 (patch-ad) = b70a2d675349ecb815de27ad4c67c195ed79e658
diff --git a/net/tor/patches/patch-ac b/net/tor/patches/patch-ac
index 4503dc8002b..33fd73b3255 100644
--- a/net/tor/patches/patch-ac
+++ b/net/tor/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2005/02/13 20:27:54 jschauma Exp $
+$NetBSD: patch-ac,v 1.2 2005/08/04 10:55:31 drochner Exp $
 
---- contrib/Makefile.in.orig	2005-02-13 15:07:56.000000000 -0500
-+++ contrib/Makefile.in	2005-02-13 15:08:23.000000000 -0500
-@@ -75,7 +75,7 @@
+--- contrib/Makefile.in.orig	2005-07-18 21:11:02.000000000 +0200
++++ contrib/Makefile.in
+@@ -78,7 +78,7 @@ confdir = $(sysconfdir)/tor
  
- EXTRA_DIST = tor-tsocks.conf torify.1 tor-control.py tor.nsi tor.sh torctl
+ EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi tor.sh torctl ExerciseServer.py PathDemo.py
  
 -conf_DATA = tor-tsocks.conf
 +#conf_DATA = tor-tsocks.conf
diff --git a/net/tor/patches/patch-ad b/net/tor/patches/patch-ad
new file mode 100644
index 00000000000..3592fe5a442
--- /dev/null
+++ b/net/tor/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/08/04 10:55:31 drochner Exp $
+
+--- src/config/Makefile.in.orig	2005-07-21 23:08:06.000000000 +0200
++++ src/config/Makefile.in
+@@ -75,7 +75,7 @@ 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