commit: 3098bcea9e263bcc864956ccaf551ad9f540e150 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Wed Oct 17 21:58:22 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Oct 17 21:58:22 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=3098bcea
Update 20018_all_percona-server-5.7.23-fix-libressl-support.patch Bug: https://bugs.gentoo.org/668894 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> 20018_all_percona-server-5.7.23-fix-libressl-support.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/20018_all_percona-server-5.7.23-fix-libressl-support.patch b/20018_all_percona-server-5.7.23-fix-libressl-support.patch index 72d7a06..f368f57 100644 --- a/20018_all_percona-server-5.7.23-fix-libressl-support.patch +++ b/20018_all_percona-server-5.7.23-fix-libressl-support.patch @@ -1,6 +1,7 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 https://bugs.gentoo.org/668818 +https://bugs.gentoo.org/668894 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -26,6 +27,18 @@ https://bugs.gentoo.org/668818 EVP_MD_CTX_cleanup(md_context); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ EVP_MD_CTX_reset(md_context); +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -3679,7 +3679,8 @@ static int init_ssl() + " Disabling FIPS."); + FIPS_mode_set(0); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -123,7 +123,7 @@ static DH *get_dh2048(void)
