diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 32d382f0c8f9..b513106b2806 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -19,7 +19,7 @@ CONFLICTS_INSTALL= mysql8[1-9]-client \ mariadb[0-9][0-9]-client \ percona[0-9][0-9]-client -CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 -DWITH_AUTHENTICATION_FIDO=ON +CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 -DWITH_AUTHENTICATION_FIDO=ON -DWITH_FIDO=bundled USE_LDCONFIG+= ${PREFIX}/lib/mysql @@ -31,7 +31,7 @@ CLIENT_ONLY= yes OPTIONS_GROUP+= PLUGINS PLUGINS_DESC= Default Client Plugins -OPTIONS_GROUP_PLUGINS= SASLCLIENT FIDO +OPTIONS_GROUP_PLUGINS= SASLCLIENT FIDO SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 13db1af59e53..f65fda8334e2 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -1,7 +1,7 @@ # Created by: Mahdi Mokhtari PORTNAME?= mysql -PORTVERSION= 8.0.27 +PORTVERSION= 8.0.28 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 @@ -86,7 +86,8 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_PROTOBUF=system \ -DWITH_SSL=system \ -DBUILD_BUNDLED_ZLIB=0 \ - -DBUILD_BUNDLED_LZ4=0 + -DBUILD_BUNDLED_LZ4=0 \ + -DWITH_FIDO=bundled # The Mroonga, RocksDB, and TokuDB storage engines are disabled. # Mroonga is only buildable on little endian archs. diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo index 55029d0a7a90..d74c18256ce7 100644 --- a/databases/mysql80-server/distinfo +++ b/databases/mysql80-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635786797 -SHA256 (mysql-boost-8.0.27.tar.gz) = 74b5bc6ff88fe225560174a24b7d5ff139f4c17271c43000dbcf3dcc9507b3f9 -SIZE (mysql-boost-8.0.27.tar.gz) = 292184025 +TIMESTAMP = 1642804921 +SHA256 (mysql-boost-8.0.28.tar.gz) = 6dd0303998e70066d36905bd8fef1c01228ea182dbfbabc6c22ebacdbf8b5941 +SIZE (mysql-boost-8.0.28.tar.gz) = 298044027 diff --git a/databases/mysql80-server/files/patch-ssl__init__callback.cc b/databases/mysql80-server/files/patch-ssl__init__callback.cc deleted file mode 100644 index 2d80cf5e6c78..000000000000 --- a/databases/mysql80-server/files/patch-ssl__init__callback.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- sql/ssl_init_callback.cc.orig 2020-12-11 07:42:20 UTC -+++ sql/ssl_init_callback.cc -@@ -88,7 +88,7 @@ static Sys_var_charptr Sys_tls_version( - "TLS version, permitted values are TLSv1, TLSv1.1, TLSv1.2, TLSv1.3", - PERSIST_AS_READONLY GLOBAL_VAR(opt_tls_version), - CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET, --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3", - #else - "TLSv1,TLSv1.1,TLSv1.2", -@@ -154,7 +154,7 @@ static Sys_var_charptr Sys_admin_tls_version( - "TLSv1.2, TLSv1.3", - PERSIST_AS_READONLY GLOBAL_VAR(opt_admin_tls_version), - CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET, --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3", - #else - "TLSv1,TLSv1.1,TLSv1.2", diff --git a/databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h b/databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h index 5297a5023741..e377118e3d0e 100644 --- a/databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h +++ b/databases/mysql80-server/files/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h @@ -1,11 +1,11 @@ ---- storage/innobase/include/detail/ut/large_page_alloc-linux.h.orig 2021-09-28 11:46:34 UTC -+++ storage/innobase/include/detail/ut/large_page_alloc-linux.h -@@ -50,7 +50,7 @@ inline void *large_page_aligned_alloc(size_t n_bytes) +--- storage/innobase/include/detail/ut/large_page_alloc-linux.h.orig 2022-01-22 09:35:07.556661000 +0100 ++++ storage/innobase/include/detail/ut/large_page_alloc-linux.h 2022-01-22 09:35:29.314231000 +0100 +@@ -52,7 +52,7 @@ inline void *large_page_aligned_alloc(size_t n_bytes) // mmap will internally round n_bytes to the multiple of huge-page size if it // is not already void *ptr = mmap(nullptr, n_bytes, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANON | MAP_HUGETLB, -1, 0); + MAP_PRIVATE | MAP_ANON, -1, 0); - return (ptr != (void *)-1) ? ptr : nullptr; - } - + if (unlikely(ptr == (void *)-1)) { + ib::log_warn(ER_IB_MSG_856) << "large_page_aligned_alloc mmap(" << n_bytes + << " bytes) failed;" diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc index 8c88903163ee..45ffd8a79316 100644 --- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc +++ b/databases/mysql80-server/files/patch-vio_viosslfactories.cc @@ -1,5 +1,5 @@ ---- vio/viosslfactories.cc.orig 2021-11-04 18:02:40.921064000 +0100 -+++ vio/viosslfactories.cc 2021-11-04 18:15:24.992676000 +0100 +--- vio/viosslfactories.cc.orig 2022-01-22 10:05:23.617027000 +0100 ++++ vio/viosslfactories.cc 2022-01-22 13:19:39.010224000 +0100 @@ -40,6 +40,7 @@ #include "vio/vio_priv.h" @@ -30,10 +30,10 @@ -#ifdef HAVE_TLSv13 +#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2", - "TLSv1.3"}; - const char ctx_flag_default[] = "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3"; -@@ -624,7 +627,7 @@ static struct st_VioSSLFd *new_VioSSLFd( + const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"}; + const char ctx_flag_default[] = "TLSv1.2,TLSv1.3"; + const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3}; +@@ -623,7 +626,7 @@ static struct st_VioSSLFd *new_VioSSLFd( ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) & (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 @@ -42,7 +42,7 @@ | SSL_OP_NO_TLSv1_3 #endif /* HAVE_TLSv13 */ | SSL_OP_NO_TICKET); -@@ -633,7 +636,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -632,7 +635,7 @@ static struct st_VioSSLFd *new_VioSSLFd( return nullptr; if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ? @@ -51,7 +51,7 @@ TLS_client_method() : TLS_server_method() #else /* HAVE_TLSv13 */ -@@ -648,7 +651,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -647,7 +650,7 @@ static struct st_VioSSLFd *new_VioSSLFd( return nullptr; }