Dima Panov 2022-08-29 21:35:22 +03:00
parent 2b2ae540ca
commit 51f1bac825
5 changed files with 25 additions and 23 deletions

View File

@ -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()

View File

@ -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 \

View File

@ -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

View File

@ -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()

View File

@ -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