diff options
Diffstat (limited to 'databases/mysql57-server')
| -rw-r--r-- | databases/mysql57-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql57-server/files/patch-cmake_ssl.cmake | 30 |
2 files changed, 22 insertions, 10 deletions
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 764fd78ddf37..fa424d89ce99 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.28 -PORTREVISION?= 0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server diff --git a/databases/mysql57-server/files/patch-cmake_ssl.cmake b/databases/mysql57-server/files/patch-cmake_ssl.cmake index c9a66c421b23..f09b1edc31a8 100644 --- a/databases/mysql57-server/files/patch-cmake_ssl.cmake +++ b/databases/mysql57-server/files/patch-cmake_ssl.cmake @@ -1,15 +1,27 @@ ---- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC +--- cmake/ssl.cmake.orig 2019-12-06 10:41:47 UTC +++ cmake/ssl.cmake -@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION STREQUAL "1" - ) - SET(OPENSSL_FOUND TRUE) +@@ -189,7 +189,8 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) + ADD_DEFINITIONS(-DHAVE_TLSv13) + SET(HAVE_TLSv13 1) + IF(SOLARIS) +@@ -199,7 +200,13 @@ MACRO (MYSQL_CHECK_SSL) + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSEIF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND + OPENSSL_MAJOR_VERSION STREQUAL "2" -+ ) -+ SET(OPENSSL_FOUND TRUE) + ) + SET(OPENSSL_FOUND TRUE) ELSE() - SET(OPENSSL_FOUND FALSE) - ENDIF() |