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: Sat, 13 Oct 2018 23:31:06
Message-Id: 1539441152.90f28c8ff5cf894d67240c6acaae538d9f564c19.whissi@gentoo
1 commit: 90f28c8ff5cf894d67240c6acaae538d9f564c19
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 13 14:32:32 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 13 14:32:32 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=90f28c8f
7
8 Add 20018_all_mysql-5.7.23-fix-libressl-support.patch
9
10 Bug: https://bugs.gentoo.org/662826
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 20018_all_mysql-5.7.23-fix-libressl-support.patch | 14 ++++++++++++++
14 1 file changed, 14 insertions(+)
15
16 diff --git a/20018_all_mysql-5.7.23-fix-libressl-support.patch b/20018_all_mysql-5.7.23-fix-libressl-support.patch
17 new file mode 100644
18 index 0000000..f6beecd
19 --- /dev/null
20 +++ b/20018_all_mysql-5.7.23-fix-libressl-support.patch
21 @@ -0,0 +1,14 @@
22 +https://bugs.gentoo.org/662826
23 +
24 +--- a/sql/auth/sha2_password_common.cc
25 ++++ b/sql/auth/sha2_password_common.cc
26 +@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
27 + DBUG_RETURN(true);
28 + }
29 + m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
30 +-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
31 ++#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
32 ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
33 + EVP_MD_CTX_cleanup(md_context);
34 + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
35 + EVP_MD_CTX_reset(md_context);