| 1 |
commit: 0c5fdeb6d081cae27524f042d0507dd58716bd51 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 13 16:54:47 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 13 16:54:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5fdeb6 |
| 7 |
|
| 8 |
dev-db/mysql-connector-c: Further OpenSSL 1.1 compile fix |
| 9 |
|
| 10 |
Fix viossl.c:430:44: error: dereferencing pointer to incomplete type |
| 11 |
‘SSL_COMP {aka struct ssl_comp_st}’ error |
| 12 |
|
| 13 |
Backported changes from newer MySQL versions |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/658910 |
| 16 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 17 |
|
| 18 |
dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch | 13 +++++++++++++ |
| 19 |
1 file changed, 13 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
index cbca14de60b..40e23019269 100644 |
| 23 |
--- a/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch |
| 24 |
+++ b/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch |
| 25 |
@@ -199,6 +199,19 @@ index 5622cb7..94b0f09 100644 |
| 26 |
|
| 27 |
vio_delete(vio); |
| 28 |
} |
| 29 |
+@@ -427,7 +427,12 @@ |
| 30 |
+ for (j = 0; j < n; j++) |
| 31 |
+ { |
| 32 |
+ SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); |
| 33 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 34 |
+ DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); |
| 35 |
++#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 36 |
++ DBUG_PRINT("info", |
| 37 |
++ (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c))); |
| 38 |
++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 39 |
+ } |
| 40 |
+ } |
| 41 |
+ #endif |
| 42 |
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c |
| 43 |
index da5449a..87b30c3 100644 |
| 44 |
--- a/vio/viosslfactories.c |
Archives