git: ee47d22c17af - 2021Q3 - databases/mysql80-*: update to 8.0.26
Bernard Spil
brnrd at FreeBSD.org
Sun Aug 29 09:54:47 UTC 2021
The branch 2021Q3 has been updated by brnrd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ee47d22c17af06a9f4d743ebe68e483277915272
commit ee47d22c17af06a9f4d743ebe68e483277915272
Author: Jochen Neumeister <joneum at FreeBSD.org>
AuthorDate: 2021-08-26 17:49:55 +0000
Commit: Bernard Spil <brnrd at FreeBSD.org>
CommitDate: 2021-08-29 09:53:36 +0000
databases/mysql80-*: update to 8.0.26
Release notes: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-26.html
Sponsored by: Netzkommune GmbH
Security: 38a4a043-e937-11eb-9b84-d4c9ef517024
(cherry picked from commit 84cc7ae5a0d131c991067d32bd0fae872a039cb9)
---
databases/mysql80-client/Makefile | 1 +
databases/mysql80-server/Makefile | 4 +-
databases/mysql80-server/distinfo | 6 +--
.../files/patch-libmysql_CMakeLists.txt | 49 +++++++++++-----------
databases/mysql80-server/files/patch-sql_binlog.cc | 24 -----------
databases/mysql80-server/pkg-plist | 4 ++
6 files changed, 34 insertions(+), 54 deletions(-)
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 7f99fd15fc3f..1d43316113a1 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -1,6 +1,7 @@
# Created by: "Mahdi Mokhtari <mokhi64 at gmail.com>"
PORTNAME= mysql
+PORTREVISION= 0
PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 62820eab44c1..e0b626af476d 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -1,8 +1,8 @@
# Created by: Mahdi Mokhtari <mokhi64 at gmail.com>
PORTNAME?= mysql
-PORTVERSION= 8.0.25
-PORTREVISION?= 1
+PORTVERSION= 8.0.26
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index d8b53adf2580..6b639dd456da 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621139131
-SHA256 (mysql-boost-8.0.25.tar.gz) = 93c5f57cbd69573a8d9798725edec52e92830f70c398a1afaaea2227db331728
-SIZE (mysql-boost-8.0.25.tar.gz) = 290265324
+TIMESTAMP = 1628702352
+SHA256 (mysql-boost-8.0.26.tar.gz) = 209442c1001c37bcbc001845e1dc623d654cefb555b47b528742a53bf21c0b4d
+SIZE (mysql-boost-8.0.26.tar.gz) = 291285918
diff --git a/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
index d9cd7cd37249..bfc8693d6480 100644
--- a/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+--- libmysql/CMakeLists.txt.orig 2021-07-01 07:53:49 UTC
+++ libmysql/CMakeLists.txt
-@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
+@@ -197,6 +197,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
)
ENDIF()
@@ -12,30 +12,33 @@
#
# Include protocol tracing infrastructure and the test
# trace plugin if enabled by build options.
-@@ -242,11 +247,18 @@ IF(WIN32)
+@@ -270,8 +275,15 @@ IF(WIN32)
LIST(APPEND LIBS_TO_MERGE auth_win_client)
ENDIF()
--# LDAP authentication SASL client plugin
+-# LDAP authentication SASL client plug-in
-ADD_SUBDIRECTORY(authentication_ldap)
+IF(WITHOUT_CLIENTLIBS)
+ # Merge several convenience libraries into one big mysqlclient
-+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE}
++ COMPONENT Development
++ SKIP_INSTALL)
+ELSE(WITHOUT_CLIENTLIBS)
+ # LDAP authentication SASL client plugin
+ MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
+ ADD_SUBDIRECTORY(authentication_ldap)
--# Merge several convenience libraries into one big mysqlclient
--MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
-+ # Merge several convenience libraries into one big mysqlclient
-+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
+ # authentication kerberos client plug-in
+ ADD_SUBDIRECTORY(authentication_kerberos)
+@@ -281,6 +293,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
+ COMPONENT Development
+ LINK_LIBRARIES ${LIBS_TO_LINK}
+ )
+ENDIF(WITHOUT_CLIENTLIBS)
-+
- TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
# Visual Studio users need debug static library for debug projects
-@@ -281,12 +291,22 @@ ENDIF()
+ IF(MSVC)
+@@ -327,17 +340,27 @@ ENDIF()
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
@@ -45,7 +48,7 @@
${CLIENT_API_FUNCTIONS}
${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
${CLIENT_API_NONBLOCKING_FUNCTIONS}
-+ COMPONENT SharedLibraries
+ COMPONENT SharedLibraries
+ SKIP_INSTALL )
+ELSE(WITHOUT_CLIENTLIBS)
+MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
@@ -53,17 +56,13 @@
+ ${CLIENT_API_FUNCTIONS}
+ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+ ${CLIENT_API_NONBLOCKING_FUNCTIONS}
- COMPONENT SharedLibraries)
++ COMPONENT SharedLibraries
+ LINK_LIBRARIES ${LIBS_TO_LINK}
+ ${UNIX_OUTPUT_NAME}
+ ${UNIX_SOVERSION}
+ ${UNIX_VERSION}
+ )
+ENDIF(WITHOUT_CLIENTLIBS)
- TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
-
- IF(WIN32)
-@@ -300,7 +320,7 @@ ENDIF()
- IF(UNIX)
- # libtool compatability
-- IF(FREEBSD OR APPLE)
-+ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
- SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
- ELSE()
- SET(OS_SHARED_LIB_VERSION
+ IF(LINUX_STANDALONE AND KERBEROS_CUSTOM_LIBRARY)
+ ADD_DEPENDENCIES(libmysql ${kerberos_target})
diff --git a/databases/mysql80-server/files/patch-sql_binlog.cc b/databases/mysql80-server/files/patch-sql_binlog.cc
deleted file mode 100644
index 6c51f7bf8a61..000000000000
--- a/databases/mysql80-server/files/patch-sql_binlog.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- sql/binlog.cc.orig 2021-03-22 08:44:50 UTC
-+++ sql/binlog.cc
-@@ -9156,8 +9156,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(
-
- char *missing_gtids = NULL;
- char *slave_executed_gtids = NULL;
-- gtid_missing.to_string(&missing_gtids, NULL);
-- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+ gtid_missing.to_string(&missing_gtids);
-+ slave_executed_gtid_set->to_string(&slave_executed_gtids);
-
- /*
- Log the information about the missing purged GTIDs to the error log.
-@@ -9210,8 +9210,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(
- Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
- gtid_missing.add_gtid_set(slave_executed_gtid_set);
- gtid_missing.remove_gtid_set(previous_gtid_set);
-- gtid_missing.to_string(&missing_gtids, NULL);
-- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+ gtid_missing.to_string(&missing_gtids);
-+ slave_executed_gtid_set->to_string(&slave_executed_gtids);
-
- String tmp_uuid;
-
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index fea5ce5c8a63..880259841bf0 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -76,6 +76,7 @@ lib/mysql/plugin/component_test_component_deinit.so
lib/mysql/plugin/component_test_host_application_signal.so
lib/mysql/plugin/component_test_mysql_current_thread_reader.so
lib/mysql/plugin/component_test_mysql_runtime_error.so
+lib/mysql/plugin/component_test_mysql_system_variable_set.so
lib/mysql/plugin/component_test_pfs_notification.so
lib/mysql/plugin/component_test_pfs_resource_group.so
lib/mysql/plugin/component_test_status_var_service.so
@@ -91,6 +92,7 @@ lib/mysql/plugin/component_test_sys_var_service_int.so
lib/mysql/plugin/component_test_sys_var_service_same.so
lib/mysql/plugin/component_test_sys_var_service_str.so
lib/mysql/plugin/component_test_system_variable_source.so
+lib/mysql/plugin/component_test_table_access.so
lib/mysql/plugin/component_test_udf_registration.so
@comment lib/mysql/plugin/component_test_udf_services.so
lib/mysql/plugin/component_udf_reg_3_func.so
@@ -149,7 +151,9 @@ lib/mysql/plugin/replication_observers_example_plugin.so
lib/mysql/plugin/rewrite_example.so
lib/mysql/plugin/rewriter.so
lib/mysql/plugin/semisync_master.so
+lib/mysql/plugin/semisync_replica.so
lib/mysql/plugin/semisync_slave.so
+lib/mysql/plugin/semisync_source.so
lib/mysql/plugin/test_security_context.so
lib/mysql/plugin/test_services_host_application_signal.so
lib/mysql/plugin/test_services_plugin_registry.so
More information about the dev-commits-ports-branches
mailing list