diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-15 17:37:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-15 17:37:09 +0100 |
| commit | 586819755b4dbfdffdc8a725ab7c0f86095b8489 (patch) | |
| tree | d6790c838cfe9607c996e4913fdf11bad5fdd528 /dev-db/mysql-connector-c | |
| parent | 3f71901f8c228f4de570abed1831ce3ee425343e (diff) | |
gentoo resync : 15.09.2018
Diffstat (limited to 'dev-db/mysql-connector-c')
| -rw-r--r-- | dev-db/mysql-connector-c/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index 6f7189fb0b1b..98bc29da9a1b 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,5 +1,5 @@ AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014464876df456bf290a5de3431b481691a35ac9ac00d71cc86931efe3bca70dae012bedefc6d29ad7fec2feeb07cce014 SHA512 f9dab813418f38f3a877b8672cdec153d6f0f289144c35277e8275cc7a58195f974b7bf76b74f8dd2403643b1199f5e6d6bcde661ce5f79f614ff10347b52278 -AUX 6.1.11-openssl-1.1.patch 8528 BLAKE2B ed5c1d7455cbf5deeaa6a5badb1df665244c93222dccdf66f1121fb454fb13e2237b508f418ded84bf2dc99bce90281c95f351444f2f1593966a87aad154cfa9 SHA512 db9d1134ab2181bb78a00c0a3d22753d6bffe1b41e6b794d60af768021921573fc5061774d4ad654471f647e055e27ff36b40b4a5cc7c986d0d7837b6bd037e9 +AUX 6.1.11-openssl-1.1.patch 8987 BLAKE2B 747751ddd681d6c9eaf699a45cf9fe2027b49ae1324784953081709dcc46e36c3f356472f541c0a4aa0b9987420985e4af6c7936c0007a32a7a73743c6759618 SHA512 5c98aaf43a244eb7f89eddf19bb84df0719cfe0bd619e16e02468652f9008d657603b64f03facc288297d8708d7e656e81e53eea9a63a20844289626f8aa92b2 AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6 EBUILD mysql-connector-c-6.1.11-r1.ebuild 2512 BLAKE2B 32d140f23e94ffbea15904aa2521e0254e51ac9f4eb0210023e343e0781282a822ab03fe923f37164bd21c94616bb7dca3725df436bd26bfc2d187ac9a680ecf SHA512 a47f7b83193220d858d0b3495233f04071c2ec62eb588c1ee2d5b884ccff217a74713f7e5fef953d472a9d8ce6f4cf9661aab092a3ecb776fcde1da46cd65f16 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 |