From 185eb05d83c466b5506a4dd0e9353bc52b7f7064 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sun, 3 Mar 2019 19:38:50 +0100
Subject: Replace percona-server LibreSSL patch

Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
 ...ercona-server-5.7.23-fix-libressl-support.patch | 52 ----------------------
 ...ercona-server-5.7.25-fix-libressl-support.patch | 52 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 20018_all_percona-server-5.7.23-fix-libressl-support.patch
 create mode 100644 20018_all_percona-server-5.7.25-fix-libressl-support.patch

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
deleted file mode 100644
index f368f57..0000000
--- a/20018_all_percona-server-5.7.23-fix-libressl-support.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/662826
-https://bugs.gentoo.org/668832
-https://bugs.gentoo.org/668818
-https://bugs.gentoo.org/668894
-
---- a/mysys_ssl/my_crypt.cc
-+++ b/mysys_ssl/my_crypt.cc
-@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
- MyEncryptionCTX::~MyEncryptionCTX()
- {
-   
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-   EVP_CIPHER_CTX_cleanup(ctx);
-   delete ctx;
-   ERR_remove_thread_state(0);
---- a/sql/auth/sha2_password_common.cc
-+++ b/sql/auth/sha2_password_common.cc
-@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
-     DBUG_RETURN(true);
-   }
-   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)
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -3679,7 +3679,8 @@ static int init_ssl()
-         " Disabling FIPS.");
-     FIPS_mode_set(0);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-   CRYPTO_malloc_init();
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   OPENSSL_malloc_init();
---- a/vio/viosslfactories.c
-+++ b/vio/viosslfactories.c
-@@ -123,7 +123,7 @@ static DH *get_dh2048(void)
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     dh->p= p;
-     dh->g= g;
-     if (! dh->p || ! dh->g)
diff --git a/20018_all_percona-server-5.7.25-fix-libressl-support.patch b/20018_all_percona-server-5.7.25-fix-libressl-support.patch
new file mode 100644
index 0000000..8ff17b9
--- /dev/null
+++ b/20018_all_percona-server-5.7.25-fix-libressl-support.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/662826
+https://bugs.gentoo.org/668832
+https://bugs.gentoo.org/668818
+https://bugs.gentoo.org/668894
+
+--- a/mysys_ssl/my_crypt.cc
++++ b/mysys_ssl/my_crypt.cc
+@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
+ MyEncryptionCTX::~MyEncryptionCTX()
+ {
+   
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
+   EVP_CIPHER_CTX_cleanup(ctx);
+   delete ctx;
+   ERR_remove_thread_state(0);
+--- a/sql/auth/sha2_password_common.cc
++++ b/sql/auth/sha2_password_common.cc
+@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
+     DBUG_RETURN(true);
+   }
+   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)
+   EVP_MD_CTX_cleanup(md_context);
+ #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+   EVP_MD_CTX_reset(md_context);
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -3679,7 +3679,8 @@ static int init_ssl()
+         " Disabling FIPS.");
+     FIPS_mode_set(0);
+   }
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
+   CRYPTO_malloc_init();
+ #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+   OPENSSL_malloc_init();
+--- a/vio/viosslfactories.c
++++ b/vio/viosslfactories.c
+@@ -123,7 +123,7 @@ static DH *get_dh2048(void)
+   {
+     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     dh->p= p;
+     dh->g= g;
+     if (! dh->p || ! dh->g)
-- 
cgit v1.2.3-65-gdbad