<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61458ba68cd4e66f4a1e813c3a621e0d680bf170">https://github.com/macports/macports-ports/commit/61458ba68cd4e66f4a1e813c3a621e0d680bf170</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 61458ba68cd mariadb-10.7: update to 10.7.7
</span>61458ba68cd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 61458ba68cd4e66f4a1e813c3a621e0d680bf170
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Nov 21 12:01:58 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.7: update to 10.7.7
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    OpenSSL 3 now supported; ref: https://trac.macports.org/ticket/65719
</span><span style='display:block; white-space:pre;color:#404040;'>    Add temporary fix for C/C++ flag discovery
</span>---
 databases/mariadb-10.7/Portfile                    | 31 +++++++++++-----------
 .../mariadb-10.7/files/patch-CMakeLists.txt.diff   |  2 +-
 .../files/patch-fix-flag-discovery.diff            | 31 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 16 deletions(-)

<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 e074750a648..a638244beb4 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;'>@@ -7,7 +7,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span> 
 name                mariadb-10.7
 set name_mysql      ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             10.7.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.7.7
</span> set version_branch  [join [lrange [split ${version} .] 0 1] .]
 # Please set revision_client and revision_server to 0 if you bump
 # version; these can be changed independently for the 2 subports, but
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,7 @@ if {$subport eq $name} {
</span>     boost.version       1.78
     compiler.cxx_standard 2011
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Not ready for openssl3 yet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # https://trac.macports.org/ticket/63984
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    openssl.branch      1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    openssl.branch      3
</span> 
     # build configuration will incorrectly find and use the openssl shim port headers
     # which are in the primary prefix, in preference to the openssl11 ones, due to a bug
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +68,7 @@ if {$subport eq $name} {
</span> 
     set libmariadb_github_author  MariaDB
     set libmariadb_github_project mariadb-connector-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set libmariadb_github_branch  a6665e65c05c00f9df983a0f788a643ca7bc084c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set libmariadb_github_branch  72b40bfaa869f3fe84242471dda989d13983d84c
</span> 
     set wsrep_github_author  codership
     set wsrep_github_project wsrep-lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +80,7 @@ if {$subport eq $name} {
</span> 
     set columnstore_github_author   mariadb-corporation
     set columnstore_github_project  mariadb-columnstore-engine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set columnstore_github_branch   ac0741e82d71ea8faf6865c4c6604f02449cfa27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set columnstore_github_branch   5923beeab9397aa22563ff7b1f0f31ad8054bae6
</span> 
     set libmarias3_github_author   mariadb-corporation
     set libmarias3_github_project  libmarias3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,13 +119,13 @@ if {$subport eq $name} {
</span>                  https://github.com/${libmarias3_github_author}/${libmarias3_github_project}/archive/${libmarias3_github_branch}:tagsix
 
     checksums       ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  7f5518584139e257281b78a9ca1867801c7bb573 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  8e4d793bb7447ab020bcdc0121b32121a6f64cd2044f19ed2b909c6ba9e610a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    49471913 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  b3a24cbe361fbdb750b4bb683efb63fb66227327 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  1dd7278b81d97abfa8af69deb71de5eabff184df64fc8e245ef30f640b4be6bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    49666569 \
</span>                     ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  d3ab517e1a28a65d6f5db2d81f8907e08318cf72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  927bb23a31c8aa91f8a5359b831e40b0d430d6e14bd12f013bffc9787a2beb60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1395579 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  b3e5ce0c22b07cecd9b20ab2ab14903435d2ed45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  a2ebea87faa562fef788c1e698e9173e4d5060d60f64ccfaae4eeb57611a6deb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1400692 \
</span>                     ${wsrep_distfile} \
                     rmd160  f5c1f52a07dcccd4babb0e4da5ddca52cd78c8e7 \
                     sha256  8a64fbb42a76c9839e2aaf43ebeb143f39c2842874084b7f1f7ba1f842b7d052 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,9 +135,9 @@ if {$subport eq $name} {
</span>                     sha256  99960eb0ccb4dff5eb354289b0a8ec2ecb0dcc246f54edf292f69f340a916ee4 \
                     size    91283 \
                     ${columnstore_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  09def08a8981cc0ec12a6a364ea2a8aaebb30f50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  18cea28091600fd6edff55d75faf166aeed4a23c0eb576c8229ea0ffa836b234 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    14487598 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  2233d80b32eb76c61f46d8f7341a5de1f746fb08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  16b2c1081c3e4d913d8757756bef47631f694b7a3d59b55c888768672c2059e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    14489747 \
</span>                     ${libmarias3_distfile} \
                     rmd160  bf90ab4856c1fec9272309134837f1f50fdb8de8 \
                     sha256  0c9ce4cc300bfefcb9dd188a46d736c0e119210c01cbfb04725b07f5330be679 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,6 +211,9 @@ if {$subport eq $name} {
</span>                    patch-cmake_mysql_version.cmake.diff \
                    patch-cmake_mysql_columnstore_version.cmake.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary fix for C/C++ flag discovery
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-flag-discovery.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
             ${worksrcpath}/cmake/install_layout.cmake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.7/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.7/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5747b95bb51..d8c2168e7c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.7/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.7/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span>  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
    ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,6 +287,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,6 +289,9 @@
</span>  ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
    MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
  ENDIF()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.7/files/patch-fix-flag-discovery.diff b/databases/mariadb-10.7/files/patch-fix-flag-discovery.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ae9320cfc5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.7/files/patch-fix-flag-discovery.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/check_compiler_flag.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/check_compiler_flag.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@ SET(ENV{LANG} C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO (MY_CHECK_C_COMPILER_FLAG flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   STRING(REGEX REPLACE "[-,= +]" "_" result "have_C_${flag}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag} -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${result}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ${fail_patterns})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@ ENDMACRO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO (MY_CHECK_CXX_COMPILER_FLAG flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   STRING(REGEX REPLACE "[-,= +]" "_" result "have_CXX_${flag}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag} -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${result}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ${fail_patterns})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/plugins/auth/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/plugins/auth/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,7 @@ IF(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   IF(GSSAPI_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    CHECK_C_COMPILER_FLAG(-Wl,--as-needed have_C__Wl___as_needed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    MY_CHECK_C_COMPILER_FLAG(-Wl,--as-needed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SET(GSSAPI_LIBS secur32)
</span></pre><pre style='margin:0'>

</pre>