<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9498466bafea59f05aca70209c52ea111b2bcc0f">https://github.com/macports/macports-ports/commit/9498466bafea59f05aca70209c52ea111b2bcc0f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9498466bafe tor: update to 0.4.6.8
</span>9498466bafe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9498466bafea59f05aca70209c52ea111b2bcc0f
</span>Author: Knapoc <Knapoc@users.noreply.github.com>
AuthorDate: Mon Nov 8 13:09:51 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> tor: update to 0.4.6.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63856
</span>---
security/tor/Portfile | 10 +++----
security/tor/files/patch-tortls_openssl3.diff | 40 ---------------------------
2 files changed, 4 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tor/Portfile b/security/tor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ec0a8bc3bf..0870ba2e8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name tor
conflicts tor-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.6.8
</span> revision 0
categories security
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,9 @@ long_description Tor provides a distributed network of servers \
</span> homepage https://www.torproject.org/
master_sites https://dist.torproject.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d24b654b6f695b43bad4c12d68b3d43ae8b23fa1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4cad1638d22d47f4877da44f85d655205a069464a02d2f2a2d20f08756cb7547 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7699461
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-tortls_openssl3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a2f2b14b2edbc0cd2e0c6bd8ce9996da298e103c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7796485
</span>
depends_lib port:libevent \
path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tor/files/patch-tortls_openssl3.diff b/security/tor/files/patch-tortls_openssl3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7ded6f9031..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tor/files/patch-tortls_openssl3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patch for building with openssl v3, merged by upstream:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/390//diffs#85a4a627d1a37ca52d261a256f8b55dcb8294b31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/tls/tortls_nss.c.orig 2021-11-08 09:21:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/tls/tortls_nss.c 2021-11-08 09:21:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -646,13 +646,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We don't support renegotiation with NSS. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tor_assert(tls);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* We don't support renegotiation with NSS. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tor_tls_get_pending_bytes(tor_tls_t *tls)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/tls/tortls_openssl.c.orig 2021-11-08 09:22:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/tls/tortls_openssl.c 2021-11-08 09:21:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1190,19 +1190,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/** Assert that the flags that allow legacy renegotiation are still set */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION != 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long options = SSL_get_options(tls->ssl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tor_assert(0 != (options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) tls;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* defined(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && ... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Tell the TLS library that the underlying socket for <b>tls</b> has been
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * closed, and the library should not attempt to free that socket itself.
</span></pre><pre style='margin:0'>
</pre>