<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/a38e5c63e325918d67e41625d59d408a2a26d559">https://github.com/macports/macports-ports/commit/a38e5c63e325918d67e41625d59d408a2a26d559</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 a38e5c63e32 mariadb-10.5: update to 10.5.7
</span>a38e5c63e32 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a38e5c63e325918d67e41625d59d408a2a26d559
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Nov 5 19:59:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.5: update to 10.5.7
</span>---
databases/mariadb-10.5/Portfile | 40 +++++++++++-----------
.../mariadb-10.5/files/patch-CMakeLists.txt.diff | 2 +-
...patch-libmariadb_libmariadb_CMakeLists.txt.diff | 7 ++--
...h-libmariadb_mariadb_config_CMakeLists.txt.diff | 2 +-
4 files changed, 26 insertions(+), 25 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 7441f01de79..56a8938ef5d 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;'>@@ -6,7 +6,7 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
name mariadb-10.5
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.5.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;'>@@ -51,11 +51,11 @@ 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 a746c3af449a8754e78ad7971e59e79af7957cdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_branch e38244220646a7e95c9be22576460aa7a4eb715f
</span>
set wsrep_github_author codership
set wsrep_github_project wsrep-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set wsrep_github_branch ae4e58ba031587039c8830f2f8ca51fa9fb7d6eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wsrep_github_branch 2da6e4894e1df5d1db51db2bbc49255e02251b9d
</span>
set wsrep_api_github_author codership
set wsrep_api_github_project wsrep-API
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,11 +63,11 @@ 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 b6b02ed516f92055127d416370799d91a82754ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_github_branch 86347532abf1f7dae8896a96d5b7251233fca229
</span>
set libmarias3_github_author mariadb-corporation
set libmarias3_github_project libmarias3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libmarias3_github_branch 7aa450e3a02a20ef62616666a2b582f4d07fb5b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmarias3_github_branch 0d48bf334fde7d4e0dac22bda560e86037d35d77
</span>
set main_distname ${distname}
set main_distfile ${distfiles}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,29 +102,29 @@ 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 1dc5a3dc80234b4a3be176f91688a5ec709b4ce6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 340f97b50e2b058e5238ffc61d4abc87a003d1c883c2769142af22d76116459b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 63958963 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3fc12eb3fe3e537dc0bf292832f2ee776f8fa279 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 95bedf070cd13743ed3b823963a7220dd28b0aac1612b810a459abf58d6bcf5c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 65039129 \
</span> ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9ee86632bb8b43aee53c8930a2058db871934195 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c673e270324a4fd15a2948648e401b9a48bbbc6ce0a94ddac312bd5028f4c43f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 753351 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d27a09440473220f4e617e9d21cfd81560f79bfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7a05709f25a528fe8fac5f4eea49c8a4ca24d3850824644b22f17b9e111e16d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 760350 \
</span> ${wsrep_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e02776333003dc31f2eee9bd6e079696d42b1255 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 63a53f885e0985b377e0f2a5ed7ec3c8ad46667246323d5c2d505a1b805cc7dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 144954 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a229d2b6a24d49a146c6750bedc4f93db85fe311 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4990b30e01d2e7071c74018d765e5e30c2191a8b479623a6745b43329c932ef3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 145209 \
</span> ${wsrep_api_distfile} \
rmd160 9de88c7e2154eb3ff1b5fc92e42cca2f487580df \
sha256 2675869edc98e631337a6a235bc6494209be06826d4d4b7d610aa10eb5f81d88 \
size 52889 \
${columnstore_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 35c19ef1d685ae080987864de708d8603f1b378a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7eaf37e80d0a3a7280a5f4adb2d7aa8148c88910fc874f6a24437cbaac6cffab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4746345 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e63da324a4567d038e59f9bbe1e19b04cb3fd78c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4253dc244cb645c35c53a3dea94d9fb16500342b4167b3ac3e968c68c8b4a0c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4978786 \
</span> ${libmarias3_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ea6c58b0c2a750bc7087ba5e6f78f947cf24b82d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9eb38b87e1aaea61e5dd9dd2f48685384344cbd5e399df284b34cd9889f28739 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 357994
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e613f2416a33d5760dd189513bbdca580367111c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3cf237b25d8dd32a9eec2f770313e5b1805dff4e0f4c0b5ea400abbf3be61279 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 364133
</span>
worksrcdir ${github.project}-${git.branch}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d4466b6c3fe..6d0207c0fab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/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;'>-@@ -287,6 +288,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,6 +293,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.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc11fb28b92..ea11a5ed6ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,13 @@ 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;'>-@@ -311,7 +311,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,9 +311,6 @@
</span> IF(ICONV_INCLUDE_DIR)
INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ADD_DEFINITIONS(-DLIBICONV_PLUG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # ADD_DEFINITIONS(-DLIBICONV_PLUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ADD_DEFINITIONS(-DLIBICONV_PLUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span> ENDIF()
IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc5e2620dcc..db53342a996 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_confi
</span> index 60d8c58..7a66cf3 100644
--- a/libmariadb/mariadb_config/CMakeLists.txt
+++ b/libmariadb/mariadb_config/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +55,7 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span> # Installation
#
INSTALL(TARGETS mariadb_config
</pre><pre style='margin:0'>
</pre>