Pullup ticket 1676 - requested by jschauma

security update for tor

Revisions pulled up:
- pkgsrc/net/tor/MESSAGE			1.4
- pkgsrc/net/tor/Makefile			1.29
- pkgsrc/net/tor/distinfo			1.17
- pkgsrc/net/tor/patches/patch-ac		1.3
- pkgsrc/net/tor/patches/patch-ad		1.2

   Module Name:		pkgsrc
   Committed By:	jschauma
   Date:		Fri May 26 02:21:42 UTC 2006

   Modified Files:
   	pkgsrc/net/tor: MESSAGE Makefile distinfo
   	pkgsrc/net/tor/patches: patch-ac patch-ad

   Log Message:
   - Update tor to latest stable version 0.1.1.20 via files from pkgsrc-wip
   - maintainer -> tv

   Changes (summary):

   some major security fixes, including entry guards to protect the
   beginning of the circuit, exit enclaves to protect the end, and better
   firewall support; a new directory protocol that improves bandwidth use
   and keeps clients more up to date; two new directory authorities;
   a new ascii-based controller protocol that lets people easily write
   applications to interact with Tor; and
   many scalability and performance improvements

   Full changes available at
   http://archives.seul.org/or/announce/May-2006/msg00000.html

5 files changed, 17 insertions, 34 deletions

diff --git a/net/tor/MESSAGE b/net/tor/MESSAGE
index b52d3e2f933..90a8703ca3c 100644
--- a/net/tor/MESSAGE
+++ b/net/tor/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/01/16 16:52:31 jschauma Exp $
+$NetBSD: MESSAGE,v 1.3.2.1 2006/05/30 22:58:11 salo 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.
@@ -11,21 +11,4 @@ ${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
-
-===========================================================================
-
-Security Note:
-
-If you offer a Tor hidden service, an adversary who can run a fast Tor server
-and who knows some basic statistics can find the location of your hidden
-service in a matter of minutes to hours.
-
-See http://archives.seul.org/or/announce/Jan-2006/msg00001.html
-for details.
-
-To prevent this information disclosure, manually configure a half dozen
-EntryNodes.
-
-See http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ChooseEntryExit
-
 ===========================================================================
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 2357decf8f8..06f5b8f3354 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2006/05/30 22:58:11 salo Exp $
 #
 
-DISTNAME=		tor-0.1.0.17
+DISTNAME=		tor-0.1.1.20
 CATEGORIES=		net security
 MASTER_SITES=		http://tor.eff.org/dist/
 
-MAINTAINER=		jschauma@NetBSD.org
+MAINTAINER=		tv@NetBSD.org
 HOMEPAGE=		http://tor.eff.org/
 COMMENT=		Anonymizing overlay network for TCP
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index e35c9ac8b21..f6f69e2d16e 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2006/02/23 03:39:25 jschauma Exp $
+$NetBSD: distinfo,v 1.16.2.1 2006/05/30 22:58:11 salo Exp $
 
-SHA1 (tor-0.1.0.17.tar.gz) = 4df754374b5b14e6e9f96b88e694d4bb3deef4a5
-RMD160 (tor-0.1.0.17.tar.gz) = d3b99e1f1ea26d73dae073ee62d3a1899905074a
-Size (tor-0.1.0.17.tar.gz) = 634144 bytes
-SHA1 (patch-ac) = 56236bb89dc5975beaf24513218acbba39f9fa82
-SHA1 (patch-ad) = b70a2d675349ecb815de27ad4c67c195ed79e658
+SHA1 (tor-0.1.1.20.tar.gz) = 34af6983edd96d79c73e360aebc74d77d9bb828b
+RMD160 (tor-0.1.1.20.tar.gz) = 5d48d2954931fb28f0039f2472245abc9896316c
+Size (tor-0.1.1.20.tar.gz) = 828833 bytes
+SHA1 (patch-ac) = 3e3a6bce4da2a55b60a52fcc4a575eaceb6a2aa8
+SHA1 (patch-ad) = f0ead230249a0341b5d15c47d9361bd6e16ec23a
diff --git a/net/tor/patches/patch-ac b/net/tor/patches/patch-ac
index 33fd73b3255..570279f2d63 100644
--- a/net/tor/patches/patch-ac
+++ b/net/tor/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2005/08/04 10:55:31 drochner Exp $
+$NetBSD: patch-ac,v 1.2.6.1 2006/05/30 22:58:11 salo Exp $
 
---- contrib/Makefile.in.orig	2005-07-18 21:11:02.000000000 +0200
+--- contrib/Makefile.in.orig	2006-05-23 13:08:04.000000000 -0400
 +++ contrib/Makefile.in
-@@ -78,7 +78,7 @@ confdir = $(sysconfdir)/tor
+@@ -81,7 +81,7 @@ confdir = $(sysconfdir)/tor
  
- EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi tor.sh torctl ExerciseServer.py PathDemo.py
+ EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr 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
index 3592fe5a442..71fa51733b4 100644
--- a/net/tor/patches/patch-ad
+++ b/net/tor/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/08/04 10:55:31 drochner Exp $
+$NetBSD: patch-ad,v 1.1.8.1 2006/05/30 22:58:11 salo Exp $
 
---- src/config/Makefile.in.orig	2005-07-21 23:08:06.000000000 +0200
+--- src/config/Makefile.in.orig	2006-03-18 23:02:54.000000000 -0500
 +++ src/config/Makefile.in
-@@ -75,7 +75,7 @@ confdir = $(sysconfdir)/tor
+@@ -78,7 +78,7 @@ confdir = $(sysconfdir)/tor
  
  EXTRA_DIST =