Attachment #207316 for bug #239347

Lines 49-53 Link Here

(-)percona57-client/Makefile (+1 lines)
49	${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a	49	${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
50	${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so	50	${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
51	${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20	51	${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20
		52	${LN} -s perconaserverclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mysqlclient.pc
52		53
53	.include "${MASTERDIR}/Makefile"	54	.include "${MASTERDIR}/Makefile"




 
 IF(NOT WITHOUT_SERVER)
   INSTALL(FILES
@@ -326,6 +326,8 @@
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " )
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
         ELSE()
           SET(${var} "${${var}}-l${lib} " )
         ENDIF()
@@ -417,25 +424,7 @@
   # On Unix, most of the files end up in the bin directory

Lines 128-133 Link Here

(-)percona57-client/pkg-plist (+1 lines)
128	lib/mysql/libperconaserverclient.so	128	lib/mysql/libperconaserverclient.so
129	lib/mysql/libperconaserverclient.so.20	129	lib/mysql/libperconaserverclient.so.20
130	%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so	130	%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
		131	libdata/pkgconfig/mysqlclient.pc
131	libdata/pkgconfig/perconaserverclient.pc	132	libdata/pkgconfig/perconaserverclient.pc
132	man/man1/comp_err.1.gz	133	man/man1/comp_err.1.gz
133	man/man1/mysql.1.gz	134	man/man1/mysql.1.gz




# $FreeBSD: head/databases/percona57-server/Makefile 507877 2019-08-02 13:30:40Z jbeich $

PORTNAME?=	percona
DISTVERSION=	5.7.27-30
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
		SF/boost/boost/1.59.0:boost

LICENSE?=	GPLv2+

LIB_DEPENDS=	libevent.so:devel/libevent \
		liblz4.so:archivers/liblz4 \
		libzstd.so:archivers/zstd

SLAVEDIRS=	databases/percona57-client \
		databases/percona57-pam-for-mysql

		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DWITH_UNIT_TESTS=0 \
		-DWITH_EDITLINE=system \
		-DWITH_LIBEVENT=system \
		-DWITH_LIBWRAP=0 \
		-DWITH_LZ4=system \
		-DWITH_ZLIB=system \
		-DWITH_ZSTD=system \
		-DINSTALL_MYSQLTESTDIR=0 \
		-DWITH_BOOST="${WRKDIR}/boost_1_59_0"


Lines 1-5 Link Here

(-)percona57-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1560188655	1	TIMESTAMP = 1567963686
2	SHA256 (percona-server-5.7.26-29.tar.gz) = 0deb6d8a6eb910286a585c60beecd5fb8ce38fc2a5134adf45e418efbe4ed6b5	2	SHA256 (percona-server-5.7.27-30.tar.gz) = b50dff3d222c6444468ff328c652df24a81103627c9da2fa98ee878b8f65a226
3	SIZE (percona-server-5.7.26-29.tar.gz) = 84327421	3	SIZE (percona-server-5.7.27-30.tar.gz) = 84672298
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




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




@@ -332,6 +332,8 @@
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " )
+        ELSEIF(lib STREQUAL "-pthread")
+          SET(${var} "${${var}}-pthread " )
         ELSE()
           SET(${var} "${${var}}-l${lib} " )
         ENDIF()
@@ -419,7 +421,6 @@
 

       mysqldumpslow
       mysqld_multi
       mysqld_safe
@@ -443,7 +443,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
     ESCAPE_QUOTES @ONLY)
 
-  IF(INSTALL_PKGCONFIGDIR)
+  IF(FALSE)
     MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
     INSTALL(FILES
       ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
@@ -464,7 +464,7 @@
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)




--- sql/auth/sha2_password_common.cc.orig	2019-05-16 05:06:00 UTC
+++ sql/auth/sha2_password_common.cc
@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
     DBUG_RETURN(true);
   }
   m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
   EVP_MD_CTX_cleanup(md_context);
 #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   EVP_MD_CTX_reset(md_context);




--- sql/mysqld.cc.orig	2016-11-27 19:44:54 UTC
+++ sql/mysqld.cc
@@ -1517,6 +1517,16 @@ static void clean_up_mutexes()
 ****************************************************************************/
 
 /* Initialise proxy protocol. */

 static void set_proxy()
 {
   const char *p;
@@ -3678,6 +3688,7 @@ static int init_ssl()
 {
 #ifdef HAVE_OPENSSL
 #ifndef HAVE_YASSL
+#ifndef LIBRESSL_VERSION_NUMBER
   int fips_mode= FIPS_mode();
   if (fips_mode != 0)
   {
@@ -3687,7 +3698,9 @@ static int init_ssl()
         " Disabling FIPS.");
     FIPS_mode_set(0);
   }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+    defined(LIBRESSL_VERSION_NUMBER)
   CRYPTO_malloc_init();
 #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
   OPENSSL_malloc_init();




--- storage/rocksdb/CMakeLists.txt.orig	2019-05-16 05:06:00 UTC
+++ storage/rocksdb/CMakeLists.txt
@@ -119,38 +119,11 @@ EXECUTE_PROCESS(
 # split the list into lines
 STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT})
 
-# add bundled compression code
-SET(ROCKSDB_LIB_SOURCES
-  ${ROCKSDB_LIB_SOURCES}
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c
-)
-
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common
-  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder
 )
 
 ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4
@@ -183,7 +156,7 @@ SET(ROCKSDB_SOURCES
   ${ROCKSDB_LIB_SOURCES}
 )
 
-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt")
+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd")
 
 MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
   LINK_LIBRARIES ${rocksdb_static_libs}

Added Link Here

(-)percona57-server/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)

Lines 149-155 Link Here

(-)percona57-server/pkg-plist (-1 lines)
149	lib/mysql/plugin/udf_example.so	149	lib/mysql/plugin/udf_example.so
150	lib/mysql/plugin/validate_password.so	150	lib/mysql/plugin/validate_password.so
151	lib/mysql/plugin/version_token.so	151	lib/mysql/plugin/version_token.so
152	libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
153	man/man1/myisamchk.1.gz	152	man/man1/myisamchk.1.gz
154	man/man1/myisam_ftdump.1.gz	153	man/man1/myisam_ftdump.1.gz
155	man/man1/myisamlog.1.gz	154	man/man1/myisamlog.1.gz

Return to bug 239347

Lines 34-47 Link Here

(-)percona57-client/files/patch-scripts_CMakeLists.txt (-3 / +3 lines)
34		34
35	IF(NOT WITHOUT_SERVER)	35	IF(NOT WITHOUT_SERVER)
36	INSTALL(FILES	36	INSTALL(FILES
37	@@ -332,6 +337,8 @@	37	@@ -326,6 +326,8 @@
38	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	38	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
39	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	39	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
40	SET(${var} "${${var}}-l${lib} " )	40	SET(${var} "${${var}}-l${lib} " )
41	+ ELSEIF(lib STREQUAL "-pthread")	41	+ ELSEIF(lib STREQUAL "-pthread")
42	+ SET(${var} "${${var}}-pthread " )	42	+ SET(${var} "${${var}}-pthread " )
43	ELSE()	43	ELSE()
44	SET(${var} "${${var}}-l${lib} " )	44	SET(${var} "${${var}}-l${lib} " )
45	ENDIF()	45	ENDIF()
46	@@ -417,25 +424,7 @@	46	@@ -417,25 +424,7 @@
47	# On Unix, most of the files end up in the bin directory	47	# On Unix, most of the files end up in the bin directory

Lines 2-9 Link Here

(-)percona57-server/Makefile (-3 / +6 lines)
2	# $FreeBSD: head/databases/percona57-server/Makefile 507877 2019-08-02 13:30:40Z jbeich $	2	# $FreeBSD: head/databases/percona57-server/Makefile 507877 2019-08-02 13:30:40Z jbeich $
3		3
4	PORTNAME?= percona	4	PORTNAME?= percona
5	DISTVERSION= 5.7.26-29	5	DISTVERSION= 5.7.27-30
6	PORTREVISION?= 2	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
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 \
9	SF/boost/boost/1.59.0:boost	9	SF/boost/boost/1.59.0:boost
Lines 18-24 Link Here
18	LICENSE?= GPLv2+	18	LICENSE?= GPLv2+
19		19
20	LIB_DEPENDS= libevent.so:devel/libevent \	20	LIB_DEPENDS= libevent.so:devel/libevent \
21	liblz4.so:archivers/liblz4	21	liblz4.so:archivers/liblz4 \
		22	libzstd.so:archivers/zstd
22		23
23	SLAVEDIRS= databases/percona57-client \	24	SLAVEDIRS= databases/percona57-client \
24	databases/percona57-pam-for-mysql	25	databases/percona57-pam-for-mysql
Lines 53-61 Link Here
53	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	54	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
54	-DWITH_UNIT_TESTS=0 \	55	-DWITH_UNIT_TESTS=0 \
55	-DWITH_EDITLINE=system \	56	-DWITH_EDITLINE=system \
		57	-DWITH_LIBEVENT=system \
56	-DWITH_LIBWRAP=0 \	58	-DWITH_LIBWRAP=0 \
57	-DWITH_LZ4=system \	59	-DWITH_LZ4=system \
58	-DWITH_ZLIB=system \	60	-DWITH_ZLIB=system \
		61	-DWITH_ZSTD=system \
59	-DINSTALL_MYSQLTESTDIR=0 \	62	-DINSTALL_MYSQLTESTDIR=0 \
60	-DWITH_BOOST="${WRKDIR}/boost_1_59_0"	63	-DWITH_BOOST="${WRKDIR}/boost_1_59_0"
61		64

Added Link Here

(-)percona57-server/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 3-13 Link Here

(-)percona57-server/files/patch-scripts_CMakeLists.txt (-2 / +11 lines)
3	@@ -332,6 +332,8 @@	3	@@ -332,6 +332,8 @@
4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")	5	STRING(REGEX REPLACE "^lib" "" lib "${lib}")
6	SET(${var} "${${var}}-l${lib} " )	6	SET(${var} "${${var}}-l${lib} " )
7	+ ELSEIF(lib STREQUAL "-pthread")	7	+ ELSEIF(lib STREQUAL "-pthread")
8	+ SET(${var} "${${var}}-pthread " )	8	+ SET(${var} "${${var}}-pthread " )
9	ELSE()	9	ELSE()
10	SET(${var} "${${var}}-l${lib} " )	10	SET(${var} "${${var}}-l${lib} " )
11	ENDIF()	11	ENDIF()
12	@@ -419,7 +421,6 @@	12	@@ -419,7 +421,6 @@
13		13
Lines 25-30 Link Here
25	mysqldumpslow	25	mysqldumpslow
26	mysqld_multi	26	mysqld_multi
27	mysqld_safe	27	mysqld_safe
		28	@@ -443,7 +443,7 @@
		29	${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
		30	ESCAPE_QUOTES @ONLY)
		31
		32	- IF(INSTALL_PKGCONFIGDIR)
		33	+ IF(FALSE)
		34	MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
		35	INSTALL(FILES
		36	${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
28	@@ -464,7 +464,7 @@	37	@@ -464,7 +464,7 @@
29	FOREACH(file ${BIN_SCRIPTS})	38	FOREACH(file ${BIN_SCRIPTS})
30	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)	39	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)

Added Link Here

(-)percona57-server/files/patch-sql_auth_sha2__password__common.cc (+12 lines)
1	--- sql/auth/sha2_password_common.cc.orig 2019-05-16 05:06:00 UTC
2	+++ sql/auth/sha2_password_common.cc
3	@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
4	DBUG_RETURN(true);
5	}
6	m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
7	-#if defined(HAVE_WOLFSSL) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if defined(HAVE_WOLFSSL) \|\| OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
9	+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
10	EVP_MD_CTX_cleanup(md_context);
11	#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
12	EVP_MD_CTX_reset(md_context);

Lines 1-6 Link Here

(-)percona57-server/files/patch-sql_mysqld.cc (-1 / +20 lines)
1	--- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC	1	--- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -1480,6 +1480,16 @@ static void clean_up_mutexes()	3	@@ -1517,6 +1517,16 @@ static void clean_up_mutexes()
4	****************************************************************************/	4	****************************************************************************/
5		5
6	/* Initialise proxy protocol. */	6	/* Initialise proxy protocol. */
Lines 17-19 Link Here
17	static void set_proxy()	17	static void set_proxy()
18	{	18	{
19	const char *p;	19	const char *p;
		20	@@ -3678,6 +3688,7 @@ static int init_ssl()
		21	{
		22	#ifdef HAVE_OPENSSL
		23	#ifndef HAVE_YASSL
		24	+#ifndef LIBRESSL_VERSION_NUMBER
		25	int fips_mode= FIPS_mode();
		26	if (fips_mode != 0)
		27	{
		28	@@ -3687,7 +3698,9 @@ static int init_ssl()
		29	" Disabling FIPS.");
		30	FIPS_mode_set(0);
		31	}
		32	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
		33	+#endif
		34	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| \
		35	+ defined(LIBRESSL_VERSION_NUMBER)
		36	CRYPTO_malloc_init();
		37	#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
		38	OPENSSL_malloc_init();

Added Link Here

(-)percona57-server/files/patch-storage_rocksdb_CMakeLists.txt (+50 lines)
1	--- storage/rocksdb/CMakeLists.txt.orig 2019-05-16 05:06:00 UTC
2	+++ storage/rocksdb/CMakeLists.txt
3	@@ -119,38 +119,11 @@ EXECUTE_PROCESS(
4	# split the list into lines
5	STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT})
6
7	-# add bundled compression code
8	-SET(ROCKSDB_LIB_SOURCES
9	- ${ROCKSDB_LIB_SOURCES}
10	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c
11	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c
12	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c
13	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c
14	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c
15	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c
16	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c
17	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c
18	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c
19	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c
20	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c
21	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c
22	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c
23	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c
24	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c
25	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c
26	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c
27	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c
28	-)
29	-
30	INCLUDE_DIRECTORIES(
31	${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
32	${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
33	${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb
34	${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src
35	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib
36	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib
37	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common
38	- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder
39	)
40
41	ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4
42	@@ -183,7 +156,7 @@ SET(ROCKSDB_SOURCES
43	${ROCKSDB_LIB_SOURCES}
44	)
45
46	-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt")
47	+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd")
48
49	MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
50	LINK_LIBRARIES ${rocksdb_static_libs}