<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/6dca7f3c7c59000a6f3e5f40475b749b398d0961">https://github.com/macports/macports-ports/commit/6dca7f3c7c59000a6f3e5f40475b749b398d0961</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 6dca7f3c7c5 mariadb-10.2: fixes for required OpenSSL 1.1 usage
</span>6dca7f3c7c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6dca7f3c7c59000a6f3e5f40475b749b398d0961
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 17 08:16:06 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.2: fixes for required OpenSSL 1.1 usage
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/65304
</span>---
databases/mariadb-10.2/Portfile | 15 +--
.../files/patch-SSL_INCLUDES_first.diff | 117 +++++++++++++++++++++
...patch-libmariadb_libmariadb_CMakeLists.txt.diff | 2 +-
3 files changed, 127 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/Portfile b/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index caa190c8fbf..de9bb791e5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/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;'>@@ -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;'>@@ -104,7 +103,8 @@ if {$subport eq $name} {
</span> patch-libmariadb_cmake_install.cmake.diff \
patch-libmariadb_libmariadb_CMakeLists.txt.diff \
patch-cmake_mysql_version.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-use-correct-readline.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-correct-readline.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;'>@@ -124,6 +124,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;'>@@ -145,8 +147,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;'>@@ -157,6 +158,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.2/files/patch-SSL_INCLUDES_first.diff b/databases/mariadb-10.2/files/patch-SSL_INCLUDES_first.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f2029ec283
</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.2/files/patch-SSL_INCLUDES_first.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,117 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5822c9f6..e5b86850 100644
</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;'>+diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b189300f..3494a20b 100644
</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 @@ IF(WIN32)
</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;'>+diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6ed51eff..93f42223 100644
</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 @@ ${CMAKE_SOURCE_DIR}/include
</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;'>+diff --git a/plugin/feedback/CMakeLists.txt b/plugin/feedback/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2103250e..c98126f4 100644
</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;'>+diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 47716274..9ffc47ad 100644
</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 @@ ENDIF()
</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;'>+diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7ed365ea..00c2c410 100644
</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;'>+diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7b8c906a..71386642 100644
</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.2/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.2/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.2/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/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>