Date: Fri, 6 Dec 2019 19:02:43 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519158 - in head/databases/mysql57-server: . files Message-ID: <201912061902.xB6J2hrc030136@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Fri Dec 6 19:02:43 2019 New Revision: 519158 URL: https://svnweb.freebsd.org/changeset/ports/519158 Log: /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 Modified: head/databases/mysql57-server/Makefile head/databases/mysql57-server/files/patch-cmake_ssl.cmake Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Fri Dec 6 18:33:03 2019 (r519157) +++ head/databases/mysql57-server/Makefile Fri Dec 6 19:02:43 2019 (r519158) @@ -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 Modified: head/databases/mysql57-server/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysql57-server/files/patch-cmake_ssl.cmake Fri Dec 6 18:33:03 2019 (r519157) +++ head/databases/mysql57-server/files/patch-cmake_ssl.cmake Fri Dec 6 19:02:43 2019 (r519158) @@ -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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912061902.xB6J2hrc030136>