From 6a9a1171e6954e63ac9c00ef913b4f7167b1947d Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Fri, 6 Dec 2019 16:00:36 +0000 Subject: databases/percona57-{server,client} update to 5.7.27-30 release percona57-client: - Install compat pkgconfig symlink as well as it done for libs (many packages still search for mysqlclient.pc only) percona57-server: - Proper use system lz4/zstd libs for rocksdb engine - Declare system libevent to use instead of bundled one - Stop pollute libdata/pkgconfig dir with unneeded .pc file - Unbreak build with DEFAULT_VERSIONS+=ssl=libressl PR: 239347 Submitted by: fluffy [cleanups], Igor Zabelin [update] Approved by: maintainer (timeout, >3 months) --- .../percona57-server/files/patch-sql_mysqld.cc | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'databases/percona57-server/files/patch-sql_mysqld.cc') diff --git a/databases/percona57-server/files/patch-sql_mysqld.cc b/databases/percona57-server/files/patch-sql_mysqld.cc index a3ac78e28867..ce4d118965a5 100644 --- a/databases/percona57-server/files/patch-sql_mysqld.cc +++ b/databases/percona57-server/files/patch-sql_mysqld.cc @@ -1,6 +1,6 @@ --- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC +++ sql/mysqld.cc -@@ -1480,6 +1480,16 @@ static void clean_up_mutexes() +@@ -1517,6 +1517,16 @@ static void clean_up_mutexes() ****************************************************************************/ /* Initialise proxy protocol. */ @@ -17,3 +17,22 @@ 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(); -- cgit v1.2.3