Attachment #210010 for bug #242649




--- 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()




--- 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);

Line 0 Link Here

(-)databases/percona57-client/files/patch-vio_viosslfactories.c (+11 lines)
	1	--- vio/viosslfactories.c.orig 2019-05-16 05:06:00 UTC
	2	+++ vio/viosslfactories.c
	3	@@ -123,7 +123,7 @@ static DH *get_dh2048(void)
	4	{
	5	BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
	6	BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
	9	dh->p= p;
	10	dh->g= g;
	11	if (! dh->p \|\| ! dh->g)




# $FreeBSD$

PORTNAME?=	percona
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 \

SLAVEDIRS=	databases/percona57-client \
		databases/percona57-pam-for-mysql
USES=		bison:build cmake:insource,noninja compiler:c11 \
		cpe libedit localbase perl5 shebangfix ssl

MY_DBDIR=	/var/db/mysql
MY_SECDIR=	/var/db/mysql_secure

		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
		-DINSTALL_MYSQLTESTDIR=0 \
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
		-DINSTALL_SBINDIR="libexec" \
		-DINSTALL_SCRIPTDIR="bin" \


.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

Lines 1-5 Link Here

(-)databases/percona57-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1567963686	1	TIMESTAMP = 1576055476
2	SHA256 (percona-server-5.7.27-30.tar.gz) = b50dff3d222c6444468ff328c652df24a81103627c9da2fa98ee878b8f65a226	2	SHA256 (percona-server-5.7.28-31.tar.gz) = 8a55a37b494086850ff3699d4f1ef39b2cfe9aa4d35662505dc372ccb9cb283f
3	SIZE (percona-server-5.7.27-30.tar.gz) = 84672298	3	SIZE (percona-server-5.7.28-31.tar.gz) = 84704254
4	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac	4	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
5	SIZE (boost_1_59_0.tar.gz) = 83709983	5	SIZE (boost_1_59_0.tar.gz) = 83709983

Lines 47-53 Link Here

(-)databases/percona57-server/files/patch-client_CMakeLists.txt (-1 / +1 lines)
47	@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas	47	@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas
48		48
49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50	TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)	50	TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient)
51	+ENDIF()	51	+ENDIF()
52		52
53	+IF(FALSE)	53	+IF(FALSE)




--- 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()




 ADD_SUBDIRECTORY(authentication_ldap)
   
 # Merge several convenience libraries into one big perconaserverclient
-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_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
 #

Return to bug 242649

Line 0 Link Here

(-)databases/percona57-client/files/patch-cmake_ssl.cmake (+22 lines)
	1	--- cmake/ssl.cmake.orig 2019-11-09 00:33:40.000000000 +1000
	2	+++ cmake/ssl.cmake 2019-12-13 23:08:53.686402000 +1000
	3	@@ -189,7 +189,8 @@ MACRO (MYSQL_CHECK_SSL)
	4	OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
	5	)
	6	ENDIF()
	7	- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
	8	+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
	9	+ IF(HAVE_TLS1_3_VERSION)
	10	ADD_DEFINITIONS(-DHAVE_TLSv13)
	11	SET(HAVE_TLSv13 1)
	12	IF(SOLARIS)
	13	@@ -198,8 +199,7 @@ MACRO (MYSQL_CHECK_SSL)
	14	ENDIF()
	15	IF(OPENSSL_INCLUDE_DIR AND
	16	OPENSSL_LIBRARY AND
	17	- CRYPTO_LIBRARY AND
	18	- OPENSSL_MAJOR_VERSION STREQUAL "1"
	19	+ CRYPTO_LIBRARY
	20	)
	21	SET(OPENSSL_FOUND TRUE)
	22	ELSE()

Line 0 Link Here

(-)databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc (+21 lines)
	1	--- mysys_ssl/my_crypt.cc.orig 2019-05-16 05:06:00 UTC
	2	+++ mysys_ssl/my_crypt.cc
	3	@@ -30,7 +30,7 @@
	4	#include <boost/move/unique_ptr.hpp>
	5	#include <boost/core/noncopyable.hpp>
	6
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
	9	#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
	10	#define RAND_OpenSSL() RAND_SSLeay()
	11	#endif
	12	@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
	13	MyEncryptionCTX::~MyEncryptionCTX()
	14	{
	15
	16	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
	17	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
	18	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
	19	EVP_CIPHER_CTX_cleanup(ctx);
	20	delete ctx;
	21	ERR_remove_thread_state(0);

Lines 2-8 Link Here

(-)databases/percona57-server/Makefile (-9 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= percona	4	PORTNAME?= percona
5	DISTVERSION= 5.7.27-30	5	DISTVERSION= 5.7.28-31
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \	8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
Lines 24-30 Link Here
24	SLAVEDIRS= databases/percona57-client \	24	SLAVEDIRS= databases/percona57-client \
25	databases/percona57-pam-for-mysql	25	databases/percona57-pam-for-mysql
26	USES= bison:build cmake:insource,noninja compiler:c11 \	26	USES= bison:build cmake:insource,noninja compiler:c11 \
27	cpe libedit localbase perl5 shebangfix	27	cpe libedit localbase perl5 shebangfix ssl
28		28
29	MY_DBDIR= /var/db/mysql	29	MY_DBDIR= /var/db/mysql
30	MY_SECDIR= /var/db/mysql_secure	30	MY_SECDIR= /var/db/mysql_secure
Lines 45-51 Link Here
45	-DINSTALL_MYSQLDATADIR="/var/db/mysql" \	45	-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
46	-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \	46	-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
47	-DINSTALL_MYSQLSHAREDIR="share/mysql" \	47	-DINSTALL_MYSQLSHAREDIR="share/mysql" \
48	-DINSTALL_MYSQLTESTDIR="${MY_TESTDIR}" \	48	-DINSTALL_MYSQLTESTDIR=0 \
49	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \	49	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
50	-DINSTALL_SBINDIR="libexec" \	50	-DINSTALL_SBINDIR="libexec" \
51	-DINSTALL_SCRIPTDIR="bin" \	51	-DINSTALL_SCRIPTDIR="bin" \
Lines 131-142 Link Here
131		131
132	.include <bsd.port.options.mk>	132	.include <bsd.port.options.mk>
133		133
134	.if !${SSL_DEFAULT:Mlibressl*}
135	MY_TESTDIR= "share/mysql/tests"
136	.else
137	MY_TESTDIR= ""
138	.endif
139
140	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057	134	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
141	SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""	135	SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
142	.else	136	.else

Lines 4-24 Link Here

(-)databases/percona57-server/files/patch-libmysql_CMakeLists.txt (-6 / +6 lines)
4	ADD_SUBDIRECTORY(authentication_ldap)	4	ADD_SUBDIRECTORY(authentication_ldap)
5		5
6	# Merge several convenience libraries into one big perconaserverclient	6	# Merge several convenience libraries into one big perconaserverclient
7	-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)	7	-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development)
8	+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)	8	+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
9		9	TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
		10
10	# Visual Studio users need debug static library for debug projects	11	# Visual Studio users need debug static library for debug projects
11	IF(MSVC)
12	@@ -271,7 +271,8 @@	12	@@ -271,7 +271,8 @@
13	# and link them together into shared library.	13	# and link them together into shared library.
14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS}	14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}	15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
16	- COMPONENT SharedLibraries)	16	- COMPONENT SharedLibraries)
17	+ COMPONENT SharedLibraries SKIP_INSTALL)	17	+ COMPONENT SharedLibraries SKIP_INSTALL)
		18	TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
18	+IF(FALSE)	19	+IF(FALSE)
19	IF(UNIX)	20	IF(UNIX)
20	# libtool compatability	21	# libtool compatability
21	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
22	@@ -327,6 +328,7 @@	22	@@ -327,6 +328,7 @@
23	# to initialize api_calls[] array in api_test.c	23	# to initialize api_calls[] array in api_test.c
24	#	24	#