From 57ac3c053b156ab04cdf2ef6c40a032364c911e0 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 6 Sep 2011 19:34:01 +0000 Subject: update to 0.2.2.32 Tor 0.2.2.32, the first stable release in the 0.2.2 branch, is finally ready. More than two years in the making, this release features improved client performance and hidden service reliability, better compatibility for Android, correct behavior for bridges that listen on more than one address, more extensible and flexible directory object handling, better reporting of network statistics, improved code security, and many many other features and bugfixes. --- net/tor/Makefile | 6 ++++-- net/tor/PLIST | 6 +++++- net/tor/distinfo | 10 +++++----- net/tor/patches/patch-aa | 6 +++--- 4 files changed, 17 insertions(+), 11 deletions(-) (limited to 'net/tor') diff --git a/net/tor/Makefile b/net/tor/Makefile index 572c3f34bd5..1524bc53859 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.79 2011/03/09 10:03:06 drochner Exp $ +# $NetBSD: Makefile,v 1.80 2011/09/06 19:34:01 drochner Exp $ # -DISTNAME= tor-0.2.1.30 +DISTNAME= tor-0.2.2.32 CATEGORIES= net security MASTER_SITES= http://www.torproject.org/dist/ +FETCH_USING= curl MAINTAINER= athaba@users.sourceforge.net HOMEPAGE= http://www.torproject.org/ @@ -58,6 +59,7 @@ CHECK_PORTABILITY_SKIP+=contrib/* CFLAGS+= -c99 .endif +BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2 .include "../../devel/libevent/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/net/tor/PLIST b/net/tor/PLIST index 3a5d8454274..a502ab56480 100644 --- a/net/tor/PLIST +++ b/net/tor/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2009/08/18 05:48:08 obache Exp $ +@comment $NetBSD: PLIST,v 1.10 2011/09/06 19:34:01 drochner Exp $ bin/tor bin/tor-gencert bin/tor-resolve @@ -7,6 +7,10 @@ man/man1/tor-gencert.1 man/man1/tor-resolve.1 man/man1/tor.1 man/man1/torify.1 +share/doc/tor/tor-gencert.html +share/doc/tor/tor-resolve.html +share/doc/tor/tor.html +share/doc/tor/torify.html share/examples/rc.d/tor share/examples/tor/tor-tsocks.conf share/examples/tor/torrc.sample diff --git a/net/tor/distinfo b/net/tor/distinfo index 546c235ccda..b96c41fc9a5 100644 --- a/net/tor/distinfo +++ b/net/tor/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.48 2011/03/09 10:03:06 drochner Exp $ +$NetBSD: distinfo,v 1.49 2011/09/06 19:34:01 drochner Exp $ -SHA1 (tor-0.2.1.30.tar.gz) = f25b89d8c677c83ee0559036d5b13d49b272b3b0 -RMD160 (tor-0.2.1.30.tar.gz) = 05e4a1443a5494982ef78dc61a088da26a09e9cf -Size (tor-0.2.1.30.tar.gz) = 2447447 bytes -SHA1 (patch-aa) = 5ee3e4c23b23b1b1f203be9ed5fdd3104ecc1804 +SHA1 (tor-0.2.2.32.tar.gz) = 4baddc836931b3e915974c261e405e111636b716 +RMD160 (tor-0.2.2.32.tar.gz) = 649c21f7ec89e34774c79db6544b612f0895bb61 +Size (tor-0.2.2.32.tar.gz) = 2701371 bytes +SHA1 (patch-aa) = 5b89228dc37c459c48f24616933a5673a5a0a0d1 diff --git a/net/tor/patches/patch-aa b/net/tor/patches/patch-aa index e4fdf8b0a5e..bfa9c6fbd4f 100644 --- a/net/tor/patches/patch-aa +++ b/net/tor/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2010/08/02 07:06:04 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2011/09/06 19:34:01 drochner Exp $ From: Taylor R Campbell Subject: patch for Tor to workaround OpenSSL renegotiation lossage on 5.1 @@ -23,8 +23,8 @@ ssl.h) so that this patch would be unnecessary. --- ./src/common/tortls.c.~1~ 2010-05-02 22:02:50.000000000 +0000 +++ ./src/common/tortls.c 2010-07-30 00:34:00.000000000 +0000 @@ -356,6 +356,17 @@ - * program should be allowed to use renegotiation its first passed an - * test of intelligence and determination. + * program should be allowed to use renegotiation unless it first passed + * a test of intelligence and determination. */ +#ifdef __NetBSD__ + /* In NetBSD 5.1, OpenSSL 0.9.9-dev was imported and `fixed' to use -- cgit v1.2.3