diff options
| author | drochner <drochner@pkgsrc.org> | 2014-06-25 13:08:37 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2014-06-25 13:08:37 +0000 |
| commit | 24d9375df7144ae41ee619d031c83779d0da2678 (patch) | |
| tree | 05c1722452273d1df3a514e6b48bbdd0afa7f95b /net | |
| parent | b94c547bf2d712269ccd8527ea66a25ec131dd5d (diff) | |
| download | pkgsrc-24d9375df7144ae41ee619d031c83779d0da2678.tar.gz | |
minor cleanup
(The options need work too, after the freeze.)
Diffstat (limited to 'net')
| -rw-r--r-- | net/tor/MESSAGE | 6 | ||||
| -rw-r--r-- | net/tor/distinfo | 4 | ||||
| -rw-r--r-- | net/tor/options.mk | 3 | ||||
| -rw-r--r-- | net/tor/patches/patch-aa | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/net/tor/MESSAGE b/net/tor/MESSAGE index b5cae4c9e38..4ee3c5d7adc 100644 --- a/net/tor/MESSAGE +++ b/net/tor/MESSAGE @@ -1,11 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.7 2013/01/30 22:09:22 riastradh Exp $ +$NetBSD: MESSAGE,v 1.8 2014/06/25 13:08:37 drochner Exp $ Please note that the only way the Tor Project recommends browsing the web through Tor is the Tor Browser, which is currently not packaged in pkgsrc. See <https://www.torproject.org/projects/torbrowser.html.en>. - -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. =========================================================================== diff --git a/net/tor/distinfo b/net/tor/distinfo index 8a7867e2004..59fd5136c8e 100644 --- a/net/tor/distinfo +++ b/net/tor/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.58 2014/06/07 09:11:36 wiz Exp $ +$NetBSD: distinfo,v 1.59 2014/06/25 13:08:37 drochner Exp $ 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 +SHA1 (patch-aa) = ac774cb976e03ff4d38415e78720f2f463c210c8 diff --git a/net/tor/options.mk b/net/tor/options.mk index ac551a5baa6..d8469f627c8 100644 --- a/net/tor/options.mk +++ b/net/tor/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2014/06/07 09:11:36 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2014/06/25 13:08:37 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tor PKG_SUPPORTED_OPTIONS= threads doc @@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --disable-asciidoc ### I don't trust configure scripts to do this properly on all platforms. ### .if !empty(PKG_OPTIONS:Mthreads) -CONFIGURE_ARGS+= --enable-eventdns CONFIGURE_ARGS+= --enable-threads PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes diff --git a/net/tor/patches/patch-aa b/net/tor/patches/patch-aa index 9b41144e08c..42da59dfbbb 100644 --- a/net/tor/patches/patch-aa +++ b/net/tor/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 2014/06/07 09:11:36 wiz Exp $ +$NetBSD: patch-aa,v 1.10 2014/06/25 13:08:37 drochner Exp $ From: Taylor R Campbell Subject: patch for Tor to workaround OpenSSL renegotiation lossage on 5.1 @@ -30,7 +30,7 @@ ssl.h) so that this patch would be unnecessary. + /* In NetBSD 5.1, OpenSSL 0.9.9-dev was imported and `fixed' to use + the same scheme as 0.9.8l. */ + if (version == OPENSSL_V_NOPATCH(0,9,9)) { -+ log_notice(LD_GENERAL, "OpenSSL %s on NetBSD looks like version 0.9.8l; " ++ log_info(LD_GENERAL, "OpenSSL %s on NetBSD looks like version 0.9.8l; " + "I will try SSL3_FLAGS and SSL_OP to enable renegotation.", + SSLeay_version(SSLEAY_VERSION)); + use_unsafe_renegotiation_flag = 1; |