Pullup ticket 1814 - requested by tv

security update for tor

Revisions pulled up:
- pkgsrc/net/tor/Makefile				1.32-1.33
- pkgsrc/net/tor/distinfo				1.19-1.20
- pkgsrc/net/tor/patches/patch-ae			1.1

   Module Name:	pkgsrc
   Committed By:	jschauma
   Date:		Sun Jul  9 15:03:55 UTC 2006

   Modified Files:
	pkgsrc/net/tor: Makefile distinfo
   Added Files:
	pkgsrc/net/tor/patches: patch-ae

   Log Message:
   update tor to version 0.1.1.22:

   Changes in version 0.1.1.22 - 2006-07-05
   o Major bugfixes:
     - Fix a big bug that was causing servers to not find themselves
       reachable if they changed IP addresses. Since only 0.1.1.22+
       servers can do reachability testing correctly, now we automatically
       make sure to test via one of these.
     - Fix to allow clients and mirrors to learn directory info from
       descriptor downloads that get cut off partway through.
     - Directory authorities had a bug in deciding if a newly published
       descriptor was novel enough to make everybody want a copy -- a few
       servers seem to be publishing new descriptors many times a minute.
   o Minor bugfixes:
     - Fix a rare bug that was causing some servers to complain about
       "closing wedged cpuworkers" and skip some circuit create requests.
     - Make the Exit flag in directory status documents actually work.

   While here, patch sample config file to log to syslog per default to make
   sure that tor starts as a daemon with the default config.
---
   Module Name:	pkgsrc
   Committed By:	tv
   Date:		Fri Aug  4 15:08:55 UTC 2006

   Modified Files:
	pkgsrc/net/tor: Makefile distinfo

   Log Message:
   Changes in version 0.1.1.23 - 2006-07-30
    o Major bugfixes:
      - Fast Tor servers, especially exit nodes, were triggering asserts
        due to a bug in handling the list of pending DNS resolves. Some
        bugs still remain here; we're hunting them.
      - Entry guards could crash clients by sending unexpected input.
      - More fixes on reachability testing: if you find yourself reachable,
        then don't ever make any client requests (so you stop predicting
        circuits), then hup or have your clock jump, then later your IP
        changes, you won't think circuits are working, so you won't try to
        test reachability, so you won't publish.

    o Minor bugfixes:
      - Avoid a crash if the controller does a resetconf firewallports
        and then a setconf fascistfirewall=1.
      - Avoid an integer underflow when the dir authority decides whether
        a router is stable: we might wrongly label it stable, and compute
        a slightly wrong median stability, when a descriptor is published
        later than now.
      - Fix a place where we might trigger an assert if we can't build our
        own server descriptor yet.

   [ fixes security issue http://secunia.com/advisories/21708/ ]

3 files changed, 20 insertions, 6 deletions

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 775073668aa..b08cb6e27d0 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/06/12 14:31:49 tv Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2006/09/02 22:02:49 ghen Exp $
 #
 
-DISTNAME=		tor-0.1.1.21
+DISTNAME=		tor-0.1.1.23
 CATEGORIES=		net security
 MASTER_SITES=		http://tor.eff.org/dist/
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index e14fa5473c5..d12127e373f 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2006/06/12 14:31:49 tv Exp $
+$NetBSD: distinfo,v 1.18.2.1 2006/09/02 22:02:49 ghen Exp $
 
-SHA1 (tor-0.1.1.21.tar.gz) = 553d91032647acac3d67c3306c1a4d9dcca4d0d5
-RMD160 (tor-0.1.1.21.tar.gz) = b9cf03751c48827668df07588731d9977da6604a
-Size (tor-0.1.1.21.tar.gz) = 833839 bytes
+SHA1 (tor-0.1.1.23.tar.gz) = d3f0120f5a18658231127281343aafb6c06aed70
+RMD160 (tor-0.1.1.23.tar.gz) = e958ed22f44e5f06736cadb5406dad04510a69f5
+Size (tor-0.1.1.23.tar.gz) = 847906 bytes
 SHA1 (patch-ac) = 3e3a6bce4da2a55b60a52fcc4a575eaceb6a2aa8
 SHA1 (patch-ad) = f0ead230249a0341b5d15c47d9361bd6e16ec23a
+SHA1 (patch-ae) = 9a1daff00de130028ec3be6c4ba1a4bd17e16a69
diff --git a/net/tor/patches/patch-ae b/net/tor/patches/patch-ae
new file mode 100644
index 00000000000..638dc8dcce5
--- /dev/null
+++ b/net/tor/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.2.2 2006/09/02 22:02:50 ghen Exp $
+
+--- src/config/torrc.sample.in.orig	2006-07-09 10:44:17.000000000 -0400
++++ src/config/torrc.sample.in		2006-07-09 10:44:25.000000000 -0400
+@@ -43,7 +43,7 @@
+ ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
+ #Log debug file @LOCALSTATEDIR@/log/tor/debug.log
+ ## Use the system log instead of Tor's logfiles
+-#Log notice syslog
++Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
+