<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/dd0f6696c06eefee22cd4f03200acfcb6cdef152">https://github.com/macports/macports-ports/commit/dd0f6696c06eefee22cd4f03200acfcb6cdef152</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 dd0f6696c06 mariadb-10.2: update to 10.2.32
</span>dd0f6696c06 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit dd0f6696c06eefee22cd4f03200acfcb6cdef152
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jun 26 17:03:33 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.2: update to 10.2.32
</span>---
 databases/mariadb-10.2/Portfile                      | 20 +++++++++-----------
 .../mariadb-10.2/files/patch-CMakeLists.txt.diff     |  2 +-
 .../files/patch-cmake-install_layout.cmake.diff      |  2 +-
 .../patch-libmariadb_libmariadb_CMakeLists.txt.diff  |  2 +-
 ...patch-libmariadb_plugins_auth_CMakeLists.txt.diff | 13 -------------
 5 files changed, 12 insertions(+), 27 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 5dceac65f2f..e4cfd179e0e 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,12 +6,12 @@ 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.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.2.32
</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 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span> set revision_server 0
 categories          databases
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,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  10.2-serg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set submodule_github_branch  ce74fd0c4009ed9f4bcbdb4a01e96c823e961dc3
</span> 
     set main_distname ${distname}
     set main_distfile ${distfiles}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,16 +60,15 @@ 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 4f2e8b31740dbbf2a29edd5ff22715d3c342e3f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 sha256 6fcf7b6a0ef7492cec7f8497d3678ff19d715dda73f8e2d10b08ee3e08ba45be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 size   64550233 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 rmd160 e5713ce30fc50acd0eaaf145e16b324c188bf9ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 sha256 d14128b8c1f4946acb3c2c4d6e636c416d5029dbdde4514b9e45a6dead558333 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 size   64597251 \
</span>                  ${submodule_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                 rmd160 e5f149deecbc579addeeb9a36e17aa54131c681f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 sha256 72f63c54633460c6e9a087d2aaafd5719a1291c39363c071a2e352c74d44a292 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 size   745069
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 rmd160 b321b6d17f4674c48547a93dbb24fd16965a96b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 sha256 240d8461eaa9cab7fb0d7db4b239a657b1b3b25adff0128cba04cb3fc8c38c8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 size   753333
</span> 
     worksrcdir   ${github.project}-${git.branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    dist_subdir  ${name}/${version}_4
</span> 
     post-extract {
         # put the submodule_github_project directory into position
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +96,6 @@ if {$subport eq $name} {
</span>     patch.pre_args -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                   patch-libmariadb_plugins_auth_CMakeLists.txt.diff \
</span>                    patch-libmariadb_cmake_install.cmake.diff \
                    patch-libmariadb_libmariadb_CMakeLists.txt.diff \
                    patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
<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 02b99c268c1..0cfba893ae7 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;'>@@ -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;'>-@@ -262,6 +262,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,6 +265,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-cmake-install_layout.cmake.diff b/databases/mariadb-10.2/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 87197f25224..361c81b16ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span>    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,6 +223,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,6 +228,35 @@
</span>  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  
  SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
<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 9f6294d97b1..fc11fb28b92 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;'>-@@ -310,7 +310,7 @@ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +311,7 @@
</span>    IF(ICONV_INCLUDE_DIR)
       INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
    ENDIF()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-libmariadb_plugins_auth_CMakeLists.txt.diff b/databases/mariadb-10.2/files/patch-libmariadb_plugins_auth_CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2c86bd3c197..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/files/patch-libmariadb_plugins_auth_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libmariadb/plugins/auth/CMakeLists.txt b/libmariadb/plugins/auth/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 50e07695..ca419503 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libmariadb/plugins/auth/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/libmariadb/plugins/auth/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@ IF(CRYPTO_PLUGIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     CONFIGURATIONS DYNAMIC STATIC OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     DEFAULT DYNAMIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     SOURCES ${AUTH_DIR}/sha256_pw.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                    LIBRARIES ${CRYT_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                    LIBRARIES ${CRYPT_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span></pre><pre style='margin:0'>

</pre>