summaryrefslogtreecommitdiff
path: root/databases/mysql57-server/files/patch-cmake_ssl.cmake
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2019-12-06 19:02:43 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2019-12-06 19:02:43 +0000
commitd799f792cdc65e75befac1c7ef5cd15138186b93 (patch)
tree47e7b9c0c2a68b3bcbc05c5d7ecd037ee83b7a68 /databases/mysql57-server/files/patch-cmake_ssl.cmake
parentx11-themes/Kvantum: Update to 0.13.0 (diff)
/ram/usr/ports/databases/mysql57-client/work/mysql-5.7.28/vio/viosslfactories.c
/ram/usr/ports/databases/mysql57-client/work/mysql-5.7.28/vio/viosslfactories.c:505:27: error: use of undeclared identifier 'SSL_OP_NO_TLSv1_3' | SSL_OP_NO_TLSv1_3 This fix a problem with libressl PR: 242474 Approved by: mmokhi (maintainer, implicit) Sponsored by: Netzkommune GmbH
Notes
Notes: svn path=/head/; revision=519158
Diffstat (limited to 'databases/mysql57-server/files/patch-cmake_ssl.cmake')
-rw-r--r--databases/mysql57-server/files/patch-cmake_ssl.cmake30
1 files changed, 21 insertions, 9 deletions
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()