From 342c784ae3cb74eeb87d281182060a1a31a1481c Mon Sep 17 00:00:00 2001 From: Jochen Neumeister Date: Wed, 8 Jan 2020 16:47:12 +0000 Subject: databases/mysql80-{client, server}: Update to latest release 8.0.18 switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH --- .../mysql80-server/files/patch-cmake_ssl.cmake | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'databases/mysql80-server/files/patch-cmake_ssl.cmake') diff --git a/databases/mysql80-server/files/patch-cmake_ssl.cmake b/databases/mysql80-server/files/patch-cmake_ssl.cmake index 8fc3814b1342..e35e3f0edff8 100644 --- a/databases/mysql80-server/files/patch-cmake_ssl.cmake +++ b/databases/mysql80-server/files/patch-cmake_ssl.cmake @@ -1,14 +1,28 @@ ---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC +--- cmake/ssl.cmake.orig 2019-09-20 08:30:51 UTC +++ cmake/ssl.cmake -@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" +@@ -199,7 +199,7 @@ MACRO (MYSQL_CHECK_SSL) + # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" +@@ -214,13 +214,14 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) + ADD_DEFINITIONS(-DHAVE_TLSv13) ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" -+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2") ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ) SET(OPENSSL_FOUND TRUE) FIND_PROGRAM(OPENSSL_EXECUTABLE openssl -- cgit v1.2.3