[pkgsrc/pkgsrc-2005Q2]: pkgsrc/net/tor Pullup ticket 670 - requested by Lubom...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/870e904b79dc
branches:  pkgsrc-2005Q2
changeset: 495970:870e904b79dc
user:      snj <snj%pkgsrc.org@localhost>
date:      Tue Aug 09 16:18:32 2005 +0000

description:
Pullup ticket 670 - requested by Lubomir Sedlacik
security update for tor

Revisions pulled up:
- pkgsrc/net/tor/MESSAGE                1.2
- pkgsrc/net/tor/Makefile               1.15-1.17
- pkgsrc/net/tor/distinfo               1.11-1.13
- pkgsrc/net/tor/patches/patch-ac       1.2
- pkgsrc/net/tor/patches/patch-ad       1.1

    Module Name:    pkgsrc
    Committed By:   drochner
    Date:           Thu Aug  4 10:55:31 UTC 2005

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

    Log Message:
    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
----
    Module Name:    pkgsrc
    Committed By:   jschauma
    Date:           Fri Aug  5 01:44:00 UTC 2005

    Modified Files:
            pkgsrc/net/tor: Makefile distinfo

    Log Message:
    Update to 0.1.0.13:
    - Fix a critical bug in the security of our crypto handshakes.
    - Fix a size_t underflow in smartlist_join_strings2() that made
      it do bad things when you hand it an empty smartlist.
    - Fix Windows installer to ship Tor license (thanks to Aphex for
      pointing out this oversight) and put a link to the doc directory
      in the start menu.
    - Explicitly set no-unaligned-access for sparc: it turns out the
      new gcc's let you compile broken code, but that doesn't make it
      not-broken
----
    Module Name:    pkgsrc
    Committed By:   drochner
    Date:           Tue Aug  9 09:01:08 UTC 2005

    Modified Files:
            pkgsrc/net/tor: Makefile distinfo

    Log Message:
    update to tor-0.1.0.14
    Tor 0.1.0.14 fixes the second half of an important bug in the security of
    our crypto handshakes. This time for sure. :) All clients should upgrade.

      o Bugfixes on 0.1.0.x:
        - Fix the other half of the bug with crypto handshakes.
        - Fix an assert trigger if you send a 'signal term' via the
          controller when it's listening for 'event info' messages.

diffstat:

 net/tor/MESSAGE          |   6 +++++-
 net/tor/Makefile         |  13 ++++++++-----
 net/tor/distinfo         |  11 ++++++-----
 net/tor/patches/patch-ac |  10 +++++-----
 net/tor/patches/patch-ad |  13 +++++++++++++
 5 files changed, 37 insertions(+), 16 deletions(-)

diffs (107 lines):

diff -r 59bd1f4cca9c -r 870e904b79dc net/tor/MESSAGE
--- a/net/tor/MESSAGE   Tue Aug 09 16:11:37 2005 +0000
+++ b/net/tor/MESSAGE   Tue Aug 09 16:18:32 2005 +0000
@@ -1,9 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2005/02/13 20:27:53 jschauma Exp $
+$NetBSD: MESSAGE,v 1.1.4.1 2005/08/09 16:18:32 snj 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 -r 59bd1f4cca9c -r 870e904b79dc net/tor/Makefile
--- a/net/tor/Makefile  Tue Aug 09 16:11:37 2005 +0000
+++ b/net/tor/Makefile  Tue Aug 09 16:18:32 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/22 15:53:24 salo Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2005/08/09 16:18:32 snj Exp $
 #
 
-DISTNAME=              tor-0.0.9.10
+DISTNAME=              tor-0.1.0.14
 CATEGORIES=            net security
 MASTER_SITES=          http://tor.eff.org/dist/
 
@@ -9,8 +9,6 @@
 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 @@
        ${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 -r 59bd1f4cca9c -r 870e904b79dc net/tor/distinfo
--- a/net/tor/distinfo  Tue Aug 09 16:11:37 2005 +0000
+++ b/net/tor/distinfo  Tue Aug 09 16:18:32 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/06/22 15:53:24 salo Exp $
+$NetBSD: distinfo,v 1.10.2.1 2005/08/09 16:18:32 snj 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.14.tar.gz) = 1701eef4de23606b844f71cd2acb09f834b1c391
+RMD160 (tor-0.1.0.14.tar.gz) = c9e0728c123b5f4f0131528f6cde9de473153be6
+Size (tor-0.1.0.14.tar.gz) = 631723 bytes
+SHA1 (patch-ac) = 56236bb89dc5975beaf24513218acbba39f9fa82
+SHA1 (patch-ad) = b70a2d675349ecb815de27ad4c67c195ed79e658
diff -r 59bd1f4cca9c -r 870e904b79dc net/tor/patches/patch-ac
--- a/net/tor/patches/patch-ac  Tue Aug 09 16:11:37 2005 +0000
+++ b/net/tor/patches/patch-ac  Tue Aug 09 16:18:32 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2005/02/13 20:27:54 jschauma Exp $
+$NetBSD: patch-ac,v 1.1.4.1 2005/08/09 16:18:32 snj 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 -r 59bd1f4cca9c -r 870e904b79dc net/tor/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tor/patches/patch-ad  Tue Aug 09 16:18:32 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.2.2 2005/08/09 16:18:32 snj 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