Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Wed, 17 Oct 2018 12:24:14
Message-Id: 1539779022.cfe842ed9596ea5bdd8e76636033116cc77cd213.whissi@gentoo
1 commit: cfe842ed9596ea5bdd8e76636033116cc77cd213
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 17 12:23:42 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 17 12:23:42 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=cfe842ed
7
8 Update 20018_all_percona-server-5.7.23-fix-libressl-support.patch
9
10 Bug: https://bugs.gentoo.org/668818
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 20018_all_percona-server-5.7.23-fix-libressl-support.patch | 13 +++++++++++++
14 1 file changed, 13 insertions(+)
15
16 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
17 index a30dbc1..72d7a06 100644
18 --- a/20018_all_percona-server-5.7.23-fix-libressl-support.patch
19 +++ b/20018_all_percona-server-5.7.23-fix-libressl-support.patch
20 @@ -1,6 +1,19 @@
21 https://bugs.gentoo.org/662826
22 https://bugs.gentoo.org/668832
23 +https://bugs.gentoo.org/668818
24
25 +--- a/mysys_ssl/my_crypt.cc
26 ++++ b/mysys_ssl/my_crypt.cc
27 +@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
28 + MyEncryptionCTX::~MyEncryptionCTX()
29 + {
30 +
31 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L
32 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
33 ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
34 + EVP_CIPHER_CTX_cleanup(ctx);
35 + delete ctx;
36 + ERR_remove_thread_state(0);
37 --- a/sql/auth/sha2_password_common.cc
38 +++ b/sql/auth/sha2_password_common.cc
39 @@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,