git: 51f1bac825cd - main - databases/percona75[*]: update to 5.7.39-42 release (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Aug 2022 18:37:05 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=51f1bac825cdf7499d0920955cc7d0d35ac83583
commit 51f1bac825cdf7499d0920955cc7d0d35ac83583
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-08-29 18:35:22 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
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