From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9906613835A for ; Mon, 3 May 2021 18:46:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79CCFE08A0; Mon, 3 May 2021 18:46:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EFF6E089C for ; Mon, 3 May 2021 18:46:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FAA6335C36 for ; Mon, 3 May 2021 18:46:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88302735 for ; Mon, 3 May 2021 18:46:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620067510.aa38d35a7bfbd3c943c6def2f9fcb51b3d558c3f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch X-VCS-Directories: dev-db/mysql-connector-c++/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aa38d35a7bfbd3c943c6def2f9fcb51b3d558c3f X-VCS-Branch: master Date: Mon, 3 May 2021 18:46:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0cd89d88-d05f-48d2-8e4e-645d269333f7 X-Archives-Hash: ebd14c2370bb0122b6d3d380e30524f9 commit: aa38d35a7bfbd3c943c6def2f9fcb51b3d558c3f Author: Sam James gentoo org> AuthorDate: Mon May 3 18:27:06 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 3 18:45:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa38d35a dev-db/mysql-connector-c++: drop obsolete LibreSSL patches Signed-off-by: Sam James gentoo.org> ...connector-c++-8.0.19-fix-libressl-support.patch | 89 ---------------------- ...connector-c++-8.0.20-fix-libressl-support.patch | 88 --------------------- 2 files changed, 177 deletions(-) diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch deleted file mode 100644 index fc6eb777063..00000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/cdk/cmake/DepFindSSL.cmake -+++ b/cdk/cmake/DepFindSSL.cmake -@@ -88,7 +88,7 @@ function(main) - - set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") - -- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) -+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) - message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") - else() - message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") -@@ -182,42 +182,33 @@ function(find_openssl) - set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE) - message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}") - -- - # Verify version number. Version information looks like: -- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" -- -+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL -+ # Encoded as MNNFFPPS: major minor fix patch status - FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" - OPENSSL_VERSION_NUMBER -- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" -+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" - ) -- -- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") - STRING(REGEX REPLACE -- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$" -- "\\1;\\2;\\3;\\4" -- version_list "${OPENSSL_VERSION_NUMBER}" -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" -+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" - ) -- #message("-- OPENSSL_VERSION: ${version_list}") -- -- list(GET version_list 0 OPENSSL_VERSION_MAJOR) -- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) -- -- list(GET version_list 1 OPENSSL_VERSION_MINOR) -- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) -- -- list(GET version_list 2 OPENSSL_VERSION_FIX) -- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) -- -- list(GET version_list 3 OPENSSL_VERSION_PATCH) -- -- - - set(OPENSSL_VERSION -- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" -+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" - PARENT_SCOPE - ) - set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) - -+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) - - find_library(OPENSSL_LIBRARY - NAMES ssl ssleay32 ssleay32MD libssl ---- a/cdk/foundation/connection_openssl.cc -+++ b/cdk/foundation/connection_openssl.cc -@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) - case SSL_ERROR_WANT_CONNECT: - case SSL_ERROR_WANT_ACCEPT: - case SSL_ERROR_WANT_X509_LOOKUP: --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - case SSL_ERROR_WANT_ASYNC: - case SSL_ERROR_WANT_ASYNC_JOB: - # endif -@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) - - SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); - --#if OPENSSL_VERSION_NUMBER>=0x1010100fL -+#if HAVE_TLS1_3_VERSION - - /* - Note: If TLSv1.3 is not enabled, there is no need to restrict diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch deleted file mode 100644 index f2ae0d02ed7..00000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- a/cdk/cmake/DepFindSSL.cmake -+++ b/cdk/cmake/DepFindSSL.cmake -@@ -88,7 +88,7 @@ function(main) - - set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") - -- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) -+ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) - message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") - else() - message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") -@@ -184,41 +184,35 @@ function(find_openssl) - - - # Verify version number. Version information looks like: -- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" -+ # #define OPENSSL_VERSION_NUMBER 0x1000103fL -+ # Encoded as MNNFFPPS: major minor fix patch status - - FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" - OPENSSL_VERSION_NUMBER -- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" -+ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" - ) - -- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") -- # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1d-freebsd 10 Sep 2019" - STRING(REGEX REPLACE -- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]|)[\t \\-].*$" -- "\\1;\\2;\\3;\\4" -- version_list "${OPENSSL_VERSION_NUMBER}" -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" -+ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" -+ ) -+ STRING(REGEX REPLACE -+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" -+ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" - ) -- #message("-- OPENSSL_VERSION: ${version_list}") -- -- list(GET version_list 0 OPENSSL_VERSION_MAJOR) -- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) -- -- list(GET version_list 1 OPENSSL_VERSION_MINOR) -- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) -- -- list(GET version_list 2 OPENSSL_VERSION_FIX) -- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) -- -- list(GET version_list 3 OPENSSL_VERSION_PATCH) -- - - - set(OPENSSL_VERSION -- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" -+ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" - PARENT_SCOPE - ) - set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) - -+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) - - find_library(OPENSSL_LIBRARY - NAMES ssl ssleay32 ssleay32MD libssl ---- a/cdk/foundation/connection_openssl.cc -+++ b/cdk/foundation/connection_openssl.cc -@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) - case SSL_ERROR_WANT_CONNECT: - case SSL_ERROR_WANT_ACCEPT: - case SSL_ERROR_WANT_X509_LOOKUP: --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - case SSL_ERROR_WANT_ASYNC: - case SSL_ERROR_WANT_ASYNC_JOB: - # endif -@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) - - SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); - --#if OPENSSL_VERSION_NUMBER>=0x1010100fL -+#if HAVE_TLS1_3_VERSION - - /* - Note: If TLSv1.3 is not enabled, there is no need to restrict