commit: 1b4d361a49193fcf6cad352352eecf4db65c202e Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Fri May 24 10:44:44 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri May 24 10:45:41 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=1b4d361a
Respin LibreSSL patches Bug: https://bugs.gentoo.org/669216 Bug: https://bugs.gentoo.org/685948 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> 20018_all_mysql-5.7.25-fix-libressl-support.patch | 3 ++- ...ercona-server-5.7.25-fix-libressl-support.patch | 23 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/20018_all_mysql-5.7.25-fix-libressl-support.patch b/20018_all_mysql-5.7.25-fix-libressl-support.patch index ce61a42..fd47809 100644 --- a/20018_all_mysql-5.7.25-fix-libressl-support.patch +++ b/20018_all_mysql-5.7.25-fix-libressl-support.patch @@ -1,6 +1,7 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 https://bugs.gentoo.org/668894 +https://bugs.gentoo.org/685948 --- a/sql/auth/sha2_password_common.cc +++ b/sql/auth/sha2_password_common.cc @@ -22,7 +23,7 @@ https://bugs.gentoo.org/668894 #ifndef HAVE_YASSL -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL) ++ defined(LIBRESSL_VERSION_NUMBER) CRYPTO_malloc_init(); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ OPENSSL_malloc_init(); diff --git a/20018_all_percona-server-5.7.25-fix-libressl-support.patch b/20018_all_percona-server-5.7.25-fix-libressl-support.patch index 8ff17b9..c147bf0 100644 --- a/20018_all_percona-server-5.7.25-fix-libressl-support.patch +++ b/20018_all_percona-server-5.7.25-fix-libressl-support.patch @@ -2,9 +2,19 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 https://bugs.gentoo.org/668818 https://bugs.gentoo.org/668894 +https://bugs.gentoo.org/669216 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc +@@ -30,7 +30,7 @@ + #include <boost/move/unique_ptr.hpp> + #include <boost/core/noncopyable.hpp> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) + #define RAND_OpenSSL() RAND_SSLeay() + #endif @@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() MyEncryptionCTX::~MyEncryptionCTX() { @@ -29,13 +39,22 @@ https://bugs.gentoo.org/668894 EVP_MD_CTX_reset(md_context); --- a/sql/mysqld.cc +++ b/sql/mysqld.cc -@@ -3679,7 +3679,8 @@ static int init_ssl() +@@ -3678,6 +3678,7 @@ static int init_ssl() + { + #ifdef HAVE_OPENSSL + #ifndef HAVE_YASSL ++#ifndef LIBRESSL_VERSION_NUMBER + int fips_mode= FIPS_mode(); + if (fips_mode != 0) + { +@@ -3687,7 +3688,9 @@ static int init_ssl() " Disabling FIPS."); FIPS_mode_set(0); } -#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#endif +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) ++ defined(LIBRESSL_VERSION_NUMBER) CRYPTO_malloc_init(); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ OPENSSL_malloc_init();
