summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-03-03 19:37:18 +0100
committerThomas Deutschmann <whissi@gentoo.org>2019-03-03 19:42:54 +0100
commitc08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1 (patch)
tree0ba9b319f2a2d26a57a86331dafd5a0c008bc745
parentAdd 20018_all_mysql-5.7.25-fix-build-without-server.patch (diff)
downloadmysql-extras-c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.tar.gz
mysql-extras-c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.tar.bz2
mysql-extras-c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.zip
Replace mysql LibreSSL patch
Bug: https://bugs.gentoo.org/678682 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--20018_all_mysql-5.7.25-fix-libressl-support.patch (renamed from 20018_all_mysql-5.7.23-fix-libressl-support.patch)6
1 files changed, 3 insertions, 3 deletions
diff --git a/20018_all_mysql-5.7.23-fix-libressl-support.patch b/20018_all_mysql-5.7.25-fix-libressl-support.patch
index 6e4bd50..63eda07 100644
--- a/20018_all_mysql-5.7.23-fix-libressl-support.patch
+++ b/20018_all_mysql-5.7.25-fix-libressl-support.patch
@@ -10,7 +10,7 @@ https://bugs.gentoo.org/668894
m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
EVP_MD_CTX_cleanup(md_context);
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
EVP_MD_CTX_reset(md_context);
@@ -22,7 +22,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 < 0x2070000fL)
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL)
CRYPTO_malloc_init();
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
OPENSSL_malloc_init();
@@ -60,4 +60,4 @@ https://bugs.gentoo.org/668894
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
return(dh);
- }
+ } \ No newline at end of file