[gentoo-commits] proj/mysql-extras:master commit in: /

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     cfe842ed9596ea5bdd8e76636033116cc77cd213
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 12:23:42 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 12:23:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=cfe842ed

Update 20018_all_percona-server-5.7.23-fix-libressl-support.patch

Bug: https://bugs.gentoo.org/668818
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 a30dbc1..72d7a06 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,19 @@
 https://bugs.gentoo.org/662826
 https://bugs.gentoo.org/668832
+https://bugs.gentoo.org/668818
 
+--- a/mysys_ssl/my_crypt.cc
++++ b/mysys_ssl/my_crypt.cc
+@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
+ MyEncryptionCTX::~MyEncryptionCTX()
+ {
+   
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+   EVP_CIPHER_CTX_cleanup(ctx);
+   delete ctx;
+   ERR_remove_thread_state(0);
 --- a/sql/auth/sha2_password_common.cc
 +++ b/sql/auth/sha2_password_common.cc
 @@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,