<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/ff6b42e292207aeaab4a28a1f21a3fd9ceb0ff0e">https://github.com/macports/macports-ports/commit/ff6b42e292207aeaab4a28a1f21a3fd9ceb0ff0e</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 ff6b42e2922 mariadb-10.3: update to 10.3.35
</span>ff6b42e2922 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ff6b42e292207aeaab4a28a1f21a3fd9ceb0ff0e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 17 08:22:03 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.3: update to 10.3.35
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + fixes for required OpenSSL 1.1 usage
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/65304
</span>---
databases/mariadb-10.3/Portfile | 29 +++---
.../files/patch-SSL_INCLUDES_first.diff | 104 +++++++++++++++++++++
...patch-libmariadb_libmariadb_CMakeLists.txt.diff | 2 +-
3 files changed, 121 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.3/Portfile b/databases/mariadb-10.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74a977310c7..7fb0c1eacfa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
name mariadb-10.3
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.3.34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.3.35
</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;'>@@ -50,7 +50,7 @@ if {$subport eq $name} {
</span>
set submodule_github_author MariaDB
set submodule_github_project mariadb-connector-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodule_github_branch f6c3d9fd2af5d17db64cc996574aa312efd70fcf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set submodule_github_branch ab7a81e79e4be4324a2d09d19d4f5249801ef665
</span>
set main_distname ${distname}
set main_distfile ${distfiles}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,13 +64,13 @@ if {$subport eq $name} {
</span> https://github.com/${submodule_github_author}/${submodule_github_project}/archive/${submodule_github_branch}:tagtwo
checksums ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 44dcab5b13e2d56b1319725a30dd67f019842a58 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8d5e5d3cd56a12c629c439bcff06257f2d2aa74366cc70f98be438ce621f1fd8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 63524847 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c929260c662aace556c06bd768eba0be76ba180b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f3ff6fa37a9f875fe399e3bbb4b7e9a8b9e98d28a386aebe21def8948320bd54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 63575384 \
</span> ${submodule_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 42554f52c61fa387221266857a7599bddca79c34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 69e7757539545547bde6d994bcbaab62304569452bee845e3e1407573cbaf76b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 967901
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c78575cf544d96cfba6cc9dcd5c86a43f6c26e52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 98db207c6ae8b9553947d05891571b211ab7aab461cd8f071c4730a1302e9a48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 967973
</span>
worksrcdir ${github.project}-${git.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,8 +84,7 @@ if {$subport eq $name} {
</span> }
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:#ffe0e0;'>- port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openssl11 port:libxml2 port:pcre
</span> depends_run-append port:mysql_select
select.group mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +102,8 @@ if {$subport eq $name} {
</span> patch-CMakeLists.txt.diff \
patch-libmariadb_cmake_install.cmake.diff \
patch-libmariadb_libmariadb_CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake_mysql_version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake_mysql_version.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-SSL_INCLUDES_first.diff
</span>
# patch to provide minimum changes required for ARM64 support;
# guessing this will be fixed in the next release.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,6 +123,8 @@ if {$subport eq $name} {
</span> move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,8 +146,7 @@ if {$subport eq $name} {
</span> -DENABLE_DTRACE:BOOL=OFF \
-DWITH_READLINE:BOOL=ON \
-DWITH_LIBWRAP:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_SSL:STRING=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_SSL_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SSL:STRING=${prefix}/libexec/openssl11 \
</span> -DMYSQL_MAINTAINER_MODE:STRING=AUTO \
-DICONV_LIBRARIES=${prefix}/lib/libiconv.dylib \
-DICONV_INCLUDE_DIR:PATH=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,6 +157,8 @@ if {$subport eq $name} {
</span> -DCONNECT_WITH_REST=OFF \
-DWITH_PCRE=system
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.checks.implicit_function_declaration.whitelist-append select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# proc portdestroot::destroot_finish fails to find and compress our man pages
# so borrow the compress command and run on our files now.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.3/files/patch-SSL_INCLUDES_first.diff b/databases/mariadb-10.3/files/patch-SSL_INCLUDES_first.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b373aabc118
</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.3/files/patch-SSL_INCLUDES_first.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,104 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/client/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/client/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,14 +16,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/mysys_ssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${ZLIB_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${MY_READLINE_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${ZLIB_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${MY_READLINE_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(BEFORE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,7 +314,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win32_errmsg.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(ICONV_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-Wno-deprecated-declarations)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmysqld/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmysqld/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,10 +22,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/libmysqld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${SSL_INTERNAL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ZLIB_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${SSL_INTERNAL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(GEN_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugin/feedback/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugin/feedback/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SSL_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PCRE_INCLUDES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(FEEDBACK_SOURCES feedback.cc sender_thread.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ url_base.cc url_http.cc utils.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sql/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sql/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,10 +38,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${CMAKE_BINARY_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ZLIB_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${CMAKE_BINARY_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${WSREP_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/storage/perfschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/storage/perfschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,8 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SSL_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PCRE_INCLUDES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DMYSQL_SERVER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/storage/perfschema/unittest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/storage/perfschema/unittest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,11 +22,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/include/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/unittest/mytap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/storage/perfschema)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_SOURCE_DIR}/storage/perfschema
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PCRE_INCLUDES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DMYSQL_SERVER ${SSL_DEFINES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.3/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.3/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7098d13f83f..8dfa35482b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.3/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.3/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
</span> index e4217439..6fa6b468 100644
--- a/libmariadb/libmariadb/CMakeLists.txt
+++ b/libmariadb/libmariadb/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,9 +312,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,9 +316,6 @@
</span> IF(ICONV_INCLUDE_DIR)
INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
ENDIF()
</pre><pre style='margin:0'>
</pre>