Date: Wed, 3 Feb 2021 01:58:48 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563857 - in head/databases: mysql56-client/files mysql56-server mysql56-server/files Message-ID: <202102030158.1131wmJl042271@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Wed Feb 3 01:58:48 2021 New Revision: 563857 URL: https://svnweb.freebsd.org/changeset/ports/563857 Log: databases/mysql56*: update to 5.6.51 Disable detect of TLSv1.3 functions - it's broken with LibreSSL Release Notes: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-51.html Requested by: joneum Modified: head/databases/mysql56-client/files/patch-cmake_ssl.cmake head/databases/mysql56-client/files/patch-vio_viossl.c head/databases/mysql56-client/files/patch-vio_viosslfactories.c head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo head/databases/mysql56-server/files/patch-cmake_ssl.cmake head/databases/mysql56-server/files/patch-vio_viossl.c head/databases/mysql56-server/files/patch-vio_viosslfactories.c Modified: head/databases/mysql56-client/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysql56-client/files/patch-cmake_ssl.cmake Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-client/files/patch-cmake_ssl.cmake Wed Feb 3 01:58:48 2021 (r563857) @@ -5,9 +5,10 @@ ) ENDIF() - IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") +- ADD_DEFINITIONS(-DHAVE_TLSv13) + CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) + IF(HAVE_TLS1_3_VERSION) - ADD_DEFINITIONS(-DHAVE_TLSv13) ++ #ADD_DEFINITIONS(-DHAVE_TLSv13) ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND Modified: head/databases/mysql56-client/files/patch-vio_viossl.c ============================================================================== --- head/databases/mysql56-client/files/patch-vio_viossl.c Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-client/files/patch-vio_viossl.c Wed Feb 3 01:58:48 2021 (r563857) @@ -1,5 +1,14 @@ --- vio/viossl.c.orig 2019-11-26 16:53:45 UTC +++ vio/viossl.c +@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, + DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout)); + SSL_clear(ssl); + SSL_set_fd(ssl, sd); +-#if defined(SSL_OP_NO_COMPRESSION) ++#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */ + #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */ + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); @@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, for (j = 0; j < n; j++) { Modified: head/databases/mysql56-client/files/patch-vio_viosslfactories.c ============================================================================== --- head/databases/mysql56-client/files/patch-vio_viosslfactories.c Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-client/files/patch-vio_viosslfactories.c Wed Feb 3 01:58:48 2021 (r563857) @@ -9,6 +9,15 @@ dh->p= p; dh->g= g; #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi + struct st_VioSSLFd *ssl_fd; + /* MySQL 5.6 supports TLS up to v1.2, explicitly disable TLSv1.3. */ + long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | +-#ifdef HAVE_TLSv13 ++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_OP_NO_TLSv1_3 | + #endif /* HAVE_TLSv13 */ + SSL_OP_NO_TICKET; @@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi DBUG_RETURN(0); @@ -18,3 +27,12 @@ SSLv23_client_method() : SSLv23_server_method() #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi + + SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options); + +-#ifdef HAVE_TLSv13 ++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) + /* + MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites. + */ Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-server/Makefile Wed Feb 3 01:58:48 2021 (r563857) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.50 +PORTVERSION= 5.6.51 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.6 Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-server/distinfo Wed Feb 3 01:58:48 2021 (r563857) @@ -1,3 +1,3 @@ -TIMESTAMP = 1603108497 -SHA256 (mysql-5.6.50.tar.gz) = efc48d8160a66b50fc498bb42ea730c3b6f30f036b709a7070d356edd645923e -SIZE (mysql-5.6.50.tar.gz) = 32409084 +TIMESTAMP = 1611992804 +SHA256 (mysql-5.6.51.tar.gz) = 262ccaf2930fca1f33787505dd125a7a04844f40d3421289a51974b5935d9abc +SIZE (mysql-5.6.51.tar.gz) = 32411131 Modified: head/databases/mysql56-server/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysql56-server/files/patch-cmake_ssl.cmake Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-server/files/patch-cmake_ssl.cmake Wed Feb 3 01:58:48 2021 (r563857) @@ -5,9 +5,10 @@ ) ENDIF() - IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") +- ADD_DEFINITIONS(-DHAVE_TLSv13) + CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) + IF(HAVE_TLS1_3_VERSION) - ADD_DEFINITIONS(-DHAVE_TLSv13) ++ #ADD_DEFINITIONS(-DHAVE_TLSv13) ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND Modified: head/databases/mysql56-server/files/patch-vio_viossl.c ============================================================================== --- head/databases/mysql56-server/files/patch-vio_viossl.c Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-server/files/patch-vio_viossl.c Wed Feb 3 01:58:48 2021 (r563857) @@ -1,5 +1,14 @@ --- vio/viossl.c.orig 2019-11-26 16:53:45 UTC +++ vio/viossl.c +@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, + DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout)); + SSL_clear(ssl); + SSL_set_fd(ssl, sd); +-#if defined(SSL_OP_NO_COMPRESSION) ++#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */ + #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */ + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); @@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, for (j = 0; j < n; j++) { Modified: head/databases/mysql56-server/files/patch-vio_viosslfactories.c ============================================================================== --- head/databases/mysql56-server/files/patch-vio_viosslfactories.c Wed Feb 3 01:42:41 2021 (r563856) +++ head/databases/mysql56-server/files/patch-vio_viosslfactories.c Wed Feb 3 01:58:48 2021 (r563857) @@ -9,6 +9,15 @@ dh->p= p; dh->g= g; #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi + struct st_VioSSLFd *ssl_fd; + /* MySQL 5.6 supports TLS up to v1.2, explicitly disable TLSv1.3. */ + long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | +-#ifdef HAVE_TLSv13 ++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_OP_NO_TLSv1_3 | + #endif /* HAVE_TLSv13 */ + SSL_OP_NO_TICKET; @@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi DBUG_RETURN(0); @@ -18,3 +27,12 @@ SSLv23_client_method() : SSLv23_server_method() #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi + + SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options); + +-#ifdef HAVE_TLSv13 ++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) + /* + MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites. + */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102030158.1131wmJl042271>