diff options
| author |   Stefan Strogin <steils@gentoo.org> | 2019-05-24 12:44:44 +0200 |
|---|---|---|
| committer |   Thomas Deutschmann <whissi@gentoo.org> | 2019-05-24 12:45:41 +0200 |
| commit | 1b4d361a49193fcf6cad352352eecf4db65c202e (patch) | |
| tree | 2a8068f87f2d7223e7bcc183a513abe8489545de /20018_all_mysql-5.7.25-fix-libressl-support.patch | |
| parent | Respin clientlibs patch for MariaDB 10.4.5 (diff) | |
| download | mysql-extras-1b4d361a49193fcf6cad352352eecf4db65c202e.tar.gz mysql-extras-1b4d361a49193fcf6cad352352eecf4db65c202e.tar.bz2 mysql-extras-1b4d361a49193fcf6cad352352eecf4db65c202e.zip | |
Respin LibreSSL patchesmysql-extras-20190524-1046Z
Bug: https://bugs.gentoo.org/669216
Bug: https://bugs.gentoo.org/685948
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to '20018_all_mysql-5.7.25-fix-libressl-support.patch')
| -rw-r--r-- | 20018_all_mysql-5.7.25-fix-libressl-support.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/20018_all_mysql-5.7.25-fix-libressl-support.patch b/20018_all_mysql-5.7.25-fix-libressl-support.patch index ce61a42..fd47809 100644 --- a/20018_all_mysql-5.7.25-fix-libressl-support.patch +++ b/20018_all_mysql-5.7.25-fix-libressl-support.patch @@ -1,6 +1,7 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 https://bugs.gentoo.org/668894 +https://bugs.gentoo.org/685948 --- a/sql/auth/sha2_password_common.cc +++ b/sql/auth/sha2_password_common.cc @@ -22,7 +23,7 @@ https://bugs.gentoo.org/668894 #ifndef HAVE_YASSL -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL) ++ defined(LIBRESSL_VERSION_NUMBER) CRYPTO_malloc_init(); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ OPENSSL_malloc_init(); |