From owner-svn-ports-all@freebsd.org Tue Jul 14 18:00:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FB4B36A57B; Tue, 14 Jul 2020 18:00:36 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B5pGD1Lcxz45tL; Tue, 14 Jul 2020 18:00:36 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 128649EC0; Tue, 14 Jul 2020 18:00:36 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06EI0ZgX099189; Tue, 14 Jul 2020 18:00:35 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06EI0Ytl099180; Tue, 14 Jul 2020 18:00:34 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202007141800.06EI0Ytl099180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Tue, 14 Jul 2020 18:00:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542227 - in head/databases: mysql80-client mysql80-server mysql80-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/databases: mysql80-client mysql80-server mysql80-server/files X-SVN-Commit-Revision: 542227 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2020 18:00:36 -0000 Author: joneum Date: Tue Jul 14 18:00:34 2020 New Revision: 542227 URL: https://svnweb.freebsd.org/changeset/ports/542227 Log: databases/mysql80-{client, server}: Update to latest release 8.0.21 Full Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html Submitted by: fluffy MFH: 2020Q3 Security: 0ed71663-c369-11ea-b53c-d4c9ef517024 Sponsored by: Netzkommune GmbH Added: head/databases/mysql80-server/files/patch-storage_temptable_include_temptable_lock_free_type.h (contents, props changed) Deleted: head/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h Modified: head/databases/mysql80-client/Makefile head/databases/mysql80-server/Makefile head/databases/mysql80-server/distinfo head/databases/mysql80-server/files/patch-cmake_plugin.cmake head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c head/databases/mysql80-server/files/patch-sql_mysqld.cc head/databases/mysql80-server/pkg-plist Modified: head/databases/mysql80-client/Makefile ============================================================================== --- head/databases/mysql80-client/Makefile Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-client/Makefile Tue Jul 14 18:00:34 2020 (r542227) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mysql80-server/Makefile ============================================================================== --- head/databases/mysql80-server/Makefile Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-server/Makefile Tue Jul 14 18:00:34 2020 (r542227) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.20 -PORTREVISION?= 1 +PORTVERSION= 8.0.21 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server Modified: head/databases/mysql80-server/distinfo ============================================================================== --- head/databases/mysql80-server/distinfo Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-server/distinfo Tue Jul 14 18:00:34 2020 (r542227) @@ -1,3 +1,3 @@ -TIMESTAMP = 1588248990 -SHA256 (mysql-boost-8.0.20.tar.gz) = b6ad1a09eb146fa913f1afc257bbed8ffab688e2d504fb8ddb652f69f551a9c1 -SIZE (mysql-boost-8.0.20.tar.gz) = 266282970 +TIMESTAMP = 1594631042 +SHA256 (mysql-boost-8.0.21.tar.gz) = 37231a123372a95f409857364dc1deb196b6f2c0b1fe60cc8382c7686b487f11 +SIZE (mysql-boost-8.0.21.tar.gz) = 278292192 Modified: head/databases/mysql80-server/files/patch-cmake_plugin.cmake ============================================================================== --- head/databases/mysql80-server/files/patch-cmake_plugin.cmake Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-server/files/patch-cmake_plugin.cmake Tue Jul 14 18:00:34 2020 (r542227) @@ -1,12 +1,27 @@ --- cmake/plugin.cmake.orig 2019-09-20 08:30:51 UTC +++ cmake/plugin.cmake -@@ -226,9 +226,6 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) +@@ -230,15 +230,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg) + + # For testing purposes, we need + # <...>/lib/plugin/debug/authentication_ldap_sasl_client.so +- IF(ARG_CLIENT_ONLY) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT Test) +- ELSE() +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) +- ENDIF() ++# IF(ARG_CLIENT_ONLY) ++# INSTALL_DEBUG_TARGET(${target} ++# DESTINATION ${INSTALL_PLUGINDIR}/debug ++# COMPONENT Test) ++# ELSE() ++# INSTALL_DEBUG_TARGET(${target} ++# DESTINATION ${INSTALL_PLUGINDIR}/debug ++# COMPONENT ${INSTALL_COMPONENT}) ++# ENDIF() ENDIF() ELSE() IF(WITHOUT_${plugin}) Modified: head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c ============================================================================== --- head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c Tue Jul 14 18:00:34 2020 (r542227) @@ -1,5 +1,5 @@ ---- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2019-09-20 08:30:51 UTC -+++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c +--- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc.orig 2019-09-20 08:30:51 UTC ++++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc @@ -329,6 +329,7 @@ error: return 1; } Modified: head/databases/mysql80-server/files/patch-sql_mysqld.cc ============================================================================== --- head/databases/mysql80-server/files/patch-sql_mysqld.cc Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-server/files/patch-sql_mysqld.cc Tue Jul 14 18:00:34 2020 (r542227) @@ -1,6 +1,6 @@ --- sql/mysqld.cc.orig 2019-09-20 08:30:51 UTC +++ sql/mysqld.cc -@@ -4818,7 +4818,7 @@ static int init_thread_environment() { +@@ -5109,7 +5109,7 @@ static int init_thread_environment() { static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; @@ -9,7 +9,7 @@ #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int -@@ -4854,12 +4854,14 @@ static void init_ssl() { +@@ -5143,12 +5143,14 @@ static void init_ssl() { } static int init_ssl_communication() { @@ -21,6 +21,6 @@ return 1; } +#endif /* LIBRESSL_VERSION_NUMBER */ - if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1; - - #if OPENSSL_VERSION_NUMBER < 0x10100000L + if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl, + &server_main_callback, opt_initialize)) + return 1; Added: head/databases/mysql80-server/files/patch-storage_temptable_include_temptable_lock_free_type.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-storage_temptable_include_temptable_lock_free_type.h Tue Jul 14 18:00:34 2020 (r542227) @@ -0,0 +1,17 @@ +--- storage/temptable/include/temptable/lock_free_type.h.orig 2020-06-16 16:31:03 UTC ++++ storage/temptable/include/temptable/lock_free_type.h +@@ -31,6 +31,14 @@ Lock-free type (selection) implementation. */ + + #include "storage/temptable/include/temptable/constants.h" + ++#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) ++/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorecctly for x86 ++ * https://llvm.org/bugs/show_bug.cgi?id=19355 ++ */ ++#undef ATOMIC_LLONG_LOCK_FREE ++#define ATOMIC_LLONG_LOCK_FREE 2 ++#endif ++ + namespace temptable { + + /** Enum class describing alignment-requirements. */ Modified: head/databases/mysql80-server/pkg-plist ============================================================================== --- head/databases/mysql80-server/pkg-plist Tue Jul 14 17:24:55 2020 (r542226) +++ head/databases/mysql80-server/pkg-plist Tue Jul 14 18:00:34 2020 (r542227) @@ -41,6 +41,7 @@ lib/mysql/mysqlrouter/rest_api.so lib/mysql/mysqlrouter/rest_metadata_cache.so lib/mysql/mysqlrouter/rest_router.so lib/mysql/mysqlrouter/rest_routing.so +lib/mysql/mysqlrouter/router_protobuf.so lib/mysql/mysqlrouter/routing.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so @@ -59,6 +60,7 @@ lib/mysql/plugin/component_pfs_example.so lib/mysql/plugin/component_pfs_example_component_population.so lib/mysql/plugin/component_test_audit_api_message.so lib/mysql/plugin/component_test_backup_lock_service.so +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