1 |
commit: 3098bcea9e263bcc864956ccaf551ad9f540e150 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 17 21:58:22 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 17 21:58:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=3098bcea |
7 |
|
8 |
Update 20018_all_percona-server-5.7.23-fix-libressl-support.patch |
9 |
|
10 |
Bug: https://bugs.gentoo.org/668894 |
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 72d7a06..f368f57 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,7 @@ |
21 |
https://bugs.gentoo.org/662826 |
22 |
https://bugs.gentoo.org/668832 |
23 |
https://bugs.gentoo.org/668818 |
24 |
+https://bugs.gentoo.org/668894 |
25 |
|
26 |
--- a/mysys_ssl/my_crypt.cc |
27 |
+++ b/mysys_ssl/my_crypt.cc |
28 |
@@ -26,6 +27,18 @@ https://bugs.gentoo.org/668818 |
29 |
EVP_MD_CTX_cleanup(md_context); |
30 |
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
31 |
EVP_MD_CTX_reset(md_context); |
32 |
+--- a/sql/mysqld.cc |
33 |
++++ b/sql/mysqld.cc |
34 |
+@@ -3679,7 +3679,8 @@ static int init_ssl() |
35 |
+ " Disabling FIPS."); |
36 |
+ FIPS_mode_set(0); |
37 |
+ } |
38 |
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
39 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
40 |
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
41 |
+ CRYPTO_malloc_init(); |
42 |
+ #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
43 |
+ OPENSSL_malloc_init(); |
44 |
--- a/vio/viosslfactories.c |
45 |
+++ b/vio/viosslfactories.c |
46 |
@@ -123,7 +123,7 @@ static DH *get_dh2048(void) |