Update to 0.2.4.22, based on the wip version by athaba and myself.

Very many changes since the last stable version in pkgsrc, upgrade!

5 files changed, 30 insertions, 24 deletions

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 58fc457c8cd..d8d3d3869ee 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2014/02/12 23:18:26 tron Exp $
+# $NetBSD: Makefile,v 1.98 2014/06/07 09:11:36 wiz Exp $
 
-DISTNAME=		tor-0.2.3.25
-PKGREVISION=		4
+DISTNAME=		tor-0.2.4.22
 CATEGORIES=		net security
 MASTER_SITES=		http://www.torproject.org/dist/
 
@@ -13,10 +12,6 @@ LICENSE=		modified-bsd
 .include "../../mk/bsd.prefs.mk"
 
 USE_LANGUAGES=		c99
-# tor is not documented to require GNU make, but it fails to build on
-# NetBSD 5.1 with (system) BSD make.  Reported to
-# tor-talk@lists.torproject.org on 20110907.
-USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
@@ -45,8 +40,6 @@ OWN_DIRS_PERMS+=	${PKG_HOME.${TOR_USER}} ${USER_GROUP} 0700
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
-CONF_FILES+=		${PREFIX}/share/examples/tor/tor-tsocks.conf 	\
-				${PKG_SYSCONFDIR}/tor-tsocks.conf
 CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample 	\
 				${PKG_SYSCONFDIR}/torrc
 
@@ -67,7 +60,6 @@ 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 2617c32ff3b..cae0314c7b0 100644
--- a/net/tor/PLIST
+++ b/net/tor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:05:11 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/06/07 09:11:36 wiz Exp $
 bin/tor
 bin/tor-gencert
 bin/tor-resolve
@@ -11,6 +11,7 @@ share/doc/tor/tor-gencert.html
 share/doc/tor/tor-resolve.html
 share/doc/tor/tor.html
 share/doc/tor/torify.html
-share/examples/tor/tor-tsocks.conf
+share/examples/rc.d/tor
 share/examples/tor/torrc.sample
 share/tor/geoip
+share/tor/geoip6
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 7b4774dd1df..8a7867e2004 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.57 2012/11/26 19:00:20 drochner Exp $
+$NetBSD: distinfo,v 1.58 2014/06/07 09:11:36 wiz Exp $
 
-SHA1 (tor-0.2.3.25.tar.gz) = ef02e5b0eb44ab1a5d6108c39bd4e28918de79dc
-RMD160 (tor-0.2.3.25.tar.gz) = d8c90343346bc447191616f86da2591a64100b51
-Size (tor-0.2.3.25.tar.gz) = 3190011 bytes
-SHA1 (patch-aa) = 9f65234c7f1c9ea4eba37aa7287f5496993d2dc1
+SHA1 (tor-0.2.4.22.tar.gz) = 42349e02c3f6db4e6f2cc52b8a61ea91761ac4d6
+RMD160 (tor-0.2.4.22.tar.gz) = de2ba568a182f5866cbfa00bc11f335bd8c88aba
+Size (tor-0.2.4.22.tar.gz) = 2908812 bytes
+SHA1 (patch-aa) = d9ab8c5ff802fa7d50f7cb4d14dcf931a9290bc4
diff --git a/net/tor/options.mk b/net/tor/options.mk
index ff4fdfb6b89..ac551a5baa6 100644
--- a/net/tor/options.mk
+++ b/net/tor/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2009/08/18 05:48:08 obache Exp $
+# $NetBSD: options.mk,v 1.5 2014/06/07 09:11:36 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tor
-PKG_SUPPORTED_OPTIONS=	threads
+PKG_SUPPORTED_OPTIONS=	threads doc
+PKG_SUGGESTED_OPTIONS+=	doc
 
 .if !empty(PTHREAD_TYPE:Mnative)
 PKG_SUGGESTED_OPTIONS+=	threads
@@ -10,6 +11,19 @@ PKG_SUGGESTED_OPTIONS+=	threads
 .include "../../mk/bsd.options.mk"
 
 ###
+### This enables the build of manual pages. It requires asciidoc
+### at build time, which comes with a tail of dependencies and
+### may not be wanted under certain circumstances.
+###
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+=		asciidoc>=8.3.3:../../textproc/asciidoc
+CONFIGURE_ARGS+=	--enable-asciidoc
+.else
+CONFIGURE_ARGS+=	--disable-asciidoc
+.endif
+
+
+###
 ### This enables new code for threaded operation on NetBSD, OpenBSD, etc.
 ### I used {PTHREAD,RESOLV}_AUTO_VARS here for consistency's sake, as
 ### I don't trust configure scripts to do this properly on all platforms.
@@ -19,7 +33,6 @@ CONFIGURE_ARGS+=	--enable-eventdns
 CONFIGURE_ARGS+=	--enable-threads
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
-USE_FEATURES.openssl+=	threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
diff --git a/net/tor/patches/patch-aa b/net/tor/patches/patch-aa
index 24160b57e95..9b41144e08c 100644
--- a/net/tor/patches/patch-aa
+++ b/net/tor/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2012/11/26 19:00:20 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2014/06/07 09:11:36 wiz Exp $
 
 From: Taylor R Campbell
 Subject: patch for Tor to workaround OpenSSL renegotiation lossage on 5.1
@@ -20,9 +20,9 @@ put into NetBSD 5.1 (and SSL_OP_ALLOW_UNSAFE_RENEGOTIATION defined in
 ssl.h) so that this patch would be unnecessary.
 [2. text/plain; nbsd51-reneg]
 
---- src/common/tortls.c.orig	2012-11-19 21:24:54.000000000 +0000
+--- src/common/tortls.c.orig	2014-05-08 03:20:58.000000000 +0000
 +++ src/common/tortls.c
-@@ -477,6 +477,17 @@ tor_tls_init(void)
+@@ -487,6 +487,17 @@ tor_tls_init(void)
       * program should be allowed to use renegotiation unless it first passed
       * a test of intelligence and determination.
       */
@@ -38,5 +38,5 @@ ssl.h) so that this patch would be unnecessary.
 +    } else
 +#endif
      if (version > OPENSSL_V(0,9,8,'k') && version <= OPENSSL_V(0,9,8,'l')) {
-       log_notice(LD_GENERAL, "OpenSSL %s looks like version 0.9.8l, but "
+       log_info(LD_GENERAL, "OpenSSL %s looks like version 0.9.8l, but "
                   "some vendors have backported renegotiation code from "