<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/7070c178fbede6c25eae1202a14da94819152608">https://github.com/macports/macports-ports/commit/7070c178fbede6c25eae1202a14da94819152608</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 7070c178fbe mariadb-10.2: update to 10.2.41
</span>7070c178fbe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7070c178fbede6c25eae1202a14da94819152608
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Nov 16 11:01:27 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.2: update to 10.2.41
</span>---
databases/mariadb-10.2/Portfile | 20 ++++++++++----------
.../mariadb-10.2/files/patch-CMakeLists.txt.diff | 4 ++--
.../files/patch-include_my_global.h.diff | 4 ++--
.../patch-libmariadb_libmariadb_CMakeLists.txt.diff | 6 +++---
4 files changed, 17 insertions(+), 17 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 1ea289f2499..d9fdd895a39 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;'>@@ -6,13 +6,13 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
name mariadb-10.2
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.2.39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.2.41
</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
# 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 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 0
</span> categories databases
platforms darwin
license GPL-2
<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 180c543704d627a50a52aaf60e24ca14e0ec4686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set submodule_github_branch 735a7299dbae19cc2b82b9697becaf90e9b43047
</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 95d1e38d151a096c31d84f61ce062e8ee3ec8615 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f6ad7f8afb2733b5871224c953aa93afa2cad9ed601e55835f2b127a045d60e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64998557 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e35df07c2461f243d3ce42eb1e4ee0c340d5b108 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3faa55d30a6d8a75b47342eaae6ec59f1f13b308e0f5e3211c1fab33667152a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 65087230 \
</span> ${submodule_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 20a4f48baa758d75df8b754b937bdd27f257050c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97650c04406ca0b016ee645e9e63df7bed6596c35affd71f8f023d5af766cfb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 975616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c2b5c79914342ab2d546e05d6a3af51bfd540847 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9df8813ccc64f8f206d924a2210a7d74bf3801b6a4c7ed376ffb3cd7a8420921 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 967825
</span>
worksrcdir ${github.project}-${git.branch}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index abfde6e53b6..29d3e555a52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,7 @@
</span>
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
<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;'>-@@ -267,6 +267,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -271,6 +271,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.2/files/patch-include_my_global.h.diff b/databases/mariadb-10.2/files/patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e312a6058e8..51a8c06e711 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/files/patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/files/patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ index ae8835a2..25296c01 100644
</span> # if defined(__i386__) || defined(__ppc__)
# define SIZEOF_CHARP 4
# define SIZEOF_LONG 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif defined(__x86_64__) || defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif defined(__x86_64__) || defined(__ppc64__) || defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__) || defined(__arm64__)
</span> # define SIZEOF_CHARP 8
# define SIZEOF_LONG 8
# else
<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 432c80ebb43..7098d13f83f 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;'>@@ -9,6 +9,6 @@ index e4217439..6fa6b468 100644
</span> - IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
- ADD_DEFINITIONS(-DLIBICONV_PLUG)
- ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
</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;'>+ ENDIF()
</span></pre><pre style='margin:0'>
</pre>