From nobody Tue Jun 13 06:32:49 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 4QgJdZ04yyz4cNtT; Tue, 13 Jun 2023 06:32:50 +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 4QgJdY6gqFz3r0Q; Tue, 13 Jun 2023 06:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686637969; 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=VBuoj2EAdMa+2oNmfXxtHpEbeq9XassO7zy09+KRFQ8=; b=dD5zf3B2Hdwbqnw+F8sgOqpEilNjNcJKiOjtt/sAJyYCRfyIhTO/SHbYvrqw9Zf9mnIf6U rAqNlfKZHGbFtJomrFkMPcjLSOk9+3uejgLrigCMQ2/zn8Sr7pXdDkjRMX9ZBOn8KGHG8u qwcDbkiShbpUUL7R0YQddsx+vk7m/rXm+BlGDsI85r3nA89XKgFqjqAMkexZxvpyGtVT7O 8qa5ItINZT3gR8u5up4zdIw1yu7Fmb4mlosy++0Z1nwZ8+gagIsg/T41vNFC3XuONfccc4 pt49iYA8lbaw37XKp3tC+pRDdKjDSX1qYlDbeUijN3sz9v1O9QLtuaO26u6ttw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686637969; 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=VBuoj2EAdMa+2oNmfXxtHpEbeq9XassO7zy09+KRFQ8=; b=vsjmkIrxIBVA6X661eEtHqa3PFTyjjwhOviALlU9WvoccQAeUWd6ugMxKndfrDV1xdo55J HWB4BdRYU7boumlRfmDy3vq7vkT1URlSVjI4bsE0FJ8aobUi1W9ZtSEckEvjIwxXyj6XoV PDRVq5W8n+RJ4kbb61WWzIvjBXaFtRnf+YDcePjnBmi775EA25jKIKR3GYxkF/JB9PgVDC Z01lpYaywvjgIiSKE4lcLnsAcyAw1tAN70r0+ZHFLMV4Z+s9N4alZcOMOvf8MtIdh9W+S4 TM8nH7EkgqW2SLvlQvv2euDkidTPvGnzur1KS5rf/AK7fBnmbDPb5o6G+Z2oWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686637969; a=rsa-sha256; cv=none; b=L6mBWW+Iybk7Iu+sXJv9jU+sEECObR2OzhuDByPJ8NOaqCXZdoOpG2QGxSUXTDkNwAh8oW BO5YwbTUWFtxh0bI1IBChdObYHbiR+VcDx//KX5HrZ8tAP1gLzU99gczqbjEv6scXnD4a/ dWLH6e2FiKZIDaV+I8sCDMm8h7973k2caH0J/dCDKN1HsV0AkCBCAs9sHz4fsLhQqWr0kB MIvidTa6b8cmxbxqZW7DXSwC6KkImJFmbaNn3G8m1RmXy7LK6Uc3AheAVKrzBubm1oGbBi P9av6l0ben0Lw0ZC5JWC/+Q6xEDKw7W1zPWTcjlCXeRIASbXLRVnhh0025AIIg== 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 4QgJdY5kdFz1BKM; Tue, 13 Jun 2023 06:32:49 +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 35D6WnJi046554; Tue, 13 Jun 2023 06:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35D6Wnvn046553; Tue, 13 Jun 2023 06:32:49 GMT (envelope-from git) Date: Tue, 13 Jun 2023 06:32:49 GMT Message-Id: <202306130632.35D6Wnvn046553@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: f8301140055f - main - databases/mysql56-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: f8301140055f9b0fac6e3c23458e48c7cff2ef05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8301140055f9b0fac6e3c23458e48c7cff2ef05 commit f8301140055f9b0fac6e3c23458e48c7cff2ef05 Author: Eugene Grosbein AuthorDate: 2023-06-13 06:26:00 +0000 Commit: Eugene Grosbein 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)