<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/c8ce7b1a42cf608e1e5c7d157e044f71ec49dba3">https://github.com/macports/macports-ports/commit/c8ce7b1a42cf608e1e5c7d157e044f71ec49dba3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c8ce7b1a42cf608e1e5c7d157e044f71ec49dba3
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Apr 8 17:10:10 2025 +0200
<span style='display:block; white-space:pre;color:#404040;'> openssl3: Add dir for providers to self-enable on install
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move the legacy variant to use that mechanism instead so we don't have
</span><span style='display:block; white-space:pre;color:#404040;'> to edit the openssl.cnf file from the Portfile but instead can just
</span><span style='display:block; white-space:pre;color:#404040;'> install a single file.
</span>---
devel/openssl3/Portfile | 25 ++++++++++++-------------
devel/openssl3/files/legacy.cnf | 15 +++++++++++++++
2 files changed, 27 insertions(+), 13 deletions(-)
<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 dbd3c4e8656..fd901d5b352 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;'>@@ -169,6 +169,9 @@ pre-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${my_prefix}/etc/openssl/openssl.cnf.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Create some links to main prefix
xinstall -d ${destroot}${prefix}/include/${my_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,6 +187,14 @@ post-destroot {
</span> move ${destroot}${prefix}/share/man ${destroot}/${my_prefix}/share/
# Create link to certs from curl-ca-bundle in install prefix
ln -s ${prefix}/share/curl/curl-ca-bundle.crt ${destroot}${my_prefix}/etc/openssl/cert.pem
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${my_prefix}/etc/openssl/openssl.cnf.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cnf [open ${destroot}${my_prefix}/etc/openssl/openssl.cnf a]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $cnf ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $cnf "# Provide a path for providers and other configuration snippets to drop in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $cnf ".include ${my_prefix}/etc/openssl/openssl.cnf.d/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $cnf
</span> }
destroot.args MANDIR=${prefix}/share/man MANSUFFIX=ssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,19 +217,7 @@ variant tests description {enable tests} {
</span> variant legacy description {enable legacy providers by default} {
# See https://trac.macports.org/ticket/63857 for context
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cnf [open ${destroot}${my_prefix}/etc/openssl/openssl.cnf a]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "# MacPorts additions to enable legacy providers by default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "\[openssl_init\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "providers = provider_sect"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "\[provider_sect\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "default = default_sect"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "legacy = legacy_sect"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "\[default_sect\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "activate = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "\[legacy_sect\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${cnf} "activate = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${cnf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${filespath}/legacy.cnf ${destroot}${my_prefix}/etc/openssl/openssl.cnf.d/legacy.cnf
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/files/legacy.cnf b/devel/openssl3/files/legacy.cnf
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9c88417c0b8
</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/legacy.cnf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# vim:ft=conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts additions to enable legacy providers by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[openssl_init]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+providers = provider_sect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[provider_sect]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default = default_sect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacy = legacy_sect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[default_sect]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+activate = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[legacy_sect]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+activate = 1
</span></pre><pre style='margin:0'>
</pre>