diff options
Diffstat (limited to 'databases/percona57-server/files')
4 files changed, 30 insertions, 8 deletions
diff --git a/databases/percona57-server/files/patch-client_CMakeLists.txt b/databases/percona57-server/files/patch-client_CMakeLists.txt index 09de11a195d7..e89ab375d99c 100644 --- a/databases/percona57-server/files/patch-client_CMakeLists.txt +++ b/databases/percona57-server/files/patch-client_CMakeLists.txt @@ -47,7 +47,7 @@ @@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) + TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient) +ENDIF() +IF(FALSE) diff --git a/databases/percona57-server/files/patch-cmake_ssl.cmake b/databases/percona57-server/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..d32169c23961 --- /dev/null +++ b/databases/percona57-server/files/patch-cmake_ssl.cmake @@ -0,0 +1,22 @@ +--- cmake/ssl.cmake.orig 2019-11-09 00:33:40.000000000 +1000 ++++ cmake/ssl.cmake 2019-12-13 23:08:53.686402000 +1000 +@@ -189,7 +189,8 @@ 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) + SET(HAVE_TLSv13 1) + IF(SOLARIS) +@@ -198,8 +199,7 @@ MACRO (MYSQL_CHECK_SSL) + ENDIF() + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND +- CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ CRYPTO_LIBRARY + ) + SET(OPENSSL_FOUND TRUE) + ELSE() diff --git a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_CMakeLists.txt index f7d94508b549..d66517c9ed59 100644 --- a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/percona57-server/files/patch-libmysql_CMakeLists.txt @@ -4,21 +4,21 @@ ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big perconaserverclient --MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL) - +-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) + TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK}) + # Visual Studio users need debug static library for debug projects - IF(MSVC) @@ -271,7 +271,8 @@ # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS} + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries SKIP_INSTALL) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) +IF(FALSE) IF(UNIX) # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) @@ -327,6 +328,7 @@ # to initialize api_calls[] array in api_test.c # diff --git a/databases/percona57-server/files/patch-sql_mysqld.cc b/databases/percona57-server/files/patch-sql_mysqld.cc index ce4d118965a5..184ace5eab3e 100644 --- a/databases/percona57-server/files/patch-sql_mysqld.cc +++ b/databases/percona57-server/files/patch-sql_mysqld.cc @@ -20,11 +20,11 @@ @@ -3678,6 +3688,7 @@ static int init_ssl() { #ifdef HAVE_OPENSSL - #ifndef HAVE_YASSL +#ifndef LIBRESSL_VERSION_NUMBER int fips_mode= FIPS_mode(); if (fips_mode != 0) { + /* FIPS is enabled, Log warning and Disable it now */ @@ -3687,7 +3698,9 @@ static int init_ssl() " Disabling FIPS."); FIPS_mode_set(0); |