Date: Tue, 13 Jun 2023 06:32:49 GMT From: Eugene Grosbein <eugen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f8301140055f - main - databases/mysql56-client: be ready for OpenSSL 3.0 in base Message-ID: <202306130632.35D6Wnvn046553@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8301140055f9b0fac6e3c23458e48c7cff2ef05 commit f8301140055f9b0fac6e3c23458e48c7cff2ef05 Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2023-06-13 06:26:00 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> CommitDate: 2023-06-13 06:26:00 +0000 databases/mysql56-client: be ready for OpenSSL 3.0 in base Use same approach as in f89fd0980a5cbcc54597578015f660643cdccf0f for mysql57-client. PORTREVISION not bumped intentionally. PR: 271656 --- .../mysql56-client/files/patch-cmake_ssl.cmake | 34 ++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/databases/mysql56-client/files/patch-cmake_ssl.cmake b/databases/mysql56-client/files/patch-cmake_ssl.cmake index 52db9e37d987..ea7b6a9be138 100644 --- a/databases/mysql56-client/files/patch-cmake_ssl.cmake +++ b/databases/mysql56-client/files/patch-cmake_ssl.cmake @@ -1,8 +1,36 @@ ---- cmake/ssl.cmake.orig 2019-11-26 16:53:45 UTC -+++ cmake/ssl.cmake -@@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL) +--- cmake/ssl.cmake.orig 2021-01-05 17:19:59.000000000 +0700 ++++ cmake/ssl.cmake 2023-06-13 13:07:00.168639000 +0700 +@@ -169,6 +169,25 @@ MACRO (MYSQL_CHECK_SSL) + ENDIF() + + IF(OPENSSL_INCLUDE_DIR) ++ FOREACH(version_part ++ OPENSSL_VERSION_MAJOR ++ OPENSSL_VERSION_MINOR ++ OPENSSL_VERSION_PATCH ++ ) ++ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" ${version_part} ++ REGEX "^#[\t ]*define[\t ]+${version_part}[\t ]+([0-9]+).*") ++ STRING(REGEX REPLACE ++ "^.*${version_part}[\t ]+([0-9]+).*" "\\1" ++ ${version_part} "${${version_part}}") ++ ENDFOREACH() ++ ++ IF(OPENSSL_VERSION_MAJOR VERSION_EQUAL 3) ++ # OpenSSL 3 ++ SET(OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_MAJOR}") ++ SET(OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_MINOR}") ++ SET(OPENSSL_FIX_VERSION "${OPENSSL_VERSION_PATCH}") ++ SET(OPENSSL_FOUND TRUE) ++ ELSE() + # Verify version number. Version information looks like: + # #define OPENSSL_VERSION_NUMBER 0x1000103fL + # Encoded as MNNFFPPS: major minor fix patch status +@@ -188,14 +207,22 @@ MACRO (MYSQL_CHECK_SSL) + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" ) ++ ENDIF() ENDIF() - IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") - ADD_DEFINITIONS(-DHAVE_TLSv13)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306130632.35D6Wnvn046553>