Attachment 210010 Details for Bug 242649 – patch to 5.7.28-31 with libressl support

[patch] patch to 5.7.28-31 with libressl support

percona57.diff (text/plain), 9.65 KB, created by Dima Panov on 2019-12-17 16:23:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2019-12-17 16:23:06 UTC

Size: 9.65 KB

patch

obsolete

>Index: databases/percona57-client/files/patch-cmake_ssl.cmake
>===================================================================
>--- databases/percona57-client/files/patch-cmake_ssl.cmake	(nonexistent)
>+++ databases/percona57-client/files/patch-cmake_ssl.cmake	(working copy)
>@@ -0,0 +1,22 @@
>+--- cmake/ssl.cmake.orig	2019-11-09 00:33:40.000000000 +1000
>++++ cmake/ssl.cmake	2019-12-13 23:08:53.686402000 +1000
>+@@ -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)
>+@@ -198,8 +199,7 @@ MACRO (MYSQL_CHECK_SSL)
>+     ENDIF()
>+     IF(OPENSSL_INCLUDE_DIR AND
>+        OPENSSL_LIBRARY   AND
>+-       CRYPTO_LIBRARY      AND
>+-       OPENSSL_MAJOR_VERSION STREQUAL "1"
>++       CRYPTO_LIBRARY
>+       )
>+       SET(OPENSSL_FOUND TRUE)
>+     ELSE()
>
>Property changes on: databases/percona57-client/files/patch-cmake_ssl.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc
>===================================================================
>--- databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc	(nonexistent)
>+++ databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc	(working copy)
>@@ -0,0 +1,21 @@
>+--- mysys_ssl/my_crypt.cc.orig	2019-05-16 05:06:00 UTC
>++++ mysys_ssl/my_crypt.cc
>+@@ -30,7 +30,7 @@
>+ #include <boost/move/unique_ptr.hpp>
>+ #include <boost/core/noncopyable.hpp>
>+ 
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+ #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
>+ #define RAND_OpenSSL() RAND_SSLeay()
>+ #endif
>+@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
>+ MyEncryptionCTX::~MyEncryptionCTX()
>+ {
>+   
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
>++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
>+   EVP_CIPHER_CTX_cleanup(ctx);
>+   delete ctx;
>+   ERR_remove_thread_state(0);
>
>Property changes on: databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/percona57-client/files/patch-vio_viosslfactories.c
>===================================================================
>--- databases/percona57-client/files/patch-vio_viosslfactories.c	(nonexistent)
>+++ databases/percona57-client/files/patch-vio_viosslfactories.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- vio/viosslfactories.c.orig	2019-05-16 05:06:00 UTC
>++++ vio/viosslfactories.c
>+@@ -123,7 +123,7 @@ static DH *get_dh2048(void)
>+   {
>+     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
>+     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
>+     dh->p= p;
>+     dh->g= g;
>+     if (! dh->p || ! dh->g)
>
>Property changes on: databases/percona57-client/files/patch-vio_viosslfactories.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/percona57-server/Makefile
>===================================================================
>--- databases/percona57-server/Makefile	(revision 520299)
>+++ databases/percona57-server/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME?=	percona
>-DISTVERSION=	5.7.27-30
>+DISTVERSION=	5.7.28-31
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
>@@ -24,7 +24,7 @@
> SLAVEDIRS=	databases/percona57-client \
> 		databases/percona57-pam-for-mysql
> USES=		bison:build cmake:insource,noninja compiler:c11 \
>-		cpe libedit localbase perl5 shebangfix
>+		cpe libedit localbase perl5 shebangfix ssl
> 
> MY_DBDIR=	/var/db/mysql
> MY_SECDIR=	/var/db/mysql_secure
>@@ -45,7 +45,7 @@
> 		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
> 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
> 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
>-		-DINSTALL_MYSQLTESTDIR="${MY_TESTDIR}" \
>+		-DINSTALL_MYSQLTESTDIR=0 \
> 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
> 		-DINSTALL_SBINDIR="libexec" \
> 		-DINSTALL_SCRIPTDIR="bin" \
>@@ -131,12 +131,6 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if !${SSL_DEFAULT:Mlibressl*}
>-MY_TESTDIR=	"share/mysql/tests"
>-.else
>-MY_TESTDIR=	""
>-.endif
>-
> .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
> SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
> .else
>Index: databases/percona57-server/distinfo
>===================================================================
>--- databases/percona57-server/distinfo	(revision 520299)
>+++ databases/percona57-server/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1567963686
>-SHA256 (percona-server-5.7.27-30.tar.gz) = b50dff3d222c6444468ff328c652df24a81103627c9da2fa98ee878b8f65a226
>-SIZE (percona-server-5.7.27-30.tar.gz) = 84672298
>+TIMESTAMP = 1576055476
>+SHA256 (percona-server-5.7.28-31.tar.gz) = 8a55a37b494086850ff3699d4f1ef39b2cfe9aa4d35662505dc372ccb9cb283f
>+SIZE (percona-server-5.7.28-31.tar.gz) = 84704254
> SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
> SIZE (boost_1_59_0.tar.gz) = 83709983
>Index: databases/percona57-server/files/patch-client_CMakeLists.txt
>===================================================================
>--- databases/percona57-server/files/patch-client_CMakeLists.txt	(revision 520299)
>+++ databases/percona57-server/files/patch-client_CMakeLists.txt	(working copy)
>@@ -47,7 +47,7 @@
> @@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas
>  
>  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
>- TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)
>+ TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient)
> +ENDIF()
>  
> +IF(FALSE)
>Index: databases/percona57-server/files/patch-cmake_ssl.cmake
>===================================================================
>--- databases/percona57-server/files/patch-cmake_ssl.cmake	(nonexistent)
>+++ databases/percona57-server/files/patch-cmake_ssl.cmake	(working copy)
>@@ -0,0 +1,22 @@
>+--- cmake/ssl.cmake.orig	2019-11-09 00:33:40.000000000 +1000
>++++ cmake/ssl.cmake	2019-12-13 23:08:53.686402000 +1000
>+@@ -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)
>+@@ -198,8 +199,7 @@ MACRO (MYSQL_CHECK_SSL)
>+     ENDIF()
>+     IF(OPENSSL_INCLUDE_DIR AND
>+        OPENSSL_LIBRARY   AND
>+-       CRYPTO_LIBRARY      AND
>+-       OPENSSL_MAJOR_VERSION STREQUAL "1"
>++       CRYPTO_LIBRARY
>+       )
>+       SET(OPENSSL_FOUND TRUE)
>+     ELSE()
>
>Property changes on: databases/percona57-server/files/patch-cmake_ssl.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/percona57-server/files/patch-libmysql_CMakeLists.txt
>===================================================================
>--- databases/percona57-server/files/patch-libmysql_CMakeLists.txt	(revision 520299)
>+++ databases/percona57-server/files/patch-libmysql_CMakeLists.txt	(working copy)
>@@ -4,21 +4,21 @@
>  ADD_SUBDIRECTORY(authentication_ldap)
>    
>  # Merge several convenience libraries into one big perconaserverclient
>--MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)
>-+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)
>- 
>+-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development)
>++MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
>+ TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
>+
>  # Visual Studio users need debug  static library for debug projects
>- IF(MSVC)
> @@ -271,7 +271,8 @@
>    # and link them together into shared library.
>-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
>+   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
>      EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
> -    COMPONENT SharedLibraries)
> +    COMPONENT SharedLibraries SKIP_INSTALL)
>+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
> +IF(FALSE)
>    IF(UNIX)
>      # libtool compatability
>-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
> @@ -327,6 +328,7 @@
>  # to initialize api_calls[] array in api_test.c
>  #

Flags:

fluffy: maintainer-approval? (feld)

Actions: View | Diff

Attachments on bug 242649: 209970 | 210010