summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mysql57-client/Makefile2
-rw-r--r--databases/mysql57-server/Makefile4
-rw-r--r--databases/mysql57-server/distinfo6
-rw-r--r--databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt22
4 files changed, 18 insertions, 16 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 9bdfe92e7ba9..64ffb1229539 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index d0d0fb4bb50b..5aa8df1606d2 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.7.28
-PORTREVISION= 2
+PORTVERSION= 5.7.29
+PORTREVISION= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index d82e014147b2..6b8608d1f113 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574613665
-SHA256 (mysql-boost-5.7.28.tar.gz) = f16399315212117c08f9bdf8a0d682728b2ce82d691bcfbf25a770f413b6f2da
-SIZE (mysql-boost-5.7.28.tar.gz) = 51409668
+TIMESTAMP = 1579122971
+SHA256 (mysql-boost-5.7.29.tar.gz) = 00f514124de2bad1ba7b380cbbd46e316cae7fc7bc3a5621456cabf352f27978
+SIZE (mysql-boost-5.7.29.tar.gz) = 51417554
diff --git a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
index d92c872a48e4..109d4cc3c4d4 100644
--- a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
@@ -1,16 +1,18 @@
---- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-10-04 05:48:22 UTC
-+++ libmysql/authentication_ldap/CMakeLists.txt
-@@ -106,11 +106,13 @@ ELSE()
+--- libmysql/authentication_ldap/CMakeLists.txt.orig 2020-01-16 09:39:09.585385000 +0100
++++ libmysql/authentication_ldap/CMakeLists.txt 2020-01-16 09:41:59.054985000 +0100
+@@ -47,6 +47,7 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H)
+ CROAK_AND_RETURN("Required LBER header is missing.")
ENDIF()
- MESSAGE(STATUS "SASL_LIBRARY = ${SASL_LIBRARY}")
+IF (WITH_AUTHENTICATION_LDAP)
MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
- auth_ldap_sasl_client.cc log_client.cc
- LINK_LIBRARIES ${SASL_LIBRARY}
- CLIENT_ONLY MODULE_ONLY
- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+ auth_ldap_sasl_client.cc
+ log_client.cc
+@@ -57,6 +58,7 @@ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
+ CLIENT_ONLY
+ MODULE_ONLY
+ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
+ENDIF ()
- IF(WIN32)
- GET_FILENAME_COMPONENT(SASL_DLL_NAME ${SASL_LIBRARY_DLL} NAME)
+ # The plugin may need symbols which are not loaded by the client.
+ IF(STATIC_SASL_LIBRARY)