databases/mysql80-*: Update to 8.0.27

Release Notes: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-27.html

Sponsored by:	Netzkommune GmbH

databases/mysql80-client/Makefile

@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -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
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 -DWITH_AUTHENTICATION_FIDO=ON
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
@@ -31,11 +31,17 @@ CLIENT_ONLY=	yes
 
 OPTIONS_GROUP+=	PLUGINS
 PLUGINS_DESC=	Default Client Plugins
-OPTIONS_GROUP_PLUGINS=	SASLCLIENT
+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
 SASLCLIENT_USE=		OPENLDAP=yes
+
+FIDO_DESC=		FIDO/U2F support (security/libfido2)
+FIDO_LIB_DEPENDS=   libfido2.so:security/libfido2 \
+			libhidapi.so:comms/hidapi
+FIDO_CMAKE_BOOL=	WITH_AUTHENTICATION_FIDO
+
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 

databases/mysql80-client/pkg-plist

@@ -14,6 +14,25 @@ bin/mysqlshow
 bin/mysqlslap
 bin/perror
 @comment bin/zlib_decompress
+include/mysql/add_with_saturate.h
+include/mysql/caching_sha2_passwordopt-longopts.h
+include/mysql/caching_sha2_passwordopt-vars.h
+include/mysql/compression.h
+include/mysql/keyring_operations_helper.h
+include/mysql/manifest.h
+include/mysql/mem_root_deque.h
+include/mysql/memory_debugging.h
+include/mysql/my_basename.h
+include/mysql/my_checksum.h
+include/mysql/my_getpwnam.h
+include/mysql/my_hostname.h
+include/mysql/my_rcu_lock.h
+include/mysql/mysql_async.h
+include/mysql/pfs_data_lock_provider.h
+include/mysql/pfs_system_provider.h
+include/mysql/pfs_tls_channel_provider.h
+include/mysql/unhex.h
+include/mysql/unsafe_string_append.h
 include/mysql/base64.h
 include/mysql/big_endian.h
 include/mysql/c_string_less.h
@@ -24,7 +43,6 @@ include/mysql/dur_prop.h
 include/mysql/errmsg.h
 include/mysql/field_types.h
 include/mysql/ft_global.h
-include/mysql/guard.h
 include/mysql/heap.h
 include/mysql/integer_digits.h
 include/mysql/keycache.h
@@ -88,7 +106,6 @@ include/mysql/myisam.h
 include/mysql/myisammrg.h
 include/mysql/myisampack.h
 include/mysql/mysql.h
-include/mysql/mysql.h.pp
 include/mysql/mysql/client_authentication.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/client_plugin.h.pp
@@ -139,10 +156,8 @@ include/mysql/mysql_com.h
 include/mysql/mysql_com_server.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
-include/mysql/mysql_version.h.in
 include/mysql/mysqld_error.h
 include/mysql/mysys_err.h
-include/mysql/nullable.h
 include/mysql/password.h
 include/mysql/pfs_cond_provider.h
 include/mysql/pfs_error_provider.h
@@ -189,6 +204,8 @@ lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.21
 %%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
+%%FIDO%%lib/mysql/plugin/authentication_fido_client.so
+lib/mysql/plugin/authentication_oci_client.so
 libdata/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1.gz
 man/man1/lz4_decompress.1.gz

databases/mysql80-server/Makefile

@@ -1,8 +1,8 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.26
-PORTREVISION?=		1
+PORTVERSION=		8.0.27
+PORTREVISION?=		0
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
@@ -21,7 +21,7 @@ USES=		bison:build cmake:noninja compiler:c++17-lang cpe \
 
 CPE_VENDOR=	oracle
 
-USE_CXXSTD=	c++14
+USE_CXXSTD=	c++17
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
@@ -84,7 +84,7 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DWITH_ZLIB=system \
 		-DWITH_ZSTD=system \
 		-DWITH_PROTOBUF=system \
-		-DWITH_SSL=${OPENSSLBASE} \
+		-DWITH_SSL=system \
 		-DBUILD_BUNDLED_ZLIB=0 \
 		-DBUILD_BUNDLED_LZ4=0
 

databases/mysql80-server/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1628702352
-SHA256 (mysql-boost-8.0.26.tar.gz) = 209442c1001c37bcbc001845e1dc623d654cefb555b47b528742a53bf21c0b4d
-SIZE (mysql-boost-8.0.26.tar.gz) = 291285918
+TIMESTAMP = 1635786797
+SHA256 (mysql-boost-8.0.27.tar.gz) = 74b5bc6ff88fe225560174a24b7d5ff139f4c17271c43000dbcf3dcc9507b3f9
+SIZE (mysql-boost-8.0.27.tar.gz) = 292184025

databases/mysql80-server/files/patch-CMakeLists.txt

@@ -1,6 +1,15 @@
---- CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
+--- CMakeLists.txt.orig	2021-09-28 11:46:34 UTC
 +++ CMakeLists.txt
-@@ -1417,10 +1417,10 @@ IF(WITH_AUTHENTICATION_LDAP)
+@@ -1647,7 +1647,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
+ ENDIF()
+
+ IF(WITH_AUTHENTICATION_LDAP)
+-  IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
++  IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES)
+     # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
+     IF(WITH_LDAP STREQUAL "system" OR
+         WITH_SASL STREQUAL "system" OR
+@@ -1696,10 +1696,10 @@ IF(WITH_AUTHENTICATION_KERBEROS)
    ENDIF()
  ENDIF()
 
@@ -14,9 +23,9 @@
  # Add lz4 library
  MYSQL_CHECK_LZ4()
  # Add icu library
-@@ -1520,7 +1520,9 @@ IF(WITH_UNIT_TESTS)
-   INCLUDE(googletest)
- ENDIF()
+@@ -1869,7 +1869,9 @@ OPTION(WITH_HYPERGRAPH_OPTIMIZER
+   ${WITH_HYPERGRAPH_OPTIMIZER_DEFAULT}
+   )
 
 -ADD_SUBDIRECTORY(include)
 +IF(NOT WITHOUT_CLIENTLIBS)
@@ -25,7 +34,7 @@
  ADD_SUBDIRECTORY(strings)
  ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(mysys)
-@@ -1562,12 +1564,17 @@ IF(WITH_UNIT_TESTS)
+@@ -1913,12 +1915,17 @@ IF(WITH_UNIT_TESTS)
    ADD_SUBDIRECTORY(unittest/mytap/t)
  ENDIF()
 
@@ -45,7 +54,7 @@
    ADD_SUBDIRECTORY(testclients)
    ADD_SUBDIRECTORY(sql)
  ENDIF()
-@@ -1590,11 +1597,11 @@ ENDIF()
+@@ -1971,11 +1978,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,15 +67,15 @@
    IF(WITH_INTERNAL)
      ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -1703,6 +1710,7 @@ IF(PACK_SEPARATE_COMPONENTS)
+@@ -2084,6 +2091,7 @@ IF(PACK_SEPARATE_COMPONENTS)
    SET(CPACK_COMPONENTS_GROUPING IGNORE)
  ENDIF()
 
 +IF(FALSE)
  IF(UNIX)
    INSTALL(FILES
      Docs/mysql.info
-@@ -1737,6 +1745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -2118,6 +2126,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
      PATTERN "README.build" EXCLUDE
    )

databases/mysql80-server/files/patch-client_CMakeLists.txt

@@ -1,4 +1,4 @@
---- client/CMakeLists.txt.orig	2021-03-22 08:44:50 UTC
+--- client/CMakeLists.txt.orig	2021-09-28 11:46:34 UTC
 +++ client/CMakeLists.txt
 @@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
  ## Subdirectory with common client code.
@@ -11,26 +11,26 @@
 +ENDIF()
 
 +IF(NOT WITHOUT_CLIENTLIBS)
- MYSQL_ADD_EXECUTABLE(mysql
-   ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
-   completion_hash.cc
-@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql
-   client_query_attributes.cc
+ INCLUDE_DIRECTORIES(
+   ${CMAKE_CURRENT_SOURCE_DIR}/include
+ )
+@@ -47,6 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysql
+   ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
    LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
    )
 +ENDIF()
 
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND
+@@ -55,6 +59,7 @@ IF(NOT WITHOUT_SERVER)
      )
  ENDIF()
 
 +IF(NOT WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysqltest
    mysqltest.cc
    mysqltest/error_names.cc
-@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
+@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
    ENABLE_EXPORTS
    LINK_LIBRARIES mysqlclient
    )
@@ -40,7 +40,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck
    check/mysqlcheck.cc
    check/mysqlcheck_core.cc
-@@ -248,7 +256,9 @@ ENDIF()
+@@ -250,7 +258,9 @@ ENDIF()
 
  TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
  TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
@@ -49,18 +49,18 @@
 +IF(WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysqladmin
    mysqladmin.cc
-   LINK_LIBRARIES mysqlclient
-@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
+   multi_factor_passwordopt-vars.cc
+@@ -265,6 +275,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
    mysql_config_editor.cc
    LINK_LIBRARIES mysqlclient
    )
 +ENDIF()
 +
-+IF(NOT WITHOUT_SERVER)
++IF(NOT_WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation
    mysql_secure_installation.cc
    LINK_LIBRARIES mysqlclient
-@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
+@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
    path.cc
    LINK_LIBRARIES mysys
    )

databases/mysql80-server/files/patch-include_CMakeLists.txt

@@ -1,59 +1,68 @@
---- include/CMakeLists.txt.orig	2019-12-09 19:53:17 UTC
+--- include/CMakeLists.txt.orig	2021-09-28 11:46:34 UTC
 +++ include/CMakeLists.txt
-@@ -37,10 +37,173 @@ SET(HEADERS
+@@ -37,10 +37,182 @@ SET(HEADERS
    ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
    ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
    field_types.h
++  add_with_saturate.h
 +  base64.h
 +  big_endian.h
 +  c_string_less.h
++  caching_sha2_passwordopt-longopts.h
++  caching_sha2_passwordopt-vars.h
++  compression.h
 +  crypt_genhash_impl.h
 +  decimal.h
 +  depth_first_search.h
 +  dur_prop.h
-+  errmsg.h
 +  ft_global.h
-+  guard.h
 +  heap.h
 +  integer_digits.h
 +  keycache.h
++  keyring_operations_helper.h
 +  lex_string.h
 +  lf.h
 +  little_endian.h
 +  m_ctype.h
 +  m_string.h
++  manifest.h
 +  map_helpers.h
++  mem_root_deque.h
++  memory_debugging.h
 +  mf_wcomp.h
 +  mutex_lock.h
 +  my_aes.h
 +  my_alloc.h
 +  my_atomic.h
 +  my_base.h
++  my_basename.h
 +  my_bit.h
 +  my_bitmap.h
 +  my_byteorder.h
 +  my_check_opt.h
-+  my_command.h
++  my_checksum.h
 +  my_compare.h
 +  my_compiler.h
 +  my_dbug.h
 +  my_default.h
 +  my_dir.h
 +  my_double2ulonglong.h
 +  my_getopt.h
++  my_getpwnam.h
 +  my_hash_combine.h
++  my_hostname.h
 +  my_icp.h
 +  my_inttypes.h
 +  my_io.h
-+  my_list.h
 +  my_loglevel.h
 +  my_macros.h
-+  my_md5.h
 +  my_md5_size.h
++  my_md5.h
 +  my_murmur3.h
 +  my_pointer_arithmetic.h
 +  my_psi_config.h
 +  my_rapidjson_size_t.h
++  my_rcu_lock.h
 +  my_rdtsc.h
 +  my_rnd.h
 +  my_sharedlib.h
@@ -63,9 +72,9 @@
 +  my_sys.h
 +  my_systime.h
 +  my_table_map.h
-+  my_thread.h
 +  my_thread_local.h
 +  my_thread_os_id.h
++  my_thread.h
 +  my_time.h
 +  my_timer.h
 +  my_tree.h
@@ -75,16 +84,12 @@
 +  myisam.h
 +  myisammrg.h
 +  myisampack.h
-+  mysql.h
-+  mysql.h.pp
-+  mysql_com.h
++  mysql_async.h
 +  mysql_com_server.h
-+  mysql_time.h
-+  mysql_version.h.in
 +  mysys_err.h
-+  nullable.h
 +  password.h
 +  pfs_cond_provider.h
++  pfs_data_lock_provider.h
 +  pfs_error_provider.h
 +  pfs_file_provider.h
 +  pfs_idle_provider.h
@@ -95,8 +100,10 @@
 +  pfs_socket_provider.h
 +  pfs_stage_provider.h
 +  pfs_statement_provider.h
++  pfs_system_provider.h
 +  pfs_table_provider.h
 +  pfs_thread_provider.h
++  pfs_tls_channel_provider.h
 +  pfs_transaction_provider.h
 +  prealloced_array.h
 +  print_version.h
@@ -119,6 +126,8 @@
 +  thr_mutex.h
 +  thr_rwlock.h
 +  typelib.h
++  unhex.h
++  unsafe_string_append.h
 +  varlen_sort.h
 +  violite.h
 +  welcome_copyright_notice.h