--- ../percona57-server/Makefile 2019-12-06 19:00:36.000000000 +0300 +++ percona57-server/Makefile 2019-12-06 21:16:09.814418000 +0300 @@ -2,7 +2,7 @@ # $FreeBSD: head/databases/percona57-server/Makefile 519153 2019-12-06 16:00:36Z fluffy $ 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 \ --- ../percona57-server/distinfo 2019-12-06 19:00:36.000000000 +0300 +++ percona57-server/distinfo 2019-12-06 21:16:16.424356000 +0300 @@ -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 = 1575656176 +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 --- ../percona57-server/files/patch-client_CMakeLists.txt 2017-01-10 21:54:32.000000000 +0300 +++ percona57-server/files/patch-client_CMakeLists.txt 2019-12-06 21:22:20.620013000 +0300 @@ -1,6 +1,6 @@ --- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC +++ client/CMakeLists.txt -@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil +@@ -42,8 +42,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) @@ -9,7 +9,7 @@ ## We will need libeay32.dll and ssleay32.dll when running client executables. COPY_OPENSSL_DLLS(copy_openssl_client) -@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -48,11 +46,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -23,7 +23,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas +@@ -70,6 +70,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient) @@ -31,7 +31,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon +@@ -82,10 +83,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) @@ -44,10 +44,10 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) ADD_COMPILE_FLAGS( mysqlbinlog.cc -@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas +@@ -102,9 +104,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) @@ -57,7 +57,7 @@ IF(UNIX AND NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_install_db -@@ -112,9 +118,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) +@@ -117,9 +123,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) ENDIF() @@ -69,7 +69,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -123,11 +131,6 @@ ENDIF(WIN32) +@@ -128,11 +136,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( mysql_plugin --- ../percona57-server/files/patch-libmysql_CMakeLists.txt 2018-03-31 21:26:51.000000000 +0300 +++ percona57-server/files/patch-libmysql_CMakeLists.txt 2019-12-06 21:24:33.958866000 +0300 @@ -1,25 +1,25 @@ --- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC +++ libmysql/CMakeLists.txt -@@ -235,7 +235,7 @@ +@@ -266,7 +266,7 @@ 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 @@ +@@ -312,7 +312,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) +IF(FALSE) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) IF(UNIX) # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -327,6 +328,7 @@ +@@ -369,6 +370,7 @@ # to initialize api_calls[] array in api_test.c # SET(CLIENT_API_FUNCTION_LIST "") --- ../percona57-server/files/patch-sql_mysqld.cc 2019-12-06 19:00:36.000000000 +0300 +++ percona57-server/files/patch-sql_mysqld.cc 2019-12-06 21:26:10.880968000 +0300 @@ -1,6 +1,6 @@ --- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC +++ sql/mysqld.cc -@@ -1517,6 +1517,16 @@ static void clean_up_mutexes() +@@ -1524,6 +1524,16 @@ static void clean_up_mutexes() ****************************************************************************/ /* Initialise proxy protocol. */ @@ -17,15 +17,15 @@ static void set_proxy() { const char *p; -@@ -3678,6 +3688,7 @@ static int init_ssl() +@@ -3682,6 +3692,7 @@ static int init_ssl() + 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() +@@ -3691,7 +3702,9 @@ static int init_ssl() " Disabling FIPS."); FIPS_mode_set(0); }