From: Brian Evans <grknight@gentoo.org>
Date: Thu, 13 Sep 2018 16:54:47 +0000 (-0400)
Subject: dev-db/mysql-connector-c: Further OpenSSL 1.1 compile fix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0c5fdeb6d081cae27524f042d0507dd58716bd51;p=gentoo.git

dev-db/mysql-connector-c: Further OpenSSL 1.1 compile fix

Fix viossl.c:430:44: error: dereferencing pointer to incomplete type
 ‘SSL_COMP {aka struct ssl_comp_st}’ error

Backported changes from newer MySQL versions

Closes: https://bugs.gentoo.org/658910
Package-Manager: Portage-2.3.49, Repoman-2.3.10
---

diff --git a/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch b/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch
index cbca14de60b6..40e23019269a 100644
--- a/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch
+++ b/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch
@@ -199,6 +199,19 @@ index 5622cb7..94b0f09 100644
  
    vio_delete(vio);
  }
+@@ -427,7 +427,12 @@
+       for (j = 0; j < n; j++)
+       {
+         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
++#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
++        DBUG_PRINT("info",
++                   ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+       }
+   }
+ #endif
 diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
 index da5449a..87b30c3 100644
 --- a/vio/viosslfactories.c