Update to 5.7.28

Changelog: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-28.html

PR:		241920
Approved by:	mmokhi (maintainer, implicit)
Sponsored by:	Netzkommune GmbH

5 files changed, 28 insertions, 30 deletions

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index c0f505a89dc4..764fd78ddf37 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.7.27
+PORTVERSION=	5.7.28
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.7
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index 19e08a49c783..d82e014147b2 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565043969
-SHA256 (mysql-boost-5.7.27.tar.gz) = 036ab46a8a1216cfc1e87374bd1cba12e2208c02cf328a31851be7e1c7f57a2b
-SIZE (mysql-boost-5.7.27.tar.gz) = 51436383
+TIMESTAMP = 1574613665
+SHA256 (mysql-boost-5.7.28.tar.gz) = f16399315212117c08f9bdf8a0d682728b2ce82d691bcfbf25a770f413b6f2da
+SIZE (mysql-boost-5.7.28.tar.gz) = 51409668
diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt
index 03549e41d244..410731e9b81f 100644
--- a/databases/mysql57-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-client_CMakeLists.txt
@@ -1,15 +1,12 @@
---- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ client/CMakeLists.txt
-@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+--- client/CMakeLists.txt.orig	2019-09-27 09:00:15.000000000 +0200
++++ client/CMakeLists.txt	2019-11-24 17:42:52.649644000 +0100
+@@ -38,17 +38,17 @@
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
 -## Subdirectory for mysqlpump code.
 -ADD_SUBDIRECTORY(dump)
  
- ## 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)
  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -23,7 +20,7 @@
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
+@@ -69,6 +69,7 @@
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
@@ -31,7 +28,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -81,10 +82,12 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -44,15 +41,15 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -101,6 +104,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -116,9 +120,11 @@
    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
  ENDIF()
  
@@ -64,7 +61,7 @@
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -123,11 +129,6 @@ ENDIF(WIN32)
+@@ -127,11 +133,6 @@
  
  SET_TARGET_PROPERTIES (
    mysql_plugin
diff --git a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
index 410c8779003a..2dfbc9d5acdd 100644
--- a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
@@ -1,25 +1,26 @@
---- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ libmysql/CMakeLists.txt
-@@ -235,7 +235,7 @@ MESSAGE(STATUS
+--- libmysql/CMakeLists.txt.orig	2019-09-27 09:00:15.000000000 +0200
++++ libmysql/CMakeLists.txt	2019-11-24 17:45:54.008082000 +0100
+@@ -266,7 +266,7 @@
  ADD_SUBDIRECTORY(authentication_ldap)
- 
+   
  # Merge several convenience libraries into one big mysqlclient
--MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)
-+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL)
+-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
+ TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED)
+@@ -312,8 +312,9 @@
    # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${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)
-@@ -313,6 +314,7 @@ ENDIF()
+@@ -369,6 +370,7 @@
  # to initialize api_calls[] array in api_test.c
  #
  SET(CLIENT_API_FUNCTION_LIST "")
diff --git a/databases/mysql57-server/files/patch-sql_mysqld.cc b/databases/mysql57-server/files/patch-sql_mysqld.cc
index 64f8899c8b25..75a57ce8688a 100644
--- a/databases/mysql57-server/files/patch-sql_mysqld.cc
+++ b/databases/mysql57-server/files/patch-sql_mysqld.cc
@@ -1,9 +1,9 @@
---- sql/mysqld.cc.orig	2018-06-08 11:56:29.000000000 +0200
-+++ sql/mysqld.cc	2018-08-11 13:38:48.782595000 +0200
-@@ -3408,7 +3408,7 @@
+--- sql/mysqld.cc.orig	2019-09-27 09:00:15.000000000 +0200
++++ sql/mysqld.cc	2019-11-24 17:47:52.395539000 +0100
+@@ -3419,7 +3419,7 @@
+ static int init_ssl()
  {
  #ifdef HAVE_OPENSSL
- #ifndef HAVE_YASSL
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
    CRYPTO_malloc_init();