From nobody Tue Jun 13 05:16:33 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QgGxZ1xzkz4cyF1; Tue, 13 Jun 2023 05:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QgGxZ1V73z3LPY; Tue, 13 Jun 2023 05:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686633394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OO986nyXp2WL7bqJdczunDCwMnPiiKMwGUzFV4s3HLM=; b=Xe7eo0CiDoGXPfNbSeBYX+RV9j0oFErFp4PiSsNgBFdUvkA6Vw8XFq36A0iM3aB571iwdN PAsmv4qogN+gTJWKNS1O3QiT9Thw6RpLi5CMpBA9uUu21G85jKQ5IMw/IpjNOwnZ1cC4Q3 WGxGTO7Q42E0i1rS7eYGrkq6YshNEPxVozlcN5ZrSE6pUlX+EKZ1ADpG8TOi2eLtPR++ZK OvT03GC+e4stuTEYMSBZLX4cvVZ62u/I++LGKsEoeOkIUeaZW1Yc/ZCvkDuMSSNA5FaYlf escDvi/D+GKR9ki4JjAL0tm4zCERmhFg0Yur9SNqJi4hKP/lYGUHY6pEB6o7dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686633394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OO986nyXp2WL7bqJdczunDCwMnPiiKMwGUzFV4s3HLM=; b=G86iBcK9gVc6B2fS4Ew9oOtmtCOspeOtYvWqDVUqim1lsabK6Yd3roFdrbSo959J2bkvFW cIDouzfH/DLmC9MS4EMpKv89v915yRSPype/9XU0KR4l/KoFY5sHCISZXezd9L+z8XsbIA sit/Zru42Vv7WbhRO+5XayWaqg0VcpIejvbGEBd3Pws5p9LAaIvVoyHyc7IR7MRKJQx0P0 RVe1dKos1q1z7i9dP1sUV0Uoo7KVSm32fdJUpeatVXDTOkvNUZW7BsT9kfPNJr1f31nj71 H9+YkFn/zRui8JeZqCf/l5Be1zrZpKOxmficNXSeineNOrQP9+ZGSayc/VCkTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686633394; a=rsa-sha256; cv=none; b=dpjapZ6+UdS+NNXqj+kvEhLds1hJziZRgd77LRAjszV5cVMy/bt5BjbTEESdAJ4NailzQi IzJcdg7ox7mweU5D/GrwWVE4PD3L0/c9tsIj40443inOc+RUZjcchsfV5zWr9AV6S7J+/Z gQWTrZMYt2Oq3E9yw2sRSSoeV6livdQ/6CrGjEVYhBr/MUjXBhUO64x8O5RubgYsSQTT2A sk20SAcMPNtDOyxUPFweW54Gz7ZhYjY0Ge2NfDR/BYg1+a0Hse1+/I5GR7XUiksAzWuv94 WR5evzNLr/jIQKpkeNfE3iJoLXAmRXLgCvunmcz0Y+FvNtRIQnQQ+gkzDXFNnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QgGxZ0Z0yz1852; Tue, 13 Jun 2023 05:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35D5GX7i015647; Tue, 13 Jun 2023 05:16:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35D5GXM1015646; Tue, 13 Jun 2023 05:16:33 GMT (envelope-from git) Date: Tue, 13 Jun 2023 05:16:33 GMT Message-Id: <202306130516.35D5GXM1015646@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: f89fd0980a5c - main - databases/mysql57-client: be ready for OpenSSL 3.0 in base List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f89fd0980a5cbcc54597578015f660643cdccf0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=f89fd0980a5cbcc54597578015f660643cdccf0f commit f89fd0980a5cbcc54597578015f660643cdccf0f Author: Eugene Grosbein AuthorDate: 2023-06-13 05:12:49 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-13 05:12:49 +0000 databases/mysql57-client: be ready for OpenSSL 3.0 in base Fix build by merging another change in ssl.cmake from MySQL 8.0 PORTREVISION not bumped intentionally. PR: 271656 --- .../mysql57-client/files/patch-cmake_ssl.cmake | 40 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/databases/mysql57-client/files/patch-cmake_ssl.cmake b/databases/mysql57-client/files/patch-cmake_ssl.cmake index 0e70d693a90d..014ae927331a 100644 --- a/databases/mysql57-client/files/patch-cmake_ssl.cmake +++ b/databases/mysql57-client/files/patch-cmake_ssl.cmake @@ -1,6 +1,6 @@ ---- cmake/ssl.cmake.orig 2019-12-06 10:41:47 UTC -+++ cmake/ssl.cmake -@@ -150,22 +150,12 @@ MACRO (MYSQL_CHECK_SSL) +--- cmake/ssl.cmake.orig 2023-03-16 22:25:04.000000000 +0700 ++++ cmake/ssl.cmake 2023-06-13 12:11:25.125506000 +0700 +@@ -176,24 +176,32 @@ MACRO (MYSQL_CHECK_SSL) MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") ENDIF() @@ -20,10 +20,38 @@ - IF (WITH_SSL_PATH) - LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) - 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: -@@ -193,9 +183,10 @@ MACRO (MYSQL_CHECK_SSL) + # #define OPENSSL_VERSION_NUMBER 0x1000103fL + # Encoded as MNNFFPPS: major minor fix patch status +@@ -213,15 +221,17 @@ 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() + SET(OPENSSL_VERSION + "${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" ) SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "") @@ -37,7 +65,7 @@ IF(SOLARIS) SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null") ENDIF() -@@ -203,7 +204,13 @@ MACRO (MYSQL_CHECK_SSL) +@@ -229,7 +239,13 @@ MACRO (MYSQL_CHECK_SSL) IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND