databases/mysql80-{client, server}: Update to latest release 8.0.22

Full Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-22.html

MFH:		2020Q4
Security:	4fba07ca-13aa-11eb-b31e-d4c9ef517024
Sponsored by:	Netzkommune GmbH

12 files changed, 102 insertions, 56 deletions

diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 8ba57f8c5f2e..d93737fc9ebc 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 4ecc192b9e8b..382ae8751f70 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.21
-PORTREVISION?=		3
+PORTVERSION=		8.0.22
+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 a3d7f64c4c31..289d1cb82c16 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594631042
-SHA256 (mysql-boost-8.0.21.tar.gz) = 37231a123372a95f409857364dc1deb196b6f2c0b1fe60cc8382c7686b487f11
-SIZE (mysql-boost-8.0.21.tar.gz) = 278292192
+TIMESTAMP = 1603183848
+SHA256 (mysql-boost-8.0.22.tar.gz) = ba765f74367c638d7cd1c546c05c14382fd997669bcd9680278e907f8d7eb484
+SIZE (mysql-boost-8.0.22.tar.gz) = 285934450
diff --git a/databases/mysql80-server/files/patch-CMakeLists.txt b/databases/mysql80-server/files/patch-CMakeLists.txt
index 71d92e49efd9..1838577bde1c 100644
--- a/databases/mysql80-server/files/patch-CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
+--- CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
 +++ CMakeLists.txt
-@@ -1191,10 +1191,10 @@ ENDIF()
- MYSQL_CHECK_SSL()
- MYSQL_CHECK_SSL_DLLS()
+@@ -1417,10 +1417,10 @@ IF(WITH_AUTHENTICATION_LDAP)
+   ENDIF()
+ ENDIF()
  
 -# Add system/bundled editline.
 -MYSQL_CHECK_EDITLINE()
@@ -14,7 +14,7 @@
  # Add lz4 library
  MYSQL_CHECK_LZ4()
  # Add icu library
-@@ -1283,7 +1283,9 @@ IF(WITH_UNIT_TESTS)
+@@ -1520,7 +1520,9 @@ IF(WITH_UNIT_TESTS)
    INCLUDE(googletest)
  ENDIF()
  
@@ -25,7 +25,7 @@
  ADD_SUBDIRECTORY(strings)
  ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(mysys)
-@@ -1324,12 +1326,17 @@ IF(WITH_UNIT_TESTS)
+@@ -1562,12 +1564,17 @@ IF(WITH_UNIT_TESTS)
    ADD_SUBDIRECTORY(unittest/mytap/t)
  ENDIF()
  
@@ -45,7 +45,7 @@
    ADD_SUBDIRECTORY(testclients)
    ADD_SUBDIRECTORY(sql)
  ENDIF()
-@@ -1497,11 +1504,11 @@ ENDIF()
+@@ -1590,11 +1597,11 @@ ENDIF()
  # scripts/mysql_config depends on client and server targets loaded above.
  # It is referenced by some of the directories below, so we insert it here.
  ADD_SUBDIRECTORY(scripts)
@@ -58,7 +58,7 @@
    IF(WITH_INTERNAL)
      ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -1464,6 +1471,7 @@ IF(PACK_SEPARATE_COMPONENTS)
+@@ -1703,6 +1710,7 @@ IF(PACK_SEPARATE_COMPONENTS)
    SET(CPACK_COMPONENTS_GROUPING IGNORE)
  ENDIF()
  
@@ -66,7 +66,7 @@
  IF(UNIX)
    INSTALL(FILES
      Docs/mysql.info
-@@ -1498,6 +1506,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -1737,6 +1745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
      PATTERN "README.build" EXCLUDE
    )
diff --git a/databases/mysql80-server/files/patch-cmake_install_layout.cmake b/databases/mysql80-server/files/patch-cmake_install_layout.cmake
index d9d06a66f44e..927729ddd20b 100644
--- a/databases/mysql80-server/files/patch-cmake_install_layout.cmake
+++ b/databases/mysql80-server/files/patch-cmake_install_layout.cmake
@@ -29,7 +29,7 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -171,6 +175,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE  "keyring")
+@@ -167,6 +171,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE  "keyring")
  SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
  
  #
@@ -62,7 +62,7 @@
  # TARGZ layout
  #
  SET(INSTALL_BINDIR_TARGZ           "bin")
-@@ -369,7 +399,7 @@ ENDIF()
+@@ -361,7 +391,7 @@ ENDIF()
  SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
    CACHE
    STRING
@@ -71,7 +71,7 @@
  
  # If we are shared STANDALONE with the the server, we shouldn't write
  # into the server's data/ as that would create a "schemadir" in
-@@ -408,6 +438,18 @@ FOREACH(var
+@@ -405,6 +435,21 @@ FOREACH(var
      )
    SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
  ENDFOREACH()
@@ -87,6 +87,9 @@
 +SET(ROUTER_INSTALL_BINDIR_FREEBSD     "bin")
 +SET(ROUTER_INSTALL_LIBDIR_FREEBSD     "lib/mysql")
 +SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD  "lib/mysql/mysqlrouter")
++SET(ROUTER_INSTALL_LOGROTATEDIR_FREEBSD "etc/logrotate.d")
++SET(ROUTER_INSTALL_LOGROTATEFILE_FREEBSD "mysqlrouter")
++SET(ROUTER_INSTALL_DOCDIR_FREEBSD     "share/mysqlrouter/docs")
  
- #
- # RPM layout
+ FOREACH(var
+     LOGROTATE
diff --git a/databases/mysql80-server/files/patch-man_CMakeLists.txt b/databases/mysql80-server/files/patch-man_CMakeLists.txt
index c55e30550fbc..d624bab8144b 100644
--- a/databases/mysql80-server/files/patch-man_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-man_CMakeLists.txt
@@ -1,6 +1,6 @@
---- man/CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
-+++ man/CMakeLists.txt
-@@ -23,29 +23,14 @@
+--- man/CMakeLists.txt.orig	2020-10-20 11:47:42.675974000 +0200
++++ man/CMakeLists.txt	2020-10-20 13:53:03.993879000 +0200
+@@ -23,21 +23,10 @@
  # Copy man pages
  SET(MAN1
    comp_err.1
@@ -13,7 +13,6 @@
 -  myisamlog.1
 -  myisampack.1
    mysql.1
--  mysql.server.1
    mysql_config.1
    mysql_config_editor.1
 -  mysql_secure_installation.1
@@ -23,17 +22,15 @@
    mysqladmin.1
    mysqlbinlog.1
    mysqlcheck.1
--  mysqld_multi.1
--  mysqld_safe.1
-   mysqldump.1
--  mysqldumpslow.1
-   mysqlimport.1
-   mysqlman.1
-   mysqlpump.1
-@@ -54,6 +39,23 @@ SET(MAN1
-   perror.1
+@@ -52,13 +41,23 @@ SET(MAN1
    zlib_decompress.1
    )
+ 
+-IF(NOT WITH_SYSTEMD)
+-  LIST(APPEND MAN1
+-    mysql.server.1
+-    mysqld_multi.1
+-    mysqld_safe.1
 +SET(MAN1_TOOLS
 +  ibd2sdi.1
 +  innochecksum.1
@@ -50,11 +47,12 @@
 +  mysqldumpslow.1
 +  mysqld_multi.1
 +  mysqld_safe.1
-+  )
+   )
+-ENDIF()
+ 
  SET(MAN1_NDB
    ndb-common-options.1
-   ndb_blob_tool.1
-@@ -99,8 +101,15 @@ SET(MAN8_NDB
+@@ -105,8 +104,14 @@ SET(MAN8_NDB
    ndbmtd.8
  )
  
@@ -64,7 +62,6 @@
 +    INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
 +ENDIF()
 +
-+
 +IF(NOT WITHOUT_SERVER)
 +    INSTALL(FILES ${MAN1_TOOLS} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
 +    INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages)
diff --git a/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h b/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h
new file mode 100644
index 000000000000..8274f7e275ac
--- /dev/null
+++ b/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h
@@ -0,0 +1,13 @@
+--- router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h.orig	2020-09-23 12:37:48 UTC
++++ router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h
+@@ -190,8 +190,8 @@
+         auto secs = std::chrono::duration_cast<std::chrono::seconds>(timeout);
+         timeout -= secs;
+ 
+-        ts = {secs.count(),
+-              std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
++        ts = {(time_t)secs.count(),
++              (time_t)std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
+                   .count()};
+ 
+         p_ts = &ts;
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt b/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
index 6804fcbe70b4..f6cf7d3c0808 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
@@ -1,6 +1,6 @@
 --- router/src/harness/src/CMakeLists.txt.orig	2019-12-09 19:53:17 UTC
 +++ router/src/harness/src/CMakeLists.txt
-@@ -200,7 +200,6 @@ IF(NOT WIN32)
+@@ -205,7 +205,6 @@ IF(NOT WIN32)
    INSTALL(TARGETS harness-library
      LIBRARY
      DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@@ -8,3 +8,9 @@
      )
  ELSE()
    INSTALL(TARGETS harness-library
+@@ -240,5 +239,4 @@ INSTALL(TARGETS harness_stdx
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
diff --git a/databases/mysql80-server/files/patch-router_src_io_src_CMakeLists.txt b/databases/mysql80-server/files/patch-router_src_io_src_CMakeLists.txt
new file mode 100644
index 000000000000..474f473e1893
--- /dev/null
+++ b/databases/mysql80-server/files/patch-router_src_io_src_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- router/src/io/src/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
++++ router/src/io/src/CMakeLists.txt
+@@ -47,7 +47,6 @@ INSTALL(TARGETS io_component
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ 
+ GENERATE_EXPORT_HEADER(io_component
diff --git a/databases/mysql80-server/files/patch-support-files_CMakeLists.txt b/databases/mysql80-server/files/patch-support-files_CMakeLists.txt
index 0aaac11466e4..282a84437a0d 100644
--- a/databases/mysql80-server/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-support-files_CMakeLists.txt
@@ -1,4 +1,4 @@
---- support-files/CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
+--- support-files/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
 +++ support-files/CMakeLists.txt
 @@ -24,8 +24,9 @@ IF(NOT UNIX)
    RETURN()
@@ -12,16 +12,28 @@
  
  SET(localstatedir "${MYSQL_DATADIR}")
  
-@@ -45,6 +46,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.serve
+@@ -43,7 +44,7 @@ ENDIF()
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in
    ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY)
  
+-IF(NOT WITH_SYSTEMD)
 +IF(NOT WITHOUT_SERVER)
- INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mysql.server
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
+     ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY
+   )
+@@ -59,6 +60,7 @@ IF(NOT WITH_SYSTEMD)
+   )
+ ENDIF()
+ 
++IF(NOT WITHOUT_SERVER)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate
    COMPONENT Server_Scripts
    DESTINATION ${INSTALL_SUPPORTFILESDIR}
-@@ -62,3 +64,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro
+@@ -66,6 +68,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro
    OWNER_READ OWNER_WRITE
    GROUP_READ WORLD_READ
    )
 +ENDIF()
+ 
+ IF(WITH_ROUTER)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysqlrouter-log-rotate.in
diff --git a/databases/mysql80-server/files/patch-utilities_CMakeLists.txt b/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
index fce28bb3248b..29c120a41e79 100644
--- a/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
@@ -1,4 +1,4 @@
---- utilities/CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
+--- utilities/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
 +++ utilities/CMakeLists.txt
 @@ -23,13 +23,19 @@
  ADD_WSHADOW_WARNING()
@@ -22,9 +22,9 @@
  
  MYSQL_ADD_EXECUTABLE(comp_client_err
    comp_client_err.cc
-@@ -120,10 +126,30 @@ IF(LINUX_INSTALL_RPATH_ORIGIN)
-   ADD_DEPENDENCIES(comp_err copy_openssl_dlls)
- ENDIF()
+@@ -112,10 +118,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
+   EXCLUDE_FROM_ALL
+   )
  
 +IF(WITHOUT_CLIENTLIBS)
  MYSQL_ADD_EXECUTABLE(my_print_defaults
@@ -53,28 +53,26 @@
    )
  MYSQL_ADD_EXECUTABLE(perror
    perror.cc
-@@ -138,14 +164,25 @@ IF(BUILD_BUNDLED_LZ4)
+@@ -130,12 +156,23 @@ IF(BUILD_BUNDLED_LZ4)
      LINK_LIBRARIES ${LZ4_LIBRARY} mysys
      )
  ENDIF()
 +ENDIF(WITHOUT_CLIENTLIBS)
  
 +IF(WITHOUT_CLIENTLIBS)
- IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
-   MYSQL_ADD_EXECUTABLE(zlib_decompress
-     zlib_decompress.cc
-     COMPONENT Server
-     LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
+ MYSQL_ADD_EXECUTABLE(zlib_decompress
+   zlib_decompress.cc
+   COMPONENT Server
+   LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
 +    SKIP_INSTALL )
-+ENDIF()
 +ELSE(WITHOUT_CLIENTLIBS)
 +IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
 +  MYSQL_ADD_EXECUTABLE(zlib_decompress
 +    zlib_decompress.cc
 +    COMPONENT Server
 +    LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
-     )
- ENDIF()
+   )
++ENDIF()
 +ENDIF(WITHOUT_CLIENTLIBS)
  
  # All targets below belong to COMPONENT Server and depend on InnoDB.
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 76924792f8c8..fd08d6a0e446 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -21,8 +21,11 @@ bin/mysqlrouter_plugin_info
 bin/mysqltest
 bin/mysqltest_safe_process
 bin/mysqlxtest
+etc/logrotate.d/mysqlrouter
 lib/mysql/libmysqlharness.so
 lib/mysql/libmysqlharness.so.1
+lib/mysql/libmysqlharness_stdx.so
+lib/mysql/libmysqlharness_stdx.so.1
 lib/mysql/libmysqlrouter.so
 lib/mysql/libmysqlrouter.so.1
 lib/mysql/libmysqlrouter_http.so
@@ -31,9 +34,12 @@ lib/mysql/libmysqlrouter_http_auth_backend.so
 lib/mysql/libmysqlrouter_http_auth_backend.so.1
 lib/mysql/libmysqlrouter_http_auth_realm.so
 lib/mysql/libmysqlrouter_http_auth_realm.so.1
+lib/mysql/libmysqlrouter_io_component.so
+lib/mysql/libmysqlrouter_io_component.so.1
 lib/mysql/mysqlrouter/http_auth_backend.so
 lib/mysql/mysqlrouter/http_auth_realm.so
 lib/mysql/mysqlrouter/http_server.so
+lib/mysql/mysqlrouter/io.so
 lib/mysql/mysqlrouter/keepalive.so
 lib/mysql/mysqlrouter/metadata_cache.so
 lib/mysql/mysqlrouter/mysql_protocol.so
@@ -202,7 +208,6 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/german/errmsg.sys
 %%DATADIR%%/greek/errmsg.sys
 %%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
 %%DATADIR%%/install_rewriter.sql
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys
@@ -224,7 +229,9 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/uninstall_rewriter.sql
+%%DATADIR%%router/docs/sample_mysqlrouter.conf
 @dir lib/mysql/plugin/debug
+@dir %%DATADIR%%router/docs
 @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
 @dir(mysql,mysql,0750) %%ETCDIR%%/keyring
 @dir(mysql,mysql,0750) %%MY_SECDIR%%