<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e88c9f796f8f00b621ca9e43a63f080830c9d0db">https://github.com/macports/macports-ports/commit/e88c9f796f8f00b621ca9e43a63f080830c9d0db</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 e88c9f796f8 openssl3: Fix no_cache issue w/3rd party providers
</span>e88c9f796f8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e88c9f796f8f00b621ca9e43a63f080830c9d0db
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Wed Jan 8 10:40:04 2025 +0100

<span style='display:block; white-space:pre;color:#404040;'>    openssl3: Fix no_cache issue w/3rd party providers
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This fixes using an algorithm from the legacy provider while the
</span><span style='display:block; white-space:pre;color:#404040;'>    pkcs11-provider is active.
</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/71760
</span>---
 devel/openssl3/Portfile                            |  6 +++-
 .../5549fcd4783cb6c2a7f07e74505a2eea4939e5b1.patch | 32 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/Portfile b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b2e52f658d..800115e8287 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ set major_v         3
</span> epoch               1
 github.setup        openssl openssl ${major_v}.4.0 openssl-
 name                openssl3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 github.tarball_from releases
 checksums           rmd160  d300c74dce877d7099bd59fa82d8f0691f13cc97 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +94,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 18 && ${os.major} > 8} {
</span> #
 patchfiles-append   patch-use-timegm.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Backport fix for negative caching issue with 3rd party providers, see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/71760
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   5549fcd4783cb6c2a7f07e74505a2eea4939e5b1.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
     # Having the stdlib set to libc++ on 10.6 causes a dependency on a
     # macports-clang compiler to be added, which would be a dep cycle.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/files/5549fcd4783cb6c2a7f07e74505a2eea4939e5b1.patch b/devel/openssl3/files/5549fcd4783cb6c2a7f07e74505a2eea4939e5b1.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bba85601a3a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl3/files/5549fcd4783cb6c2a7f07e74505a2eea4939e5b1.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5549fcd4783cb6c2a7f07e74505a2eea4939e5b1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Dmitry Belyavskiy <beldmit@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 18 Dec 2024 21:28:14 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Take into account no_store when pushing algorithm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When we put algorithm to the store, we have a fallback to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OSSL_LIB_CTX level store when store is NULL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Matt Caswell <matt@openssl.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Tomas Mraz <tomas@openssl.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Merged from https://github.com/openssl/openssl/pull/26197)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit b3bb214720f20f3b126ae4b9c330e9a48b835415)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport [https://github.com/openssl/openssl/commit/5549fcd4783cb6c2a7f07e74505a2eea4939e5b1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crypto/core_fetch.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/crypto/core_fetch.c b/crypto/core_fetch.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d311158d77589..70715e7d6a99c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./crypto/core_fetch.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./crypto/core_fetch.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@ static void ossl_method_construct_this(OSSL_PROVIDER *provider,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      * It is *expected* that the put function increments the refcnt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      * of the passed method.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    data->mcm->put(data->store, method, provider, algo->algorithm_names,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    data->mcm->put(no_store ? data->store : NULL, method, provider, algo->algorithm_names,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    algo->property_definition, data->mcm_data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     /* refcnt-- because we're dropping the reference */
</span></pre><pre style='margin:0'>

</pre>