[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     5bda8618c55ed07f5652107d7b76ddc88454ee06
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 18:34:23 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 18:34:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=5bda8618

Fix 8.0.18 libressl patch

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 20018_all_mysql-8.0.18-fix-libressl-support.patch | 31 +++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/20018_all_mysql-8.0.18-fix-libressl-support.patch b/20018_all_mysql-8.0.18-fix-libressl-support.patch
index f6dc74f..e7e1a79 100644
--- a/20018_all_mysql-8.0.18-fix-libressl-support.patch
+++ b/20018_all_mysql-8.0.18-fix-libressl-support.patch
@@ -250,9 +250,24 @@ diff -aurN a/vio/viossl.cc b/vio/viossl.cc
            DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
  #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
            DBUG_PRINT("info",
+diff -aurN a/include/violite.h b/include/violite.h
+--- a/include/violite.h	2019-09-20 04:30:51.000000000 -0400
++++ b/include/violite.h	2019-10-17 14:31:39.045842844 -0400
+@@ -269,9 +269,11 @@
+ 
+ long process_tls_version(const char *tls_version);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int set_fips_mode(const uint fips_mode, char *err_string);
+ 
+ uint get_fips_mode();
++#endif
+ 
+ struct st_VioSSLFd *new_VioSSLAcceptorFd(
+     const char *key_file, const char *cert_file, const char *ca_file,
 diff -aurN a/vio/viosslfactories.cc b/vio/viosslfactories.cc
---- a/vio/viosslfactories.cc	2019-09-20 04:30:51.000000000 -0400
-+++ b/vio/viosslfactories.cc	2019-10-15 12:34:15.145676646 -0400
+--- a/vio/viosslfactories.cc	2019-10-17 14:27:32.672896538 -0400
++++ b/vio/viosslfactories.cc	2019-10-17 14:27:47.776954552 -0400
 @@ -420,6 +420,7 @@
    }
  }
@@ -261,11 +276,11 @@ diff -aurN a/vio/viosslfactories.cc b/vio/viosslfactories.cc
  /**
    Set fips mode in openssl library,
    When we set fips mode ON/STRICT, it will perform following operations:
-@@ -466,6 +467,7 @@
- EXIT:
-   return rc;
- }
+@@ -473,6 +474,7 @@
+   @returns openssl current fips mode
+ */
+ uint get_fips_mode() { return FIPS_mode(); }
 +#endif
  
- /**
-   Get fips mode from openssl library,
+ long process_tls_version(const char *tls_version) {
+   const char *separator = ",";