View | Details | Raw Unified | Return to bug 242474 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTREVISION=	0
5
PORTREVISION=	1
6
PKGNAMESUFFIX=	57-client
6
PKGNAMESUFFIX=	57-client
7
7
8
COMMENT=	Multithreaded SQL database (client)
8
COMMENT=	Multithreaded SQL database (client)
(-)files/patch-cmake_ssl.cmake (-9 / +21 lines)
Lines 1-15 Link Here
1
--- cmake/ssl.cmake.orig	2016-08-12 10:55:07 UTC
1
--- cmake/ssl.cmake.orig	2019-12-06 10:41:47 UTC
2
+++ cmake/ssl.cmake
2
+++ cmake/ssl.cmake
3
@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL)
3
@@ -189,7 +189,8 @@ MACRO (MYSQL_CHECK_SSL)
4
        OPENSSL_MAJOR_VERSION STREQUAL "1"
4
         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
5
       )
5
         )
6
       SET(OPENSSL_FOUND TRUE)
6
     ENDIF()
7
-    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
8
+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
9
+    IF(HAVE_TLS1_3_VERSION)
10
        ADD_DEFINITIONS(-DHAVE_TLSv13)
11
        SET(HAVE_TLSv13 1)
12
        IF(SOLARIS)
13
@@ -199,7 +200,13 @@ MACRO (MYSQL_CHECK_SSL)
14
     IF(OPENSSL_INCLUDE_DIR AND
15
        OPENSSL_LIBRARY   AND
16
        CRYPTO_LIBRARY      AND
17
-       OPENSSL_MAJOR_VERSION STREQUAL "1"
18
+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
19
+      )
20
+      SET(OPENSSL_FOUND TRUE)
7
+    ELSEIF(OPENSSL_INCLUDE_DIR AND
21
+    ELSEIF(OPENSSL_INCLUDE_DIR AND
8
+       OPENSSL_LIBRARY   AND
22
+       OPENSSL_LIBRARY   AND
9
+       CRYPTO_LIBRARY      AND
23
+       CRYPTO_LIBRARY      AND
10
+       OPENSSL_MAJOR_VERSION STREQUAL "2"
24
+       OPENSSL_MAJOR_VERSION STREQUAL "2"
11
+      )
25
       )
12
+      SET(OPENSSL_FOUND TRUE)
26
       SET(OPENSSL_FOUND TRUE)
13
     ELSE()
27
     ELSE()
14
       SET(OPENSSL_FOUND FALSE)
15
     ENDIF()

Return to bug 242474