From ba6bcabbdf86e75d6e9d4a13b317ee3fbe7c2097 Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Sat, 11 May 2019 14:15:44 +0000 Subject: databases/mysql80-{client, server}: Update to latest release 8.0.16 This update includes: Bugfixes: - InnoDB: Undo tablespaces remained unencrypted after enabling undo tablespace encryption at startup. (Bug #29477795) - InnoDB: Problematic macros introduced with undo tablespace DDL support (Bug #29324132, Bug #94243). - InnoDB: Static thread local variables defined at the wrong scope were not released at thread exit. (Bug #29305186) - Memory leaks discovered in the innochecksum (Bug #28917614, Bug #93164). New features: - MySQL C API now supports asynchronous functions for nonblocking communication with the MySQL server. - MySQL now supports a new Chinese collation, utf8mb4_zh_0900_as_cs - CMake now causes the build process to link with the llvm lld linker for Clang if it is available. Security Fix: CVE-2019-2632, CVE-2019-2693, CVE-2019-2694, CVE-2019-2695 and other fixes. More info: https://www.oracle.com/technetwork/security-advisory/cpuapr2019-5072813.html#AppendixMSQL PR: 237399 Reported by: Brent Busby Sponsored by: The FreeBSD Foundation --- databases/mysql80-client/files/patch-sql_mysqld.cc | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'databases/mysql80-client/files/patch-sql_mysqld.cc') diff --git a/databases/mysql80-client/files/patch-sql_mysqld.cc b/databases/mysql80-client/files/patch-sql_mysqld.cc index 3fa4db93f9c5..e6984955312a 100644 --- a/databases/mysql80-client/files/patch-sql_mysqld.cc +++ b/databases/mysql80-client/files/patch-sql_mysqld.cc @@ -2,19 +2,10 @@ +++ sql/mysqld.cc @@ -4321,7 +4321,7 @@ static void init_ssl() { - static int init_ssl_communication() { + static void init_ssl() { #ifdef HAVE_OPENSSL --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); - if (ret_fips_mode != 1) { -@@ -8647,7 +8647,7 @@ bool mysqld_get_one_option(int optid, - One can disable SSL later by using --skip-ssl or --ssl=0. - */ - opt_use_ssl = true; --#ifdef HAVE_WOLFSSL -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) - /* crl has no effect in wolfSSL. */ - opt_ssl_crl = NULL; - opt_ssl_crlpath = NULL; +-#if !defined(HAVE_WOLFSSL) && !defined(__sun) ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun) + #if defined(HAVE_PSI_MEMORY_INTERFACE) + static PSI_memory_info all_openssl_memory[] = { + {&key_memory_openssl, "openssl_malloc", 0, 0, -- cgit v1.2.3