Index: mysql80-client/Makefile =================================================================== --- mysql80-client/Makefile (revision 522045) +++ mysql80-client/Makefile (working copy) @@ -30,6 +30,16 @@ CLIENT_ONLY= yes +OPTIONS_GROUP+= PLUGINS +PLUGINS_DESC= Default Client Plugins +OPTIONS_GROUP_PLUGINS= SASLCLIENT +SASLCLIENT_DESC= SASL client plugin module +SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP +SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +#SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-sasl-client +OPTIONS_DEFAULT+= SASLCLIENT +OPTIONS_SUB= yes + # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a Index: mysql80-client/files/patch-CMakeLists.txt =================================================================== --- mysql80-client/files/patch-CMakeLists.txt (revision 522045) +++ mysql80-client/files/patch-CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-01-21 18:42:44 UTC -+++ CMakeLists.txt -@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex) +--- CMakeLists.txt.orig 2020-01-03 14:49:55.569197000 +0100 ++++ CMakeLists.txt 2020-01-03 14:51:56.430864000 +0100 +@@ -1280,6 +1280,7 @@ ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(libbinlogevents) ADD_SUBDIRECTORY(libbinlogstandalone) @@ -7,16 +7,20 @@ +ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) - SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") -@@ -1146,12 +1147,13 @@ ENDIF() - ADD_SUBDIRECTORY(packaging/WiX) - ADD_SUBDIRECTORY(packaging/solaris) + # Build failure on Solaris 11.3 for debug builds with NDBCLUSTER. +@@ -1440,14 +1441,15 @@ IF(PACK_SEPARATE_COMPONENTS) + SET(CPACK_COMPONENTS_GROUPING IGNORE) + ENDIF() -IF(UNIX) -- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) +- INSTALL(FILES +- Docs/mysql.info +- DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) -ENDIF() +#IF(UNIX) -+# INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ++# INSTALL(FILES ++# Docs/mysql.info ++# DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) +#ENDIF() # # RPM installs documentation directly from the source tree @@ -23,13 +27,13 @@ # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) - INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) -@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES + README +@@ -1474,6 +1476,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "README.build" EXCLUDE ) ++ENDIF() ENDIF() -+ENDIF() # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests, - # we can safely enable ASan on Clang/Win32 if needed. Index: mysql80-client/files/patch-client_CMakeLists.txt =================================================================== --- mysql80-client/files/patch-client_CMakeLists.txt (revision 522045) +++ mysql80-client/files/patch-client_CMakeLists.txt (working copy) @@ -1,39 +1,46 @@ ---- client/CMakeLists.txt.orig 2019-04-13 13:46:31.000000000 +0200 -+++ client/CMakeLists.txt 2019-04-30 00:27:10.627236000 +0200 -@@ -35,10 +35,12 @@ - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) +--- client/CMakeLists.txt.orig 2020-01-03 14:56:30.014533000 +0100 ++++ client/CMakeLists.txt 2020-01-03 22:45:00.368244000 +0100 +@@ -34,12 +34,14 @@ MYSQL_ADD_EXECUTABLE(mysql + LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} + ) +IF(FALSE) IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base) + MYSQL_ADD_EXECUTABLE(mysql_upgrade + upgrade/program.cc + LINK_LIBRARIES mysqlclient client_base + ) ENDIF() +ENDIF() - SET(MYSQLTEST_SRC - mysqltest/error_names.cc -@@ -49,10 +51,12 @@ - mysqltest/utils.cc - ) + # Enable inlining, to avoid stack overflow for some long regular expressions. + IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG") +@@ -48,6 +50,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL " + ) + ENDIF() +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) - TARGET_LINK_LIBRARIES(mysqltest mysqlclient) - ADD_DEPENDENCIES(mysqltest GenError GenClientError) + MYSQL_ADD_EXECUTABLE(mysqltest + mysqltest.cc + mysqltest/error_names.cc +@@ -63,6 +66,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest + ENABLE_EXPORTS + LINK_LIBRARIES mysqlclient + ) +ENDIF() - - ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) -@@ -108,8 +112,10 @@ - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) - + MYSQL_ADD_EXECUTABLE(mysqlcheck + check/mysqlcheck.cc + check/mysqlcheck_core.cc +@@ -117,10 +121,12 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor + mysql_config_editor.cc + LINK_LIBRARIES mysqlclient + ) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) + MYSQL_ADD_EXECUTABLE(mysql_secure_installation + mysql_secure_installation.cc + LINK_LIBRARIES mysqlclient + ) +ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) + MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup + logger.cc + mysql_ssl_rsa_setup.cc Index: mysql80-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- mysql80-client/files/patch-libmysql_CMakeLists.txt (revision 522045) +++ mysql80-client/files/patch-libmysql_CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC -+++ libmysql/CMakeLists.txt -@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) +--- libmysql/CMakeLists.txt.orig 2020-01-03 22:50:23.706505000 +0100 ++++ libmysql/CMakeLists.txt 2020-01-03 22:59:01.037690000 +0100 +@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) ) ENDIF() @@ -12,12 +12,12 @@ # # Include protocol tracing infrastructure and the test # trace plugin if enabled by build options. -@@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED) - COMPONENT SharedLibraries) - 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 +@@ -300,7 +305,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 Index: mysql80-client/files/patch-man_CMakeLists.txt =================================================================== --- mysql80-client/files/patch-man_CMakeLists.txt (revision 522045) +++ mysql80-client/files/patch-man_CMakeLists.txt (working copy) @@ -1,13 +1,74 @@ ---- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +--- man/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ man/CMakeLists.txt -@@ -22,10 +22,6 @@ +@@ -35,7 +35,6 @@ SET(MAN1 + mysql.server.1 + mysql_config.1 + mysql_config_editor.1 +- mysql_secure_installation.1 + mysql_ssl_rsa_setup.1 + mysql_tzinfo_to_sql.1 + mysql_upgrade.1 +@@ -54,63 +53,5 @@ SET(MAN1 + perror.1 + zlib_decompress.1 + ) +-SET(MAN1_NDB +- ndb-common-options.1 +- ndb_blob_tool.1 +- ndb_config.1 +- ndb_cpcd.1 +- ndb_delete_all.1 +- ndb_desc.1 +- ndb_drop_index.1 +- ndb_drop_table.1 +- ndb_error_reporter.1 +- ndb_import.1 +- ndb_index_stat.1 +- ndb_mgm.1 +- ndb_move_data.1 +- ndb_perror.1 +- ndb_print_backup_file.1 +- ndb_print_file.1 +- ndb_print_frag_file.1 +- ndb_print_schema_file.1 +- ndb_print_sys_file.1 +- ndb_redo_log_reader.1 +- ndb_restore.1 +- ndb_select_all.1 +- ndb_select_count.1 +- ndb_setup.py.1 +- ndb_show_tables.1 +- ndb_size.pl.1 +- ndb_top.1 +- ndb_waiter.1 +- ndbinfo_select_all.1 +-) +-SET(MAN1_ROUTER +- mysqlrouter.1 +- mysqlrouter_passwd.1 +- mysqlrouter_plugin_info.1 +-) +-SET(MAN8 +- mysqld.8 +- ) +-SET(MAN8_NDB +- ndb_mgmd.8 +- ndbd.8 +- ndbmtd.8 +-) - # Copy man pages - FILE(GLOB MAN1 *.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN1_ROUTER mysqlrouter*.1) --FILE(GLOB MAN8 *.8) --FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) - LIST(REMOVE_ITEM MAN1 ${MAN1_NDB}) - ENDIF() + INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages) +-INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages) +- +-IF(WITH_ROUTER) +- INSTALL(FILES ${MAN1_ROUTER} +- DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages +- ) +-ENDIF() +- +-IF(WITH_NDBCLUSTER) +- INSTALL(FILES ${MAN1_NDB} +- DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages) +- INSTALL(FILES ${MAN8_NDB} +- DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages) +-ENDIF() Index: mysql80-client/files/patch-mysys__ssl_my__md5.cc =================================================================== --- mysql80-client/files/patch-mysys__ssl_my__md5.cc (revision 522045) +++ mysql80-client/files/patch-mysys__ssl_my__md5.cc (nonexistent) @@ -1,11 +0,0 @@ ---- mysys/my_md5.cc.orig 2018-04-08 06:44:49 UTC -+++ mysys/my_md5.cc -@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d - int compute_md5_hash(char *digest, const char *buf, int len) { - int retval = 0; - int fips_mode = 0; --#if !defined(HAVE_WOLFSSL) -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - fips_mode = FIPS_mode(); - #endif /* HAVE_WOLFSSL */ - /* If fips mode is ON/STRICT restricted method calls will result into abort, Property changes on: mysql80-client/files/patch-mysys__ssl_my__md5.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc =================================================================== --- mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (revision 522045) +++ mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (working copy) @@ -1,7 +1,7 @@ ---- plugin/x/client/xconnection_impl.cc.orig 2018-04-08 06:44:49 UTC -+++ plugin/x/client/xconnection_impl.cc -@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio, - return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"}; +--- plugin/x/client/xconnection_impl.cc.orig 2020-01-04 10:57:10.134988000 +0100 ++++ plugin/x/client/xconnection_impl.cc 2020-01-04 11:54:34.665806000 +0100 +@@ -224,12 +224,12 @@ XError ssl_verify_server_cert(Vio *vio, const std::str + true}; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -17,21 +17,3 @@ const auto cn_len = static_cast(ASN1_STRING_length(cn_asn1)); // There should not be any NULL embedded in the CN -@@ -451,7 +451,7 @@ XError Connection_impl::get_ssl_error(co - return XError(CR_SSL_CONNECTION_ERROR, buffer); - } - --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - /** - Set fips mode in openssl library, - When we set fips mode ON/STRICT, it will perform following operations: -@@ -501,7 +501,7 @@ XError Connection_impl::activate_tls() { - if (!m_context->m_ssl_config.is_configured()) - return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED}; - --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) != - 1) { Index: mysql80-client/files/patch-share_CMakeLists.txt =================================================================== --- mysql80-client/files/patch-share_CMakeLists.txt (revision 522045) +++ mysql80-client/files/patch-share_CMakeLists.txt (working copy) @@ -1,27 +1,28 @@ ---- share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC -+++ share/CMakeLists.txt -@@ -45,6 +45,7 @@ SET(files - dictionary.txt - ) +--- share/CMakeLists.txt.orig 2020-01-04 12:18:51.475694000 +0100 ++++ share/CMakeLists.txt 2020-01-04 12:33:42.018101000 +0100 +@@ -47,6 +47,7 @@ SET(dirs + ukrainian + ) +IF (FALSE) FOREACH (dir ${dirs}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} - DESTINATION ${INSTALL_MYSQLSHAREDIR} -@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE - COMPONENT Server - PATTERN "languages.html" EXCLUDE + INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir} + DESTINATION ${INSTALL_MYSQLSHAREDIR} +@@ -59,6 +60,7 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets + COMPONENT Server + PATTERN "languages.html" EXCLUDE ) +ENDIF() # Don't copy if we're building in-source. IF (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - CONFIGURE_FILE(dictionary.txt ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/dictionary.txt) +@@ -66,7 +68,9 @@ IF (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DI + ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/dictionary.txt) ENDIF() +IF (FALSE) - INSTALL(FILES ${files} - DESTINATION ${INSTALL_MYSQLSHAREDIR} - COMPONENT Server + INSTALL(FILES errmsg-utf8.txt dictionary.txt + DESTINATION ${INSTALL_MYSQLSHAREDIR} + COMPONENT Server ) +ENDIF() Index: mysql80-client/files/patch-sql-common_client.cc =================================================================== --- mysql80-client/files/patch-sql-common_client.cc (revision 522045) +++ mysql80-client/files/patch-sql-common_client.cc (nonexistent) @@ -1,11 +0,0 @@ ---- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC -+++ sql-common/client.cc -@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, - #endif - break; - case MYSQL_OPT_SSL_FIPS_MODE: { --#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) -+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - ENSURE_EXTENSIONS_PRESENT(&mysql->options); - mysql->options.extension->ssl_fips_mode = *(uint *)arg; Property changes on: mysql80-client/files/patch-sql-common_client.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: mysql80-client/files/patch-sql_auth_sha2__password__common.cc =================================================================== --- mysql80-client/files/patch-sql_auth_sha2__password__common.cc (revision 522045) +++ mysql80-client/files/patch-sql_auth_sha2__password__common.cc (nonexistent) @@ -1,11 +0,0 @@ ---- sql/auth/sha2_password_common.cc.orig 2018-05-06 18:47:55 UTC -+++ sql/auth/sha2_password_common.cc -@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsi - DBUG_RETURN(true); - } - m_ok = EVP_DigestFinal_ex(md_context, m_digest, NULL); --#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_MD_CTX_cleanup(md_context); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - EVP_MD_CTX_reset(md_context); Property changes on: mysql80-client/files/patch-sql_auth_sha2__password__common.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: mysql80-client/files/patch-sql_mysqld.cc =================================================================== --- mysql80-client/files/patch-sql_mysqld.cc (revision 522045) +++ mysql80-client/files/patch-sql_mysqld.cc (nonexistent) @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig 2018-05-06 19:15:48 UTC -+++ sql/mysqld.cc -@@ -4321,7 +4321,7 @@ static void init_ssl() { - - static void init_ssl() { - #ifdef HAVE_OPENSSL --#if !defined(HAVE_WOLFSSL) && !defined(__sun) -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun) - #if defined(HAVE_PSI_MEMORY_INTERFACE) - static PSI_memory_info all_openssl_memory[] = { - {&key_memory_openssl, "openssl_malloc", 0, 0, Property changes on: mysql80-client/files/patch-sql_mysqld.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: mysql80-client/files/patch-sql_sys__vars.cc =================================================================== --- mysql80-client/files/patch-sql_sys__vars.cc (revision 522045) +++ mysql80-client/files/patch-sql_sys__vars.cc (nonexistent) @@ -1,29 +0,0 @@ ---- sql/sys_vars.cc.orig 2018-05-06 19:16:02 UTC -+++ sql/sys_vars.cc -@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version( - READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION), - IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2"); - --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - static bool update_fips_mode(sys_var *, THD *, enum_var_type) { - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { -@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *, - } - #endif - --#ifdef HAVE_WOLFSSL -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) - static const char *ssl_fips_mode_names[] = {"OFF", 0}; - #else - static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0}; -@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode( - GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE), - ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(NULL), --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - ON_UPDATE(update_fips_mode), - #else - ON_UPDATE(NULL), Property changes on: mysql80-client/files/patch-sql_sys__vars.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: mysql80-client/files/patch-utilities_CMakeLists.txt =================================================================== --- mysql80-client/files/patch-utilities_CMakeLists.txt (revision 522045) +++ mysql80-client/files/patch-utilities_CMakeLists.txt (working copy) @@ -1,24 +1,24 @@ ---- utilities/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC -+++ utilities/CMakeLists.txt -@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR - - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h - ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys -+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/ - COMMAND comp_err - --charset=${PROJECT_SOURCE_DIR}/share/charsets - --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/ -@@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_ +--- utilities/CMakeLists.txt.orig 2020-01-04 12:50:52.593074000 +0100 ++++ utilities/CMakeLists.txt 2020-01-04 12:54:28.545215000 +0100 +@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${INSTALL_MY + ADD_CUSTOM_COMMAND(OUTPUT + ${PROJECT_BINARY_DIR}/include/mysqld_error.h + ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys ++ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/ + COMMAND comp_err + --charset=${PROJECT_SOURCE_DIR}/share/charsets + --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/ +@@ -99,6 +100,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) ADD_DEPENDENCIES(comp_err copy_openssl_dlls) ENDIF() +IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) - TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) - SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -168,4 +170,5 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - mysys innodb_zipdecompress ${LZ4_LIBRARY}) - ADD_DEPENDENCIES(ibd2sdi GenError) - + MYSQL_ADD_EXECUTABLE(my_print_defaults + my_print_defaults.cc + COMPONENT Server +@@ -187,4 +189,5 @@ TARGET_COMPILE_DEFINITIONS(ibd2sdi PRIVATE UNIV_NO_ERR + IF(MY_COMPILER_IS_GNU_OR_CLANG) + ADD_COMPILE_FLAGS(ibd2sdi.cc + COMPILE_FLAGS "-Wno-unused-parameter -Wno-cast-qual") +ENDIF() ENDIF() Index: mysql80-client/files/patch-vio_viosslfactories.cc =================================================================== --- mysql80-client/files/patch-vio_viosslfactories.cc (revision 522045) +++ mysql80-client/files/patch-vio_viosslfactories.cc (working copy) @@ -1,6 +1,6 @@ ---- vio/viosslfactories.cc.orig 2018-04-08 06:44:49 UTC -+++ vio/viosslfactories.cc -@@ -37,6 +37,7 @@ +--- vio/viosslfactories.cc.orig 2020-01-04 12:57:40.305302000 +0100 ++++ vio/viosslfactories.cc 2020-01-04 13:02:59.406245000 +0100 +@@ -38,6 +38,7 @@ #ifdef HAVE_OPENSSL #include @@ -8,7 +8,7 @@ #define TLS_VERSION_OPTION_SIZE 256 #define SSL_CIPHER_LIST_SIZE 4096 -@@ -135,7 +136,7 @@ static DH *get_dh2048(void) { +@@ -136,7 +137,7 @@ static DH *get_dh2048(void) { BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); if (!p || !g @@ -17,31 +17,3 @@ || !DH_set0_pqg(dh, p, NULL, g) #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ ) { -@@ -426,7 +427,7 @@ void ssl_start() { - } - } - --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - /** - Set fips mode in openssl library, - When we set fips mode ON/STRICT, it will perform following operations: -@@ -449,6 +450,10 @@ int set_fips_mode(const uint fips_mode, - int rc = -1; - unsigned int fips_mode_old = -1; - unsigned long err_library = 0; -+#if defined(LIBRESSL_VERSION_NUMBER) -+ err_string="LibreSSL deosn't have FIPS_mode functionas"; -+ goto EXIT; -+#else - if (fips_mode > 2) { - goto EXIT; - } -@@ -462,6 +467,7 @@ int set_fips_mode(const uint fips_mode, - ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); - err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; - } -+#endif - EXIT: - return rc; - } Index: mysql80-client/pkg-plist =================================================================== --- mysql80-client/pkg-plist (revision 522045) +++ mysql80-client/pkg-plist (working copy) @@ -41,6 +41,7 @@ include/mysql/my_command.h include/mysql/my_compare.h include/mysql/my_compiler.h +include/mysql/my_compress.h include/mysql/my_dbug.h include/mysql/my_default.h include/mysql/my_dir.h @@ -181,16 +182,37 @@ 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 libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz +man/man1/ibd2sdi.1.gz +man/man1/innochecksum.1.gz +man/man1/lz4_decompress.1.gz +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz +man/man1/mysql_ssl_rsa_setup.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysql.server.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz man/man1/mysqldump.1.gz +man/man1/mysqldumpslow.1.gz man/man1/mysqlimport.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqlpump.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz +man/man1/perror.1.gz +man/man1/zlib_decompress.1.gz share/aclocal/mysql.m4 +@dir lib/mysql/plugin/debug Index: mysql80-server/Makefile =================================================================== --- mysql80-server/Makefile (revision 521884) +++ mysql80-server/Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.17 -PORTREVISION?= 2 +PORTVERSION= 8.0.18 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server @@ -29,6 +29,7 @@ LIB_DEPENDS+= libevent.so:devel/libevent \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ + libzstd.so:archivers/zstd \ libre2.so:devel/re2 \ libprotobuf.so:devel/protobuf \ libunwind.so:devel/libunwind Index: mysql80-server/distinfo =================================================================== --- mysql80-server/distinfo (revision 521884) +++ mysql80-server/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565048626 -SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a -SIZE (mysql-boost-8.0.17.tar.gz) = 189322239 +TIMESTAMP = 1578004259 +SHA256 (mysql-boost-8.0.18.tar.gz) = 0eccd9d79c04ba0ca661136bb29085e3833d9c48ed022d0b9aba12236994186b +SIZE (mysql-boost-8.0.18.tar.gz) = 194953221