<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e17eb714c6004de2c5ac5f6c915c7bd08dc5301">https://github.com/macports/macports-ports/commit/9e17eb714c6004de2c5ac5f6c915c7bd08dc5301</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 9e17eb714c6 mariadb-10.{5,6,7}: Use openssl PG, pinned to version 1.1 Closes: https://trac.macports.org/ticket/63984
</span>9e17eb714c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e17eb714c6004de2c5ac5f6c915c7bd08dc5301
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Nov 17 16:39:20 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.{5,6,7}: Use openssl PG, pinned to version 1.1
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63984
</span>---
databases/mariadb-10.5/Portfile | 20 ++++++++++++++++++--
databases/mariadb-10.6/Portfile | 20 ++++++++++++++++++--
databases/mariadb-10.7/Portfile | 20 ++++++++++++++++++--
3 files changed, 54 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a8394b6b98..93815408255 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ set version_branch [join [lrange [split ${version} .] 0 1] .]
</span> # Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 1
</span> set revision_server 0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +25,26 @@ if {$subport eq $name} {
</span> PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span>
boost.version 1.71
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Not ready for openssl3 yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/63984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build configuration will incorrectly find and use the openssl shim port headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which are in the primary prefix, in preference to the openssl11 ones, due to a bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the order that the compilation include paths are listed. i.e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I/opt/local/libexec/openssl11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # must come before any instance of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Until the build configuration is fixed to avoid this (or the port is updated to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compatible with openssl3) declare a build conflict against the openssl shim port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://trac.macports.org/ticket/60805
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +185,7 @@ if {$subport eq $name} {
</span>
depends_build-append port:bison
depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span> port:pcre2
depends_run-append port:mysql_select
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/Portfile b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8173da17bb7..a3ec3f4046c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ set version_branch [join [lrange [split ${version} .] 0 1] .]
</span> # Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 1
</span> set revision_server 0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +25,26 @@ if {$subport eq $name} {
</span> PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span>
boost.version 1.71
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Not ready for openssl3 yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/63984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build configuration will incorrectly find and use the openssl shim port headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which are in the primary prefix, in preference to the openssl11 ones, due to a bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the order that the compilation include paths are listed. i.e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I/opt/local/libexec/openssl11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # must come before any instance of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Until the build configuration is fixed to avoid this (or the port is updated to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compatible with openssl3) declare a build conflict against the openssl shim port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://trac.macports.org/ticket/60805
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +185,7 @@ if {$subport eq $name} {
</span>
depends_build-append port:bison
depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span> port:pcre2
depends_run-append port:mysql_select
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.7/Portfile b/databases/mariadb-10.7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18a5c96b956..e9bf6356621 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ set version_branch [join [lrange [split ${version} .] 0 1] .]
</span> # Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 1
</span> set revision_server 0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +25,26 @@ if {$subport eq $name} {
</span> PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span>
boost.version 1.71
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Not ready for openssl3 yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/63984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build configuration will incorrectly find and use the openssl shim port headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which are in the primary prefix, in preference to the openssl11 ones, due to a bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the order that the compilation include paths are listed. i.e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I/opt/local/libexec/openssl11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # must come before any instance of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Until the build configuration is fixed to avoid this (or the port is updated to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compatible with openssl3) declare a build conflict against the openssl shim port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://trac.macports.org/ticket/60805
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +185,7 @@ if {$subport eq $name} {
</span>
depends_build-append port:bison
depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span> port:pcre2
depends_run-append port:mysql_select
</pre><pre style='margin:0'>
</pre>