Attachment 209753 Details for Bug 242474 – proposed change of patch-cmake_ssl.cmake

[patch] proposed change of patch-cmake_ssl.cmake

patch-mysql57-server (text/plain), 1.76 KB, created by Walter Schwarzenfeld on 2019-12-06 10:57:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-12-06 10:57:45 UTC

Size: 1.76 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 519132)
>+++ Makefile	(working copy)
>@@ -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
>Index: files/patch-cmake_ssl.cmake
>===================================================================
>--- files/patch-cmake_ssl.cmake	(revision 519132)
>+++ files/patch-cmake_ssl.cmake	(working copy)
>@@ -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()

Actions: View | Diff

Attachments on bug 242474: 209753 | 209767