From nobody Mon Aug 29 18:37:05 2022 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 4MGfLB2CTYz4ZQvJ; Mon, 29 Aug 2022 18:37:06 +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 4MGfLB02BMz3Z7c; Mon, 29 Aug 2022 18:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661798226; 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=WNR4A8pkZtI09xjQS4GhKYak+b5TLs5rx7DJmXP/ZX0=; b=bGA3z0X6CwpfiUHlgvlvWS0d3oY+YVjLgQVkNPLfpln5gRzidgycday6FTzzcaO8mccwxj Xq1uuhAmn8RUpKXdP61rTtkBm/nxC/EK02X7x9j5Wd6o8+mtGtjpH8IioT3WRb4FnK+T4m z8M9pY/Znsh/0322p+RR7S+uHx/z99+zG2HMq5xaHq6MeQbOxEsFAxRfsdGc7M3gps8/qL EN1Vu3R7Mwl5DGZ6zz7DeEUVNVqjicvmssU9cH6Et1oSmksE8y6/XnpUSGZenEz8gvyU/f OFp8MKdg/05pvr5xxxsp2LShpvFeAtvolBQh5JiXOKQXgBN13pabj8L/IDNN3g== 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 4MGfL95NXPzWsC; Mon, 29 Aug 2022 18:37:05 +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 27TIb5IQ025931; Mon, 29 Aug 2022 18:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27TIb5n7025930; Mon, 29 Aug 2022 18:37:05 GMT (envelope-from git) Date: Mon, 29 Aug 2022 18:37:05 GMT Message-Id: <202208291837.27TIb5n7025930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 51f1bac825cd - main - databases/percona75[*]: update to 5.7.39-42 release (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51f1bac825cdf7499d0920955cc7d0d35ac83583 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661798226; 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=WNR4A8pkZtI09xjQS4GhKYak+b5TLs5rx7DJmXP/ZX0=; b=UdPKX7EMBoys02EUUigKHS3NLdvKs4pA7R0/5IghvS7XetiaIO4Tmf6QfzhCXJzwWr9BvN DdzBTKA0eljfkwGYtHqf8C1ocjHQbIb6VBHy8k3tlVswlAoe+dRi/KM5augBu+XLLIQ/N8 LZXxm0Z16LQDZtNy++BUhO2qT+xMvNPbf1kCglcGLu53NJ6ppybkgrw7NfkB2nxxZHA/rS eslsnGBSFQWYohk9UUG30HA0ULRncTWrYb0/aTS1Nw0bbb5ZWAagGTfhRFZpo0orWxJQoo A5DoPczf87jByVxN36culnvOaxshi8Ijmz5ZP40reyuWVgW2E9KUnhwhp/QokQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661798226; a=rsa-sha256; cv=none; b=r9Wcx0lykMHsS5vxnRvHWf7iSenPI0VoECj+Wdq3hFGtjyGlvvGuQ+OSI+R/K8VPDGUOS1 O9Z8eHyiKjsTZNtYdI7UrWEhnok4GfvAaQQ4bz5pRL6jS6J4It+KtHZJdafgEFC/2uggfU CtufDoGjk+xin0S3Y1fpfnBx+EPkTWSAxSJBoBOrIAlYNKqOcTE1JNzw64JiZSoLUj4y5f 4IfNIjND0VpKkmXWaV6SSRBdVa5s3OdnfIBSYd+iEbwsYs8F9Eg1H173OyhpBiQ9gwfKeQ 7u17XbX52Yk3/9S/GLfBJ/UNNcg+5b1kTtLfnCo4QRTWEukhk4LwSYm0nMgyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=51f1bac825cdf7499d0920955cc7d0d35ac83583 commit 51f1bac825cdf7499d0920955cc7d0d35ac83583 Author: Dima Panov AuthorDate: 2022-08-29 18:35:22 +0000 Commit: Dima Panov CommitDate: 2022-08-29 18:35:22 +0000 databases/percona75[*]: update to 5.7.39-42 release (+) Release Notes: https://docs.percona.com/percona-server/5.7/release-notes/Percona-Server-5.7.38-41.html \ https://docs.percona.com/percona-server/5.7/release-notes/Percona-Server-5.7.39-42.html --- databases/percona57-client/files/patch-cmake_ssl.cmake | 11 ++++++----- databases/percona57-server/Makefile | 2 +- databases/percona57-server/distinfo | 6 +++--- databases/percona57-server/files/patch-cmake_ssl.cmake | 11 ++++++----- databases/percona57-server/files/patch-sql_mysqld.cc | 18 +++++++++--------- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/databases/percona57-client/files/patch-cmake_ssl.cmake b/databases/percona57-client/files/patch-cmake_ssl.cmake index 4dfe79fa311b..7a73266ce4c8 100644 --- a/databases/percona57-client/files/patch-cmake_ssl.cmake +++ b/databases/percona57-client/files/patch-cmake_ssl.cmake @@ -1,6 +1,6 @@ ---- cmake/ssl.cmake.orig 2019-11-09 00:33:40.000000000 +1000 -+++ cmake/ssl.cmake 2019-12-13 23:08:53.686402000 +1000 -@@ -193,7 +193,8 @@ MACRO (MYSQL_CHECK_SSL) +--- cmake/ssl.cmake.orig 2022-08-05 18:25:13 UTC ++++ cmake/ssl.cmake +@@ -246,7 +246,8 @@ MACRO (MYSQL_CHECK_SSL) ) SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "") @@ -10,13 +10,14 @@ ADD_DEFINITIONS(-DHAVE_TLSv13) SET(HAVE_TLSv13 1) IF(SOLARIS) -@@ -202,8 +203,7 @@ MACRO (MYSQL_CHECK_SSL) +@@ -258,8 +259,7 @@ MACRO (MYSQL_CHECK_SSL) ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND - CRYPTO_LIBRARY AND -- OPENSSL_MAJOR_VERSION STREQUAL "1" +- (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "3") + CRYPTO_LIBRARY ) SET(OPENSSL_FOUND TRUE) ELSE() + diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index 0da40791ff61..16a40a438210 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= percona -DISTVERSION= 5.7.37-40 +DISTVERSION= 5.7.39-42 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ diff --git a/databases/percona57-server/distinfo b/databases/percona57-server/distinfo index 2c1f2a024b43..9a1fd3d59e43 100644 --- a/databases/percona57-server/distinfo +++ b/databases/percona57-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1653351984 -SHA256 (percona-server-5.7.37-40.tar.gz) = 8a641b64ce119541faa01512b10398f16c39d9e2edffa11259bf43419ae55a91 -SIZE (percona-server-5.7.37-40.tar.gz) = 91183142 +TIMESTAMP = 1661787020 +SHA256 (percona-server-5.7.39-42.tar.gz) = bda853fb951eef8be1c2f24391798cf1f3377c776a376f4c55b192e42ae8d1b2 +SIZE (percona-server-5.7.39-42.tar.gz) = 91524374 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 diff --git a/databases/percona57-server/files/patch-cmake_ssl.cmake b/databases/percona57-server/files/patch-cmake_ssl.cmake index 4dfe79fa311b..7a73266ce4c8 100644 --- a/databases/percona57-server/files/patch-cmake_ssl.cmake +++ b/databases/percona57-server/files/patch-cmake_ssl.cmake @@ -1,6 +1,6 @@ ---- cmake/ssl.cmake.orig 2019-11-09 00:33:40.000000000 +1000 -+++ cmake/ssl.cmake 2019-12-13 23:08:53.686402000 +1000 -@@ -193,7 +193,8 @@ MACRO (MYSQL_CHECK_SSL) +--- cmake/ssl.cmake.orig 2022-08-05 18:25:13 UTC ++++ cmake/ssl.cmake +@@ -246,7 +246,8 @@ MACRO (MYSQL_CHECK_SSL) ) SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "") @@ -10,13 +10,14 @@ ADD_DEFINITIONS(-DHAVE_TLSv13) SET(HAVE_TLSv13 1) IF(SOLARIS) -@@ -202,8 +203,7 @@ MACRO (MYSQL_CHECK_SSL) +@@ -258,8 +259,7 @@ MACRO (MYSQL_CHECK_SSL) ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND - CRYPTO_LIBRARY AND -- OPENSSL_MAJOR_VERSION STREQUAL "1" +- (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "3") + CRYPTO_LIBRARY ) SET(OPENSSL_FOUND TRUE) ELSE() + diff --git a/databases/percona57-server/files/patch-sql_mysqld.cc b/databases/percona57-server/files/patch-sql_mysqld.cc index 184ace5eab3e..c967c9ea01b1 100644 --- a/databases/percona57-server/files/patch-sql_mysqld.cc +++ b/databases/percona57-server/files/patch-sql_mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC +--- sql/mysqld.cc.orig 2022-08-05 18:25:13 UTC +++ sql/mysqld.cc -@@ -1517,6 +1517,16 @@ static void clean_up_mutexes() +@@ -1531,6 +1531,16 @@ static void clean_up_mutexes() ****************************************************************************/ /* Initialise proxy protocol. */ @@ -17,17 +17,17 @@ static void set_proxy() { const char *p; -@@ -3678,6 +3688,7 @@ static int init_ssl() +@@ -3706,6 +3716,7 @@ static int init_ssl() + static int init_ssl() { #ifdef HAVE_OPENSSL +#ifndef LIBRESSL_VERSION_NUMBER - int fips_mode= FIPS_mode(); - if (fips_mode != 0) - { - /* FIPS is enabled, Log warning and Disable it now */ -@@ -3687,7 +3698,9 @@ static int init_ssl() - " Disabling FIPS."); + + #if OPENSSL_VERSION_NUMBER >= 0x30000000L + int fips_mode= EVP_default_properties_is_fips_enabled(NULL) && +@@ -3726,7 +3737,9 @@ static int init_ssl() FIPS_mode_set(0); + #endif } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#endif