From 63d5ddeac2f13a7c21e82835ed7d90733472bbda Mon Sep 17 00:00:00 2001 From: Stefan Strogin Date: Wed, 22 May 2019 05:44:02 +0300 Subject: [PATCH] Update LibreSSL patch for MySQL Bug: https://bugs.gentoo.org/685948 Signed-off-by: Stefan Strogin --- 20018_all_mysql-5.7.25-fix-libressl-support.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(); -- 2.21.0