From owner-svn-ports-head@freebsd.org Fri Dec 6 19:02:44 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5461F1B36C9; Fri, 6 Dec 2019 19:02:44 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47V25w1TGlz3GZ0; Fri, 6 Dec 2019 19:02:44 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15D1F5D03; Fri, 6 Dec 2019 19:02:44 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB6J2hOi030138; Fri, 6 Dec 2019 19:02:43 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB6J2hrc030136; Fri, 6 Dec 2019 19:02:43 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201912061902.xB6J2hrc030136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 6 Dec 2019 19:02:43 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/databases/mysql57-server: . files X-SVN-Commit-Revision: 519158 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2019 19:02:44 -0000 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()