| 1 |
commit: 9cca68e0575d46455bde1c362c2892b4a4bc97e9 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 00:20:18 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 17 00:20:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=9cca68e0 |
| 7 |
|
| 8 |
Fix 20018_all_mysql-5.6.44-fix-libressl-support.patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/692124 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
20018_all_mysql-5.6.44-fix-libressl-support.patch | 5 +++-- |
| 14 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/20018_all_mysql-5.6.44-fix-libressl-support.patch b/20018_all_mysql-5.6.44-fix-libressl-support.patch |
| 17 |
index b180677..939459d 100644 |
| 18 |
--- a/20018_all_mysql-5.6.44-fix-libressl-support.patch |
| 19 |
+++ b/20018_all_mysql-5.6.44-fix-libressl-support.patch |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
--- a/sql/mysqld.cc |
| 22 |
+++ b/sql/mysqld.cc |
| 23 |
-@@ -4358,7 +4358,10 @@ static int init_ssl() |
| 24 |
+@@ -4358,7 +4358,11 @@ static int init_ssl() |
| 25 |
{ |
| 26 |
#ifdef HAVE_OPENSSL |
| 27 |
#ifndef HAVE_YASSL |
| 28 |
@@ -8,10 +8,11 @@ |
| 29 |
CRYPTO_malloc_init(); |
| 30 |
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 31 |
+ OPENSSL_malloc_init(); |
| 32 |
++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 33 |
#endif |
| 34 |
ssl_start(); |
| 35 |
#ifndef EMBEDDED_LIBRARY |
| 36 |
-@@ -4372,7 +4375,9 @@ static int init_ssl() |
| 37 |
+@@ -4372,7 +4376,9 @@ static int init_ssl() |
| 38 |
opt_ssl_cipher, &error, |
| 39 |
opt_ssl_crl, opt_ssl_crlpath); |
| 40 |
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); |
Archives