<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5cf6da2bf95edba5bed039b1b2a1c2aed02c1a19">https://github.com/macports/macports-ports/commit/5cf6da2bf95edba5bed039b1b2a1c2aed02c1a19</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 5cf6da2bf95 mbedtls3: backport upstream fix for builds on < 10.13
</span>5cf6da2bf95 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5cf6da2bf95edba5bed039b1b2a1c2aed02c1a19
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Apr 10 14:49:39 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> mbedtls3: backport upstream fix for builds on < 10.13
</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/69624
</span>---
devel/mbedtls3/Portfile | 3 ++
...ation-of-ssl_tls13_generic.c-when-memcpy-i.diff | 42 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mbedtls3/Portfile b/devel/mbedtls3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ffeaa81bcb..27db45f048a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mbedtls3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mbedtls3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +58,9 @@ depends_build-append \
</span>
patchfiles patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/Mbed-TLS/mbedtls/commit/a2c45dc713b842906fbd8361692d4513d1a3e41b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Fix-compilation-of-ssl_tls13_generic.c-when-memcpy-i.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # library/bignum.c:1435:9: error: cannot compile this unexpected cast lvalue yet
# For related discussion see https://trac.macports.org/ticket/62185
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mbedtls3/files/patch-Fix-compilation-of-ssl_tls13_generic.c-when-memcpy-i.diff b/devel/mbedtls3/files/patch-Fix-compilation-of-ssl_tls13_generic.c-when-memcpy-i.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..46db3bfc940
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mbedtls3/files/patch-Fix-compilation-of-ssl_tls13_generic.c-when-memcpy-i.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From eb0a349fa0da00eee9556ae02e5e69958d4b9d50 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tom Cosgrove <tom.cosgrove@arm.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 2 Apr 2024 14:26:13 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation of ssl_tls13_generic.c when memcpy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is a function-like macro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #8994
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../fix-compilation-when-memcpy-is-function-like-macro.txt | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ library/ssl_tls13_generic.c | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 6 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 ChangeLog.d/fix-compilation-when-memcpy-is-function-like-macro.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ChangeLog.d/fix-compilation-when-memcpy-is-function-like-macro.txt ChangeLog.d/fix-compilation-when-memcpy-is-function-like-macro.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000..11e7d2539
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ChangeLog.d/fix-compilation-when-memcpy-is-function-like-macro.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Bugfix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Fix compilation error when memcpy() is a function-like macros. Fixes #8994.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git library/ssl_tls13_generic.c library/ssl_tls13_generic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d448a054a..3be6db78f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- library/ssl_tls13_generic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ library/ssl_tls13_generic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,10 +193,12 @@ static void ssl_tls13_create_verify_structure(const unsigned char *transcript_ha
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idx = 64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (from == MBEDTLS_SSL_IS_CLIENT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memcpy(verify_buffer + idx, MBEDTLS_SSL_TLS1_3_LBL_WITH_LEN(client_cv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memcpy(verify_buffer + idx, mbedtls_ssl_tls13_labels.client_cv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MBEDTLS_SSL_TLS1_3_LBL_LEN(client_cv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idx += MBEDTLS_SSL_TLS1_3_LBL_LEN(client_cv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else { /* from == MBEDTLS_SSL_IS_SERVER */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memcpy(verify_buffer + idx, MBEDTLS_SSL_TLS1_3_LBL_WITH_LEN(server_cv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memcpy(verify_buffer + idx, mbedtls_ssl_tls13_labels.server_cv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MBEDTLS_SSL_TLS1_3_LBL_LEN(server_cv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idx += MBEDTLS_SSL_TLS1_3_LBL_LEN(server_cv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>