From fe1c8b732bd548b699d4c2ef725f67f8b8c8911c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 May 2018 11:22:40 +0100 Subject: gentoo resync : 04.05.2018 --- dev-db/Manifest.gz | Bin 20499 -> 20493 bytes dev-db/mysql-connector-c/Manifest | 3 +- .../files/6.1.11-openssl-1.1.patch | 287 +++++++++++++++++++++ .../mysql-connector-c-6.1.11-r1.ebuild | 3 +- 4 files changed, 291 insertions(+), 2 deletions(-) create mode 100644 dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index eae9ad8a36b2..384faf8679c3 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index 4a8ca82ed520..f72779d2ee0a 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,6 +1,7 @@ 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 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 2468 BLAKE2B f6a10a683d1817d5a156e9e8903515720b2ac58c63be1b23b251a7a5257d015f6ac4a63f79c636eb2e611b6730bb9b363d4badfa7318a7f3e6a1b5f0d7ee1672 SHA512 0bc867482de2829ba69960022519dc44522e4e8afa9d47c8ec138c3b2f83c5d8fbbbb1ed1012d1e0f4d5fbf6f8887d9ac088c7938116642f442494080056d1f9 +EBUILD mysql-connector-c-6.1.11-r1.ebuild 2513 BLAKE2B 1cde0d09ad47e0c8c474e351b60f31e3c8293bf44bf0ec78369261736ebad0478ed82e2bda4209303967e08b39c2cf51d3259e584b987fb79af3911d471f75d2 SHA512 e0b8df6e2dbefe2757838d2dd002ed5742e23c2bfcbe37d621f83359499a5a0bf3b2f6e72bb595c874ec50cc2a9f2014b7cd3a54079f5c53dc8d04de3f913ef9 EBUILD mysql-connector-c-6.1.11.ebuild 2226 BLAKE2B 67e1bf0d967f086f0946c8afc77827563ff9b2853a280af7bdaba51ffa7af803aad7241e44ba87e9aa72742e569212dc73be317660bbc11725e7fdb39609bbd0 SHA512 4967df77d63a9cc3a3628628d8ad840b6759bb6952a8cf55e6237bed1b35b7f68b10b22ab0994d28169fc433b85b99bed2e1f82b0a24420ff97f5d9e565afdd2 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b 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 new file mode 100644 index 000000000000..cbca14de60b6 --- /dev/null +++ b/dev-db/mysql-connector-c/files/6.1.11-openssl-1.1.patch @@ -0,0 +1,287 @@ +From 7961393dd45e4ad1cdc7544b4bba2e98a5d2760c Mon Sep 17 00:00:00 2001 +From: eroen +Date: Fri, 20 Jan 2017 14:43:53 +0100 +Subject: [PATCH] Don't use deprecated API with openssl 1.1 + +If openssl 1.1.0 is built with `--api=1.1 disable-deprecated`, using +deprecated APIs causes build errors. + +X-Gentoo-Bug: 606600 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=606600 +--- + mysys_ssl/my_aes_openssl.cc | 54 ++++++++++++++++++++++++++++++++------------- + sql-common/client.c | 16 ++++++++++++-- + vio/viossl.c | 8 +++++++ + vio/viosslfactories.c | 23 +++++++++++++++++++ + 4 files changed, 84 insertions(+), 17 deletions(-) + +diff --git a/mysys_ssl/my_aes_openssl.cc b/mysys_ssl/my_aes_openssl.cc +index 261ba8a..59a95e3 100644 +--- a/mysys_ssl/my_aes_openssl.cc ++++ b/mysys_ssl/my_aes_openssl.cc +@@ -22,6 +22,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + #include + #include + #include ++#include ++ ++#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) ++#undef OPENSSL_VERSION_NUMBER ++#define OPENSSL_VERSION_NUMBER 0x1000107fL ++#endif + + /* + xplugin needs BIO_new_bio_pair, but the server does not. +@@ -122,7 +128,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length, + enum my_aes_opmode mode, const unsigned char *iv, + bool padding) + { +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + const EVP_CIPHER *cipher= aes_evp_type(mode); + int u_len, f_len; + /* The real key to be used for encryption */ +@@ -132,23 +138,31 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length, + if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +- if (!EVP_EncryptInit(&ctx, cipher, rkey, iv)) ++ if (!EVP_EncryptInit(ctx, cipher, rkey, iv)) + goto aes_error; /* Error */ +- if (!EVP_CIPHER_CTX_set_padding(&ctx, padding)) ++ if (!EVP_CIPHER_CTX_set_padding(ctx, padding)) + goto aes_error; /* Error */ +- if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length)) ++ if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length)) + goto aes_error; /* Error */ + +- if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len)) ++ if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX_cleanup(ctx); ++#else ++ EVP_CIPHER_CTX_free(ctx); ++#endif + return u_len + f_len; + + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX_cleanup(ctx); ++#else ++ EVP_CIPHER_CTX_free(ctx); ++#endif + return MY_AES_BAD_DATA; + } + +@@ -159,7 +173,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length, + bool padding) + { + +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + const EVP_CIPHER *cipher= aes_evp_type(mode); + int u_len, f_len; + +@@ -170,24 +184,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length, + if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +- EVP_CIPHER_CTX_init(&ctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX_init(ctx); ++#endif + +- if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv)) ++ if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv)) + goto aes_error; /* Error */ +- if (!EVP_CIPHER_CTX_set_padding(&ctx, padding)) ++ if (!EVP_CIPHER_CTX_set_padding(ctx, padding)) + goto aes_error; /* Error */ +- if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length)) ++ if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length)) + goto aes_error; /* Error */ +- if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len)) ++ if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX_cleanup(ctx); ++#else ++ EVP_CIPHER_CTX_free(ctx); ++#endif + return u_len + f_len; + + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_CIPHER_CTX_cleanup(ctx); ++#else ++ EVP_CIPHER_CTX_free(ctx); ++#endif + return MY_AES_BAD_DATA; + } + +diff --git a/sql-common/client.c b/sql-common/client.c +index 9e88e9f..fe7daf7 100644 +--- a/sql-common/client.c ++++ b/sql-common/client.c +@@ -86,6 +86,14 @@ my_bool net_flush(NET *net); + # include + #endif + ++#ifdef HAVE_OPENSSL ++#include ++#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) ++#undef OPENSSL_VERSION_NUMBER ++#define OPENSSL_VERSION_NUMBER 0x1000107fL ++#endif ++#endif ++ + #ifndef _WIN32 + #include + #define SOCKET_ERROR -1 +@@ -2685,7 +2693,7 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c + { + SSL *ssl; + X509 *server_cert= NULL; +- char *cn= NULL; ++ const char *cn= NULL; + int cn_loc= -1; + ASN1_STRING *cn_asn1= NULL; + X509_NAME_ENTRY *cn_entry= NULL; +@@ -2757,7 +2765,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c + goto error; + } + +- cn= (char *) ASN1_STRING_data(cn_asn1); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ cn= (const char *) ASN1_STRING_data(cn_asn1); ++#else ++ cn= (const char *) ASN1_STRING_get0_data(cn_asn1); ++#endif + + // There should not be any NULL embedded in the CN + if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) +diff --git a/vio/viossl.c b/vio/viossl.c +index 5622cb7..94b0f09 100644 +--- a/vio/viossl.c ++++ b/vio/viossl.c +@@ -24,6 +24,12 @@ + + #ifdef HAVE_OPENSSL + ++#include ++#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) ++#undef OPENSSL_VERSION_NUMBER ++#define OPENSSL_VERSION_NUMBER 0x1000107fL ++#endif ++ + #ifndef DBUG_OFF + + static void +@@ -310,8 +316,10 @@ void vio_ssl_delete(Vio *vio) + } + + #ifndef HAVE_YASSL ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_remove_thread_state(0); + #endif ++#endif + + vio_delete(vio); + } +diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c +index da5449a..87b30c3 100644 +--- a/vio/viosslfactories.c ++++ b/vio/viosslfactories.c +@@ -16,6 +16,14 @@ + #include "vio_priv.h" + + #ifdef HAVE_OPENSSL ++#include ++#include ++#include ++ ++#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) ++#undef OPENSSL_VERSION_NUMBER ++#define OPENSSL_VERSION_NUMBER 0x1000107fL ++#endif + + #define TLS_VERSION_OPTION_SIZE 256 + #define SSL_CIPHER_LIST_SIZE 4096 +@@ -121,10 +129,18 @@ static DH *get_dh2048(void) + DH *dh; + if ((dh=DH_new())) + { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); + if (! dh->p || ! dh->g) + { ++#else ++ if (! DH_set0_pqg(dh, ++ BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL), ++ BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL), ++ NULL)) ++ { ++#endif + DH_free(dh); + dh=0; + } +@@ -247,6 +263,8 @@ typedef struct CRYPTO_dynlock_value + } openssl_lock_t; + + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ + /* Array of locks used by openssl internally for thread synchronization. + The number of locks is equal to CRYPTO_num_locks. + */ +@@ -389,9 +407,11 @@ static void deinit_lock_callback_functions() + { + set_lock_callback_functions(FALSE); + } ++#endif + + void vio_ssl_end() + { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + int i= 0; + + if (ssl_initialized) { +@@ -409,6 +429,7 @@ void vio_ssl_end() + + ssl_initialized= FALSE; + } ++#endif + } + + #endif //OpenSSL specific +@@ -419,6 +440,7 @@ void ssl_start() + { + ssl_initialized= TRUE; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_library_init(); + OpenSSL_add_all_algorithms(); + SSL_load_error_strings(); +@@ -427,6 +449,7 @@ void ssl_start() + init_ssl_locks(); + init_lock_callback_functions(); + #endif ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + } + } + +-- +2.11.0 + diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild index 0895cd112ad4..c865a0fc652c 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild @@ -45,6 +45,7 @@ DOCS=( README ) PATCHES=( "${FILESDIR}/mysql_com.patch" "${FILESDIR}/20028_all_mysql-5.6-gcc7.patch" + "${FILESDIR}/6.1.11-openssl-1.1.patch" ) src_prepare() { @@ -57,7 +58,7 @@ src_prepare() { } multilib_src_configure() { - mycmakeargs+=( + local mycmakeargs=( -DINSTALL_LAYOUT=RPM -DINSTALL_LIBDIR=$(get_libdir) -DWITH_DEFAULT_COMPILER_OPTIONS=OFF -- cgit v1.2.3