Skip to content
Permalink
Browse files

mariadb-10.2: update to 10.2.32

  • Loading branch information
michaelld committed Jun 26, 2020
1 parent 8a44245 commit dd0f6696c06eefee22cd4f03200acfcb6cdef152
@@ -6,12 +6,12 @@ legacysupport.newest_darwin_requires_legacy 10

name mariadb-10.2
set name_mysql ${name}
version 10.2.30
version 10.2.32
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.
set revision_client 2
set revision_client 0
set revision_server 0
categories databases
platforms darwin
@@ -46,7 +46,7 @@ if {$subport eq $name} {

set submodule_github_author MariaDB
set submodule_github_project mariadb-connector-c
set submodule_github_branch 10.2-serg
set submodule_github_branch ce74fd0c4009ed9f4bcbdb4a01e96c823e961dc3

set main_distname ${distname}
set main_distfile ${distfiles}
@@ -60,16 +60,15 @@ if {$subport eq $name} {
https://github.com/${submodule_github_author}/${submodule_github_project}/archive/${submodule_github_branch}:tagtwo

checksums ${main_distfile} \
rmd160 4f2e8b31740dbbf2a29edd5ff22715d3c342e3f3 \
sha256 6fcf7b6a0ef7492cec7f8497d3678ff19d715dda73f8e2d10b08ee3e08ba45be \
size 64550233 \
rmd160 e5713ce30fc50acd0eaaf145e16b324c188bf9ae \
sha256 d14128b8c1f4946acb3c2c4d6e636c416d5029dbdde4514b9e45a6dead558333 \
size 64597251 \
${submodule_distfile} \
rmd160 e5f149deecbc579addeeb9a36e17aa54131c681f \
sha256 72f63c54633460c6e9a087d2aaafd5719a1291c39363c071a2e352c74d44a292 \
size 745069
rmd160 b321b6d17f4674c48547a93dbb24fd16965a96b9 \
sha256 240d8461eaa9cab7fb0d7db4b239a657b1b3b25adff0128cba04cb3fc8c38c8c \
size 753333

worksrcdir ${github.project}-${git.branch}
dist_subdir ${name}/${version}_4

post-extract {
# put the submodule_github_project directory into position
@@ -97,7 +96,6 @@ if {$subport eq $name} {
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff \
patch-libmariadb_plugins_auth_CMakeLists.txt.diff \
patch-libmariadb_cmake_install.cmake.diff \
patch-libmariadb_libmariadb_CMakeLists.txt.diff \
patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
@@ -8,7 +8,7 @@
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)

@@ -262,6 +262,9 @@
@@ -265,6 +265,9 @@
ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
ENDIF()
@@ -18,7 +18,7 @@
LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
@@ -223,6 +223,35 @@
@@ -228,6 +228,35 @@
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")

SET(INSTALL_UNIX_ADDRDIR_SVR "/tmp/mysql.sock")
@@ -2,7 +2,7 @@ diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
index e4217439..6fa6b468 100644
--- a/libmariadb/libmariadb/CMakeLists.txt
+++ b/libmariadb/libmariadb/CMakeLists.txt
@@ -310,7 +310,7 @@ ELSE()
@@ -311,7 +311,7 @@
IF(ICONV_INCLUDE_DIR)
INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
ENDIF()

This file was deleted.

0 comments on commit dd0f669

Please sign in to comment.
You can’t perform that action at this time.