Index: branches/2020Q1/databases/mysql80-client/files/patch-support-files_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-support-files_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-support-files_CMakeLists.txt (nonexistent) @@ -1,27 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC -+++ support-files/CMakeLists.txt -@@ -29,9 +29,11 @@ - - SET(localstatedir "${MYSQL_DATADIR}") - -+IF(FALSE) - SET(prefix "${CMAKE_INSTALL_PREFIX}") - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) -+ENDIF() - - IF(LINUX) - SET (PIDOF "pidof") -@@ -39,6 +41,7 @@ - SET (PIDOF "pgrep -d' ' -f") - ENDIF() - -+IF(FALSE) - FOREACH(script - mysql.server - mysqld_multi.server -@@ -54,3 +57,4 @@ - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - ENDFOREACH() -+ENDIF() Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-support-files_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-share_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-share_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-share_CMakeLists.txt (nonexistent) @@ -1,27 +0,0 @@ ---- share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC -+++ share/CMakeLists.txt -@@ -45,6 +45,7 @@ SET(files - dictionary.txt - ) - -+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 - ) -+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) - ENDIF() - -+IF (FALSE) - INSTALL(FILES ${files} - DESTINATION ${INSTALL_MYSQLSHAREDIR} - COMPONENT Server - ) -+ENDIF() Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-share_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (nonexistent) @@ -1,60 +0,0 @@ ---- mysys/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys/my_default.cc -@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -914,6 +914,14 @@ static int search_default_file_with_ext( - return 1; /* Ignore wrong files */ - } - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { - line++; - /* Ignore comment and empty lines */ -@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * - end[(strlen(end) - 1)] = ' '; - else - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1411,13 +1420,8 @@ static const char **init_default_directo - - #else - -- errors += add_directory(alloc, "/etc/", dirs); -- errors += add_directory(alloc, "/etc/mysql/", dirs); -- --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - -@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f - MY_STAT stat_info; - -- if (!my_stat(file_name, &stat_info, MYF(0))) return 1; -+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0; - /* - Ignore .mylogin.cnf file if not exclusively readable/writable - by current user. Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-mysys__ssl_my__default.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: branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake (nonexistent) @@ -1,25 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2019-06-25 10:23:30 UTC -+++ cmake/os/FreeBSD.cmake -@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - MESSAGE(FATAL_ERROR - "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})") - ENDIF() -- ELSE() -- MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ >= 4); -+ }" I386_ATOMIC_BUILTINS) -+ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) -+ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") -+ ENDIF() -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() - ENDIF() - ENDIF() - Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-client_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-client_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-client_CMakeLists.txt (nonexistent) @@ -1,39 +0,0 @@ ---- 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) - -+IF(FALSE) - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base) - ENDIF() -+ENDIF() - - SET(MYSQLTEST_SRC - mysqltest/error_names.cc -@@ -49,10 +51,12 @@ - mysqltest/utils.cc - ) - -+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) -+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) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation 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) Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-client_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-sql-common_client.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-sql-common_client.cc (revision 522469) +++ branches/2020Q1/databases/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: branches/2020Q1/databases/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: branches/2020Q1/databases/mysql80-client/files/patch-include_my__compare.h =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-include_my__compare.h (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-include_my__compare.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2018-04-08 06:44:49 UTC -+++ include/my_compare.h -@@ -49,7 +49,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 16 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6) Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-include_my__compare.h ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-include_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-include_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-include_CMakeLists.txt (nonexistent) @@ -1,176 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-09-21 15:51:58 UTC -+++ include/CMakeLists.txt -@@ -30,11 +30,173 @@ SET(HEADERS - ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h - ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h - field_types.h -+ base64.h -+ big_endian.h -+ c_string_less.h -+ crypt_genhash_impl.h -+ decimal.h -+ depth_first_search.h -+ dur_prop.h -+ errmsg.h -+ ft_global.h -+ heap.h -+ keycache.h -+ lex_string.h -+ lf.h -+ little_endian.h -+ m_ctype.h -+ m_string.h -+ map_helpers.h -+ mf_wcomp.h -+ mutex_lock.h -+ my_aes.h -+ my_alloc.h -+ my_atomic.h -+ my_base.h -+ my_bit.h -+ my_bitmap.h -+ my_byteorder.h -+ my_check_opt.h -+ my_command.h -+ my_compare.h -+ my_compare.h.orig -+ my_compiler.h -+ my_dbug.h -+ my_default.h -+ my_dir.h -+ my_double2ulonglong.h -+ my_getopt.h -+ my_hash_combine.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_murmur3.h -+ my_pointer_arithmetic.h -+ my_psi_config.h -+ my_rapidjson_size_t.h -+ my_rdtsc.h -+ my_rnd.h -+ my_sharedlib.h -+ my_shm_defaults.h -+ my_sqlcommand.h -+ my_stacktrace.h -+ my_sys.h -+ my_systime.h -+ my_table_map.h -+ my_thread.h -+ my_thread_local.h -+ my_thread_os_id.h -+ my_time.h -+ my_timer.h -+ my_tree.h -+ my_uctype.h -+ my_user.h -+ my_xml.h -+ myisam.h -+ myisammrg.h -+ myisampack.h -+ mysql.h -+ mysql.h.pp -+ mysql_com.h -+ mysql_com_server.h -+ mysql_time.h -+ mysql_version.h.in -+ mysys_err.h -+ nullable.h -+ password.h -+ pfs_cond_provider.h -+ pfs_error_provider.h -+ pfs_file_provider.h -+ pfs_idle_provider.h -+ pfs_memory_provider.h -+ pfs_metadata_provider.h -+ pfs_mutex_provider.h -+ pfs_rwlock_provider.h -+ pfs_socket_provider.h -+ pfs_stage_provider.h -+ pfs_statement_provider.h -+ pfs_table_provider.h -+ pfs_thread_provider.h -+ pfs_transaction_provider.h -+ prealloced_array.h -+ print_version.h -+ priority_queue.h -+ rwlock_scoped_lock.h -+ scope_guard.h -+ service_versions.h -+ sha1.h -+ sha2.h -+ sql_chars.h -+ sql_common.h -+ sql_string.h -+ sslopt-case.h -+ sslopt-longopts.h -+ sslopt-vars.h -+ template_utils.h -+ thr_cond.h -+ thr_lock.h -+ thr_mutex.h -+ thr_rwlock.h -+ typelib.h -+ varlen_sort.h -+ violite.h -+ welcome_copyright_notice.h - ) - SET(HEADERS_MYSQL_DIR - mysql/client_plugin.h - mysql/plugin_auth_common.h - mysql/udf_registration_types.h -+ mysql/client_authentication.h -+ mysql/client_plugin.h.pp -+ mysql/com_data.h -+ mysql/get_password.h -+ mysql/group_replication_priv.h -+ mysql/innodb_priv.h -+ mysql/mysql_lex_string.h -+ mysql/plugin.h -+ mysql/plugin_audit.h -+ mysql/plugin_audit.h.pp -+ mysql/plugin_auth.h -+ mysql/plugin_auth.h.pp -+ mysql/plugin_auth_common.h -+ mysql/plugin_ftparser.h -+ mysql/plugin_ftparser.h.pp -+ mysql/plugin_group_replication.h -+ mysql/plugin_keyring.h -+ mysql/plugin_keyring.h.pp -+ mysql/plugin_query_rewrite.h -+ mysql/plugin_trace.h -+ mysql/plugin_validate_password.h -+ mysql/service_command.h -+ mysql/service_locking.h -+ mysql/service_my_plugin_log.h -+ mysql/service_mysql_alloc.h -+ mysql/service_mysql_keyring.h -+ mysql/service_mysql_password_policy.h -+ mysql/service_mysql_string.h -+ mysql/service_parser.h -+ mysql/service_plugin_registry.h -+ mysql/service_rpl_transaction_ctx.h -+ mysql/service_rpl_transaction_write_set.h -+ mysql/service_rules_table.h -+ mysql/service_security_context.h -+ mysql/service_srv_session.h -+ mysql/service_srv_session_info.h -+ mysql/service_ssl_wrapper.h -+ mysql/service_thd_alloc.h -+ mysql/service_thd_engine_lock.h -+ mysql/service_thd_wait.h -+ mysql/service_thread_scheduler.h -+ mysql/services.h -+ mysql/services.h.pp -+ mysql/thread_pool_priv.h -+ mysql/thread_type.h -+ mysql/udf_registration_types.h - ) - - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-include_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt (nonexistent) @@ -1,73 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2018-10-07 08:44:22 UTC -+++ scripts/CMakeLists.txt -@@ -80,6 +80,7 @@ ELSE() - MESSAGE(FATAL_ERROR "Cannot concatenate files") - ENDIF() - -+IF(FALSE) - # Build mysql_fix_privilege_tables.h - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h -@@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h - ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h - ) -+ENDIF() - - # If we do not have performance schema compiled in then sys will not work, - # so only create an empty sys database with an auto-generated file, -@@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER) - ) - ENDIF() - -+IF(FALSE) - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -211,6 +214,7 @@ IF(UNIX) - COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - ) - ENDIF() -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) - FOREACH(lib ${${target}_LIB_DEPENDS}) - # Filter out "general", it is not a library, just CMake hint -- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") -+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto") - IF (lib MATCHES "^\\-l") - SET(${var} "${${var}} ${lib} ") - ELSEIF(lib MATCHES "^/") -@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -454,19 +460,7 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - -- IF(WITH_SYSTEMD) -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- ) -- ELSE() -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- mysqld_multi -- mysqld_safe -- ) -- ENDIF() -+ SET(BIN_SCRIPTS mysql_config) - - SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) - STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-sql_mysqld.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-sql_mysqld.cc (revision 522469) +++ branches/2020Q1/databases/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: branches/2020Q1/databases/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: branches/2020Q1/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc (revision 522469) +++ branches/2020Q1/databases/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: branches/2020Q1/databases/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: branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c (nonexistent) @@ -1,20 +0,0 @@ ---- extra/libedit/vi.c.orig 2016-03-28 18:06:12 UTC -+++ extra/libedit/vi.c -@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att - * NB: posix implies that we should enter insert mode, however - * this is against historical precedent... - */ --#if defined(__weak_reference) && !defined(__FreeBSD__) -+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) - __weakref_visible char *my_get_alias_text(const char *) - __weak_reference(get_alias_text); - #endif -@@ -928,7 +928,7 @@ protected el_action_t - vi_alias(EditLine *el __attribute__((__unused__)), - Int c __attribute__((__unused__))) - { --#if defined(__weak_reference) && !defined(__FreeBSD__) -+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) - char alias_name[3]; - char *alias_text; - Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-include_myisam.h =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-include_myisam.h (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-include_myisam.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2018-04-08 06:44:49 UTC -+++ include/myisam.h -@@ -59,7 +59,7 @@ - The following defines can be increased if necessary. - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. - */ --#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define MI_MAX_KEY_SEG 16 /* Max segments for key */ - - #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8) Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-include_myisam.h ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-utilities_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (nonexistent) @@ -1,24 +0,0 @@ ---- 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_ - 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) - -+ENDIF() - ENDIF() Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-utilities_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt (nonexistent) @@ -1,23 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC -+++ libmysql/CMakeLists.txt -@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) - ) - ENDIF() - -+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC") -+ENDIF() -+ - # - # 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 Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake (nonexistent) @@ -1,27 +0,0 @@ ---- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC -+++ cmake/os/DragonFly.cmake -@@ -0,0 +1,24 @@ -+INCLUDE(CheckCSourceRuns) -+ -+# We require at least GCC 4.4 or Clang 3.3. -+IF(NOT FORCE_UNSUPPORTED_COMPILER) -+ IF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() -+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ < 3) || -+ (__clang_major__ == 3 && __clang_minor__ < 3); -+ }" HAVE_SUPPORTED_CLANG_VERSION) -+ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) -+ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") -+ ENDIF() -+ ELSE() -+ MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ ENDIF() -+ENDIF() Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (nonexistent) @@ -1,37 +0,0 @@ ---- 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"}; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -- const auto cn = reinterpret_cast(ASN1_STRING_data(cn_asn1)); --#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - const auto cn = - reinterpret_cast(ASN1_STRING_get0_data(cn_asn1)); --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#else -+ const auto cn = reinterpret_cast(ASN1_STRING_data(cn_asn1)); -+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ - 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) { Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.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: branches/2020Q1/databases/mysql80-client/files/patch-sql_sys__vars.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-sql_sys__vars.cc (revision 522469) +++ branches/2020Q1/databases/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: branches/2020Q1/databases/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: branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h (nonexistent) @@ -1,11 +0,0 @@ ---- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC -+++ extra/libedit/chartype.h -@@ -49,7 +49,7 @@ - TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ - #if !defined(__NetBSD__) && !defined(__sun) \ - && !(defined(__APPLE__) && defined(__MACH__)) \ -- && !defined(__FreeBSD__) && !defined(_AIX) -+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-CMakeLists.txt (nonexistent) @@ -1,35 +0,0 @@ ---- CMakeLists.txt.orig 2019-01-21 18:42:44 UTC -+++ CMakeLists.txt -@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex) - ADD_SUBDIRECTORY(libmysql) - ADD_SUBDIRECTORY(libbinlogevents) - ADD_SUBDIRECTORY(libbinlogstandalone) -+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) - --IF(UNIX) -- 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) -+#ENDIF() - # - # RPM installs documentation directly from the source tree - # -+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") - PATTERN "README.build" EXCLUDE - ) - 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. Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc (nonexistent) @@ -1,22 +0,0 @@ ---- storage/myisam/mi_dynrec.cc.orig 2016-03-28 18:06:12 UTC -+++ storage/myisam/mi_dynrec.cc -@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my - DBUG_RETURN(1); - } - /* -- I wonder if it is good to use MAP_NORESERVE. From the Linux man page: -- MAP_NORESERVE -- Do not reserve swap space for this mapping. When swap space is -- reserved, one has the guarantee that it is possible to modify the -- mapping. When swap space is not reserved one might get SIGSEGV -- upon a write if no physical memory is available. -+ MAP_NORESERVE is unimplemented in FreeBSD - */ - info->s->file_map = (uchar *)my_mmap( - 0, (size_t)size, - info->s->mode == O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE, info->dfile, 0L); -+ MAP_SHARED, info->dfile, 0L); - if (info->s->file_map == (uchar *)MAP_FAILED) { - info->s->file_map = NULL; - Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.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: branches/2020Q1/databases/mysql80-client/files/patch-man_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-man_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-man_CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC -+++ man/CMakeLists.txt -@@ -22,10 +22,6 @@ - - # 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() Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-man_CMakeLists.txt ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-cmake_ssl.cmake =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-cmake_ssl.cmake (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-cmake_ssl.cmake (nonexistent) @@ -1,14 +0,0 @@ ---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC -+++ cmake/ssl.cmake -@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" - ) - ENDIF() - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARY AND - CRYPTO_LIBRARY AND -- OPENSSL_MAJOR_VERSION STREQUAL "1" -+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2") - ) - SET(OPENSSL_FOUND TRUE) - FIND_PROGRAM(OPENSSL_EXECUTABLE openssl Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-cmake_ssl.cmake ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc (revision 522469) +++ branches/2020Q1/databases/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: branches/2020Q1/databases/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: branches/2020Q1/databases/mysql80-client/files/patch-vio_viosslfactories.cc =================================================================== --- branches/2020Q1/databases/mysql80-client/files/patch-vio_viosslfactories.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-client/files/patch-vio_viosslfactories.cc (nonexistent) @@ -1,47 +0,0 @@ ---- vio/viosslfactories.cc.orig 2018-04-08 06:44:49 UTC -+++ vio/viosslfactories.cc -@@ -37,6 +37,7 @@ - - #ifdef HAVE_OPENSSL - #include -+#include - - #define TLS_VERSION_OPTION_SIZE 256 - #define SSL_CIPHER_LIST_SIZE 4096 -@@ -135,7 +136,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 --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - || !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; - } Property changes on: branches/2020Q1/databases/mysql80-client/files/patch-vio_viosslfactories.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: branches/2020Q1/databases/mysql80-client/Makefile =================================================================== --- branches/2020Q1/databases/mysql80-client/Makefile (revision 522469) +++ branches/2020Q1/databases/mysql80-client/Makefile (revision 522470) @@ -1,39 +1,49 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files +PATCHDIR= ${MASTERDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql8[1-9]-client-* \ mysql[0-79][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 USE_LDCONFIG+= ${PREFIX}/lib/mysql -MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 +MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ + mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \ + mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 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_USE= OPENLDAP=yes +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 @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so @${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21 .include "${MASTERDIR}/Makefile" Index: branches/2020Q1/databases/mysql80-client/pkg-plist =================================================================== --- branches/2020Q1/databases/mysql80-client/pkg-plist (revision 522469) +++ branches/2020Q1/databases/mysql80-client/pkg-plist (revision 522470) @@ -1,196 +1,205 @@ +bin/my_print_defaults bin/mysql bin/mysql_config bin/mysql_config_editor -bin/mysql_ssl_rsa_setup bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlpump bin/mysqlshow bin/mysqlslap +bin/perror +bin/zlib_decompress include/mysql/base64.h include/mysql/big_endian.h include/mysql/c_string_less.h include/mysql/crypt_genhash_impl.h include/mysql/decimal.h include/mysql/depth_first_search.h include/mysql/dur_prop.h include/mysql/errmsg.h include/mysql/field_types.h include/mysql/ft_global.h include/mysql/heap.h include/mysql/keycache.h include/mysql/lex_string.h include/mysql/lf.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/map_helpers.h include/mysql/mf_wcomp.h include/mysql/mutex_lock.h include/mysql/my_aes.h include/mysql/my_alloc.h include/mysql/my_atomic.h include/mysql/my_base.h include/mysql/my_bit.h include/mysql/my_bitmap.h include/mysql/my_byteorder.h include/mysql/my_check_opt.h 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 include/mysql/my_double2ulonglong.h include/mysql/my_getopt.h include/mysql/my_hash_combine.h include/mysql/my_icp.h include/mysql/my_inttypes.h include/mysql/my_io.h include/mysql/my_list.h include/mysql/my_loglevel.h include/mysql/my_macros.h include/mysql/my_md5.h include/mysql/my_md5_size.h include/mysql/my_murmur3.h include/mysql/my_pointer_arithmetic.h include/mysql/my_psi_config.h include/mysql/my_rapidjson_size_t.h include/mysql/my_rdtsc.h include/mysql/my_rnd.h include/mysql/my_sharedlib.h include/mysql/my_shm_defaults.h include/mysql/my_sqlcommand.h include/mysql/my_stacktrace.h include/mysql/my_sys.h include/mysql/my_systime.h include/mysql/my_table_map.h include/mysql/my_thread.h include/mysql/my_thread_local.h include/mysql/my_thread_os_id.h include/mysql/my_time.h include/mysql/my_timer.h include/mysql/my_tree.h include/mysql/my_uctype.h include/mysql/my_user.h include/mysql/my_xml.h 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 include/mysql/mysql/com_data.h include/mysql/mysql/get_password.h include/mysql/mysql/group_replication_priv.h include/mysql/mysql/innodb_priv.h include/mysql/mysql/mysql_lex_string.h include/mysql/mysql/plugin.h include/mysql/mysql/plugin_audit.h include/mysql/mysql/plugin_audit.h.pp include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth.h.pp include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_ftparser.h include/mysql/mysql/plugin_ftparser.h.pp include/mysql/mysql/plugin_group_replication.h include/mysql/mysql/plugin_keyring.h include/mysql/mysql/plugin_keyring.h.pp include/mysql/mysql/plugin_query_rewrite.h include/mysql/mysql/plugin_trace.h include/mysql/mysql/plugin_validate_password.h include/mysql/mysql/service_command.h include/mysql/mysql/service_locking.h include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_mysql_alloc.h include/mysql/mysql/service_mysql_keyring.h include/mysql/mysql/service_mysql_password_policy.h include/mysql/mysql/service_mysql_string.h include/mysql/mysql/service_parser.h include/mysql/mysql/service_plugin_registry.h include/mysql/mysql/service_rpl_transaction_ctx.h include/mysql/mysql/service_rpl_transaction_write_set.h include/mysql/mysql/service_rules_table.h include/mysql/mysql/service_security_context.h include/mysql/mysql/service_srv_session.h include/mysql/mysql/service_srv_session_info.h include/mysql/mysql/service_ssl_wrapper.h include/mysql/mysql/service_thd_alloc.h include/mysql/mysql/service_thd_engine_lock.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/services.h include/mysql/mysql/services.h.pp include/mysql/mysql/thread_pool_priv.h include/mysql/mysql/thread_type.h include/mysql/mysql/udf_registration_types.h 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 include/mysql/pfs_file_provider.h include/mysql/pfs_idle_provider.h include/mysql/pfs_memory_provider.h include/mysql/pfs_metadata_provider.h include/mysql/pfs_mutex_provider.h include/mysql/pfs_rwlock_provider.h include/mysql/pfs_socket_provider.h include/mysql/pfs_stage_provider.h include/mysql/pfs_statement_provider.h include/mysql/pfs_table_provider.h include/mysql/pfs_thread_provider.h include/mysql/pfs_transaction_provider.h include/mysql/prealloced_array.h include/mysql/print_version.h include/mysql/priority_queue.h include/mysql/rwlock_scoped_lock.h include/mysql/scope_guard.h include/mysql/service_versions.h include/mysql/sha1.h include/mysql/sha2.h include/mysql/sql_chars.h include/mysql/sql_common.h include/mysql/sql_string.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/template_utils.h include/mysql/thr_cond.h include/mysql/thr_lock.h include/mysql/thr_mutex.h include/mysql/thr_rwlock.h include/mysql/typelib.h include/mysql/varlen_sort.h include/mysql/violite.h include/mysql/welcome_copyright_notice.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.21 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/lz4_decompress.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.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 Index: branches/2020Q1/databases/mysql80-server/Makefile =================================================================== --- branches/2020Q1/databases/mysql80-server/Makefile (revision 522469) +++ branches/2020Q1/databases/mysql80-server/Makefile (revision 522470) @@ -1,180 +1,174 @@ # Created by: Mahdi Mokhtari # $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 DISTNAME= ${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= mmokhi@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:noninja compiler:c++14-lang cpe \ - libedit localbase perl5 pkgconfig shebangfix ssl + libedit localbase ncurses perl5 pkgconfig shebangfix ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir -LIB_DEPENDS+= libevent.so:devel/libevent \ +LIB_DEPENDS+= libcurl.so:ftp/curl \ + libevent.so:devel/libevent \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ - libre2.so:devel/re2 \ + libzstd.so:archivers/zstd \ libprotobuf.so:devel/protobuf \ libunwind.so:devel/libunwind BUILD_DEPENDS= liblz4>0:archivers/liblz4 \ libunwind>0:devel/libunwind CMAKE_BUILD_TYPE= Release CFLAGS+= -fPIC CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ + -DINSTALL_MYSQLTESTDIR="" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_SYSTEM_LIBS=1 \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ICU=system \ - -DWITH_RE2=system \ + -DWITH_CURL=system \ + -DWITH_ZLIB=system \ + -DWITH_ZSTD=system \ -DWITH_PROTOBUF=system \ + -DWITH_SSL=${OPENSSLBASE} \ -DBUILD_BUNDLED_ZLIB=0 \ -DBUILD_BUNDLED_LZ4=0 \ - -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} \ MYSQL80_LIBVER=${MYSQL80_LIBVER} # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:80 CONFLICTS_INSTALL= mysql8[1-9]-server-* \ mysql[0-79][0-9]-server-* \ mysqlwsrep* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ - mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ - mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ - mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 +MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ + myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \ + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \ + mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1 +MMAN8= mysqld.8 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" +CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include -.if ${SSL_DEFAULT} == base -CMAKE_ARGS+= -DWITH_SSL=system -.else -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} -.endif - post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h - -post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .include Index: branches/2020Q1/databases/mysql80-server/distinfo =================================================================== --- branches/2020Q1/databases/mysql80-server/distinfo (revision 522469) +++ branches/2020Q1/databases/mysql80-server/distinfo (revision 522470) @@ -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 Index: branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc (nonexistent) @@ -1,60 +0,0 @@ ---- mysys/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys/my_default.cc -@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -914,6 +914,14 @@ static int search_default_file_with_ext( - return 1; /* Ignore wrong files */ - } - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { - line++; - /* Ignore comment and empty lines */ -@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * - end[(strlen(end) - 1)] = ' '; - else - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1411,13 +1420,8 @@ static const char **init_default_directo - - #else - -- errors += add_directory(alloc, "/etc/", dirs); -- errors += add_directory(alloc, "/etc/mysql/", dirs); -- --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - -@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f - MY_STAT stat_info; - -- if (!my_stat(file_name, &stat_info, MYF(0))) return 1; -+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0; - /* - Ignore .mylogin.cnf file if not exclusively readable/writable - by current user. Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__default.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: branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/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: branches/2020Q1/databases/mysql80-server/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: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc (nonexistent) @@ -1,11 +0,0 @@ ---- plugin/x/client/sha256_scramble_generator.cc.orig 2018-05-09 14:20:16 UTC -+++ plugin/x/client/sha256_scramble_generator.cc -@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsi - DBUG_RETURN(true); - } - m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if 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: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.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: branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c (nonexistent) @@ -1,20 +0,0 @@ ---- extra/libedit/vi.c.orig 2016-03-28 18:06:12 UTC -+++ extra/libedit/vi.c -@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att - * NB: posix implies that we should enter insert mode, however - * this is against historical precedent... - */ --#if defined(__weak_reference) && !defined(__FreeBSD__) -+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) - __weakref_visible char *my_get_alias_text(const char *) - __weak_reference(get_alias_text); - #endif -@@ -928,7 +928,7 @@ protected el_action_t - vi_alias(EditLine *el __attribute__((__unused__)), - Int c __attribute__((__unused__))) - { --#if defined(__weak_reference) && !defined(__FreeBSD__) -+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) - char alias_name[3]; - char *alias_text; - Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h (nonexistent) @@ -1,11 +0,0 @@ ---- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC -+++ extra/libedit/chartype.h -@@ -49,7 +49,7 @@ - TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ - #if !defined(__NetBSD__) && !defined(__sun) \ - && !(defined(__APPLE__) && defined(__MACH__)) \ -- && !defined(__FreeBSD__) && !defined(_AIX) -+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h ___________________________________________________________________ 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: branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt (revision 522470) @@ -1,35 +1,76 @@ ---- CMakeLists.txt.orig 2019-01-21 19:00:53 UTC +--- CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ CMakeLists.txt -@@ -1045,7 +1045,6 @@ IF(UNIX) +@@ -1181,10 +1181,10 @@ ENDIF() + MYSQL_CHECK_SSL() + MYSQL_CHECK_SSL_DLLS() + +-# Add system/bundled editline. +-MYSQL_CHECK_EDITLINE() + # Add libevent +-MYSQL_CHECK_LIBEVENT() ++IF(NOT WITHOUT_SERVER) ++ MYSQL_CHECK_LIBEVENT() ++ENDIF() + # Add lz4 library + MYSQL_CHECK_LZ4() + # Add icu library +@@ -1273,7 +1273,9 @@ IF(WITH_UNIT_TESTS) + INCLUDE(googletest) ENDIF() +-ADD_SUBDIRECTORY(include) ++IF(NOT WITHOUT_CLIENTLIBS) ++ ADD_SUBDIRECTORY(include) ++ENDIF(NOT WITHOUT_CLIENTLIBS) + ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) + ADD_SUBDIRECTORY(mysys) +@@ -1314,24 +1316,29 @@ IF(WITH_UNIT_TESTS) + ADD_SUBDIRECTORY(unittest/mytap/t) + ENDIF() + +-ADD_SUBDIRECTORY(client) ++IF(NOT WITHOUT_TOOLS) ++ # Add system/bundled editline ++ MYSQL_CHECK_EDITLINE() ++ ADD_SUBDIRECTORY(client) ++ENDIF(NOT WITHOUT_TOOLS) ++ + ADD_SUBDIRECTORY(utilities) +-ADD_SUBDIRECTORY(share) + ADD_SUBDIRECTORY(libservices) + IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(testclients) ++ ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -1054,8 +1053,6 @@ 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) ++ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) +- ADD_SUBDIRECTORY(support-files) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) -@@ -1152,6 +1149,7 @@ ENDIF() - # - # RPM installs documentation directly from the source tree - # + ENDIF() +@@ -1440,6 +1447,7 @@ IF(PACK_SEPARATE_COMPONENTS) + SET(CPACK_COMPONENTS_GROUPING IGNORE) + ENDIF() + +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 +1168,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + IF(UNIX) + INSTALL(FILES + Docs/mysql.info +@@ -1474,6 +1482,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: branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-client_CMakeLists.txt (revision 522470) @@ -1,53 +1,76 @@ ---- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +--- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ client/CMakeLists.txt -@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil - +@@ -23,8 +23,11 @@ ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) --## Subdirectory for mysqlpump code. --ADD_SUBDIRECTORY(dump) + ## Subdirectory for mysqlpump code. ++IF(WITHOUT_SERVER) + ADD_SUBDIRECTORY(dump) ++ENDIF() -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) ++IF(NOT WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(mysql + ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc + completion_hash.cc +@@ -33,6 +36,7 @@ MYSQL_ADD_EXECUTABLE(mysql + readline.cc + LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} + ) +ENDIF() IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) -@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) + MYSQL_ADD_EXECUTABLE(mysql_upgrade +@@ -48,6 +52,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL " + ) + ENDIF() -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) - -@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) ++IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysqltest + mysqltest.cc + mysqltest/error_names.cc +@@ -63,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest + ENABLE_EXPORTS + LINK_LIBRARIES mysqlclient + ) +ENDIF() ++ ++IF(WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysqlcheck + check/mysqlcheck.cc + check/mysqlcheck_core.cc +@@ -80,6 +88,7 @@ MYSQL_ADD_EXECUTABLE(mysqlshow + mysqlshow.cc + LINK_LIBRARIES mysqlclient + ) ++ + MYSQL_ADD_EXECUTABLE(mysqlbinlog + mysqlbinlog.cc + ${CMAKE_SOURCE_DIR}/sql/json_binary.cc +@@ -104,7 +113,9 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - SET(MYSQLBINLOG_LIB_SOURCES - ${CMAKE_SOURCE_DIR}/strings/decimal.cc -@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli - - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) + TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) + TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys) ++IF(WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysqladmin + mysqladmin.cc + LINK_LIBRARIES mysqlclient +@@ -117,6 +128,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor + mysql_config_editor.cc + LINK_LIBRARIES mysqlclient + ) ++ENDIF() ++ ++IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_secure_installation + mysql_secure_installation.cc + LINK_LIBRARIES mysqlclient +@@ -127,6 +141,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup + path.cc + LINK_LIBRARIES mysys + ) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) Index: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake (revision 522470) @@ -0,0 +1,27 @@ +--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC ++++ cmake/os/DragonFly.cmake +@@ -0,0 +1,24 @@ ++INCLUDE(CheckCSourceRuns) ++ ++# We require at least GCC 4.4 or Clang 3.3. ++IF(NOT FORCE_UNSUPPORTED_COMPILER) ++ IF(CMAKE_COMPILER_IS_GNUCC) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ++ OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_LESS 4.4) ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ++ ENDIF() ++ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ < 3) || ++ (__clang_major__ == 3 && __clang_minor__ < 3); ++ }" HAVE_SUPPORTED_CLANG_VERSION) ++ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) ++ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") ++ ENDIF() ++ ELSE() ++ MESSAGE(FATAL_ERROR "Unsupported compiler!") ++ ENDIF() ++ENDIF() Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_DragonFly.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake (revision 522470) @@ -0,0 +1,25 @@ +--- cmake/os/FreeBSD.cmake.orig 2019-09-20 08:30:51 UTC ++++ cmake/os/FreeBSD.cmake +@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) + MESSAGE(FATAL_ERROR + "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})") + ENDIF() +- ELSE() +- MESSAGE(FATAL_ERROR "Unsupported compiler!") ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ >= 4); ++ }" I386_ATOMIC_BUILTINS) ++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) ++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") ++ ENDIF() ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ++ OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_LESS 4.4) ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ++ ENDIF() + ENDIF() + ENDIF() + Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_plugin.cmake (revision 522470) @@ -1,12 +1,12 @@ ---- cmake/plugin.cmake.orig 2017-06-27 11:44:29 UTC +--- cmake/plugin.cmake.orig 2019-09-20 08:30:51 UTC +++ cmake/plugin.cmake -@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -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}) - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) + ENDIF() + ELSE() + IF(WITHOUT_${plugin}) Index: branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_ssl.cmake (revision 522470) @@ -1,14 +1,28 @@ ---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC +--- cmake/ssl.cmake.orig 2019-09-20 08:30:51 UTC +++ cmake/ssl.cmake -@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" +@@ -199,7 +199,7 @@ MACRO (MYSQL_CHECK_SSL) + # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" +@@ -214,13 +214,14 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) + ADD_DEFINITIONS(-DHAVE_TLSv13) + ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" -+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2") ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ) SET(OPENSSL_FOUND TRUE) FIND_PROGRAM(OPENSSL_EXECUTABLE openssl Index: branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h (revision 522470) @@ -0,0 +1,11 @@ +--- extra/libedit/chartype.h.orig 2019-09-20 08:30:51 UTC ++++ extra/libedit/chartype.h +@@ -49,7 +49,7 @@ + TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ + #if !defined(__NetBSD__) && !defined(__sun) \ + && !(defined(__APPLE__) && defined(__MACH__)) \ +- && !defined(__FreeBSD__) && !defined(_AIX) ++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_chartype.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c (revision 522470) @@ -0,0 +1,20 @@ +--- extra/libedit/vi.c.orig 2019-09-20 08:30:51 UTC ++++ extra/libedit/vi.c +@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __attribute__((__un + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + __weakref_visible char *my_get_alias_text(const char *) + __weak_reference(get_alias_text); + #endif +@@ -928,7 +928,7 @@ protected el_action_t + vi_alias(EditLine *el __attribute__((__unused__)), + Int c __attribute__((__unused__))) + { +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + char alias_name[3]; + char *alias_text; + Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-extra_libedit_vi.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h (revision 522470) @@ -0,0 +1,19 @@ +--- extra/libevent/openssl-compat.h.orig 2019-09-20 08:30:51 UTC ++++ extra/libevent/openssl-compat.h +@@ -24,12 +24,15 @@ static inline BIO_METHOD *BIO_meth_new(int type, const + #define BIO_set_init(b, val) (b)->init = (val) + #define BIO_set_data(b, val) (b)->ptr = (val) + #define BIO_set_shutdown(b, val) (b)->shutdown = (val) +-#define BIO_get_init(b) (b)->init + #define BIO_get_data(b) (b)->ptr + #define BIO_get_shutdown(b) (b)->shutdown + + #define TLS_method SSLv23_method + + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#define BIO_get_init(b) (b)->init ++#endif + + #endif /* OPENSSL_COMPAT_H */ Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-extra_libevent_openssl-compat.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt (revision 522470) @@ -1,10 +1,174 @@ ---- include/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +--- include/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ include/CMakeLists.txt -@@ -37,5 +37,7 @@ SET(HEADERS_MYSQL_DIR +@@ -37,10 +37,171 @@ SET(HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h + ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h + field_types.h ++ base64.h ++ big_endian.h ++ c_string_less.h ++ crypt_genhash_impl.h ++ decimal.h ++ depth_first_search.h ++ dur_prop.h ++ errmsg.h ++ ft_global.h ++ heap.h ++ keycache.h ++ lex_string.h ++ lf.h ++ little_endian.h ++ m_ctype.h ++ m_string.h ++ map_helpers.h ++ mf_wcomp.h ++ mutex_lock.h ++ my_aes.h ++ my_alloc.h ++ my_atomic.h ++ my_base.h ++ my_bit.h ++ my_bitmap.h ++ my_byteorder.h ++ my_check_opt.h ++ my_command.h ++ my_compare.h ++ my_compiler.h ++ my_dbug.h ++ my_default.h ++ my_dir.h ++ my_double2ulonglong.h ++ my_getopt.h ++ my_hash_combine.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_murmur3.h ++ my_pointer_arithmetic.h ++ my_psi_config.h ++ my_rapidjson_size_t.h ++ my_rdtsc.h ++ my_rnd.h ++ my_sharedlib.h ++ my_shm_defaults.h ++ my_sqlcommand.h ++ my_stacktrace.h ++ my_sys.h ++ my_systime.h ++ my_table_map.h ++ my_thread.h ++ my_thread_local.h ++ my_thread_os_id.h ++ my_time.h ++ my_timer.h ++ my_tree.h ++ my_uctype.h ++ my_user.h ++ my_xml.h ++ myisam.h ++ myisammrg.h ++ myisampack.h ++ mysql.h ++ mysql.h.pp ++ mysql_com.h ++ mysql_com_server.h ++ mysql_time.h ++ mysql_version.h.in ++ mysys_err.h ++ nullable.h ++ password.h ++ pfs_cond_provider.h ++ pfs_error_provider.h ++ pfs_file_provider.h ++ pfs_idle_provider.h ++ pfs_memory_provider.h ++ pfs_metadata_provider.h ++ pfs_mutex_provider.h ++ pfs_rwlock_provider.h ++ pfs_socket_provider.h ++ pfs_stage_provider.h ++ pfs_statement_provider.h ++ pfs_table_provider.h ++ pfs_thread_provider.h ++ pfs_transaction_provider.h ++ prealloced_array.h ++ print_version.h ++ priority_queue.h ++ rwlock_scoped_lock.h ++ scope_guard.h ++ service_versions.h ++ sha1.h ++ sha2.h ++ sql_chars.h ++ sql_common.h ++ sql_string.h ++ sslopt-case.h ++ sslopt-longopts.h ++ sslopt-vars.h ++ template_utils.h ++ thr_cond.h ++ thr_lock.h ++ thr_mutex.h ++ thr_rwlock.h ++ typelib.h ++ varlen_sort.h ++ violite.h ++ welcome_copyright_notice.h + ) + SET(HEADERS_MYSQL_DIR + mysql/client_plugin.h + mysql/plugin_auth_common.h ++ mysql/udf_registration_types.h ++ mysql/client_authentication.h ++ mysql/client_plugin.h.pp ++ mysql/com_data.h ++ mysql/get_password.h ++ mysql/group_replication_priv.h ++ mysql/innodb_priv.h ++ mysql/mysql_lex_string.h ++ mysql/plugin.h ++ mysql/plugin_audit.h ++ mysql/plugin_audit.h.pp ++ mysql/plugin_auth.h ++ mysql/plugin_auth.h.pp ++ mysql/plugin_auth_common.h ++ mysql/plugin_ftparser.h ++ mysql/plugin_ftparser.h.pp ++ mysql/plugin_group_replication.h ++ mysql/plugin_keyring.h ++ mysql/plugin_keyring.h.pp ++ mysql/plugin_query_rewrite.h ++ mysql/plugin_trace.h ++ mysql/plugin_validate_password.h ++ mysql/service_command.h ++ mysql/service_locking.h ++ mysql/service_my_plugin_log.h ++ mysql/service_mysql_alloc.h ++ mysql/service_mysql_keyring.h ++ mysql/service_mysql_password_policy.h ++ mysql/service_mysql_string.h ++ mysql/service_parser.h ++ mysql/service_plugin_registry.h ++ mysql/service_rpl_transaction_ctx.h ++ mysql/service_rpl_transaction_write_set.h ++ mysql/service_rules_table.h ++ mysql/service_security_context.h ++ mysql/service_srv_session.h ++ mysql/service_srv_session_info.h ++ mysql/service_ssl_wrapper.h ++ mysql/service_thd_alloc.h ++ mysql/service_thd_engine_lock.h ++ mysql/service_thd_wait.h ++ mysql/service_thread_scheduler.h ++ mysql/services.h ++ mysql/services.h.pp ++ mysql/thread_pool_priv.h ++ mysql/thread_type.h mysql/udf_registration_types.h ) -+IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - INSTALL(FILES ${HEADERS_MYSQL_DIR} DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development) -+ENDIF() Index: branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_my__compare.h (revision 522470) @@ -1,11 +1,11 @@ ---- include/my_compare.h.orig 2018-04-08 06:44:49 UTC +--- include/my_compare.h.orig 2019-09-20 08:30:51 UTC +++ include/my_compare.h @@ -49,7 +49,7 @@ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ -#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ +#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ #define HA_MAX_KEY_SEG 16 /* Max segments for key */ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6) Index: branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_my__thread__os__id.h (revision 522470) @@ -1,15 +1,15 @@ ---- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC +--- include/my_thread_os_id.h.orig 2019-09-20 08:30:51 UTC +++ include/my_thread_os_id.h -@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa +@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() { return pthread_getthreadid_np(); #else #ifdef HAVE_INTEGER_PTHREAD_SELF +# ifdef __DragonFly__ + return syscall(SYS_lwp_gettid); +# else /* Unknown platform, fallback. */ return pthread_self(); +# endif #else /* Feature not available. */ return 0; Index: branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_myisam.h (revision 522470) @@ -1,11 +1,11 @@ ---- include/myisam.h.orig 2018-04-08 06:44:49 UTC +--- include/myisam.h.orig 2019-09-20 08:30:51 UTC +++ include/myisam.h @@ -59,7 +59,7 @@ The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. */ -#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ +#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ #define MI_MAX_KEY_SEG 16 /* Max segments for key */ #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8) Index: branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h (revision 522470) @@ -0,0 +1,14 @@ +--- include/violite.h.orig 2019-09-20 08:30:51 UTC ++++ include/violite.h +@@ -269,9 +269,11 @@ struct st_VioSSLFd *new_VioSSLConnectorFd( + + long process_tls_version(const char *tls_version); + ++#ifndef LIBRESSL_VERSION_NUMBER + int set_fips_mode(const uint fips_mode, char *err_string); + + uint get_fips_mode(); ++#endif + + struct st_VioSSLFd *new_VioSSLAcceptorFd( + const char *key_file, const char *cert_file, const char *ca_file, Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-include_violite.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (revision 522470) @@ -1,31 +1,70 @@ ---- libmysql/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC +--- libmysql/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ libmysql/CMakeLists.txt -@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica - ADD_SUBDIRECTORY(authentication_ldap) - - # Merge several convenience libraries into one big mysqlclient +@@ -192,6 +192,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) + ) + ENDIF() + ++INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC") ++ENDIF() ++ + # + # Include protocol tracing infrastructure and the test + # trace plugin if enabled by build options. +@@ -240,12 +245,17 @@ IF(WIN32) + LIST(APPEND LIBS_TO_MERGE auth_win_client) + ENDIF() + +-# LDAP authentication SASL client plugin +-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +-ADD_SUBDIRECTORY(authentication_ldap) +- +-# Merge several convenience libraries into one big mysqlclient -MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) ++ # LDAP authentication SASL client plugin ++ MESSAGE(STATUS "Creating LDAP authentication SASL client library.") ++ ADD_SUBDIRECTORY(authentication_ldap) ++ ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) ++ENDIF(WITHOUT_CLIENTLIBS) TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects -@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED) - # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries SKIP_INSTALL) - TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) +@@ -281,12 +291,22 @@ ENDIF() -+IF(FALSE) - IF(WIN32) - # So that libmysql_api_test below can find the .dll - ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD -@@ -338,6 +339,7 @@ ENDIF() - # to initialize api_calls[] array in api_test.c - # - SET(CLIENT_API_FUNCTION_LIST "") -+ ENDIF() - FOREACH(api ${CLIENT_API_FUNCTIONS}) - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") - ENDFOREACH() + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. ++IF(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} + EXPORTS + ${CLIENT_API_FUNCTIONS} + ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + ${CLIENT_API_NONBLOCKING_FUNCTIONS} ++ COMPONENT SharedLibraries ++ SKIP_INSTALL ) ++ELSE(WITHOUT_CLIENTLIBS) ++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} ++ EXPORTS ++ ${CLIENT_API_FUNCTIONS} ++ ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ++ ${CLIENT_API_NONBLOCKING_FUNCTIONS} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK}) + + IF(WIN32) +@@ -300,7 +320,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: branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-libservices_CMakeLists.txt (revision 522470) @@ -1,13 +1,12 @@ ---- libservices/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +--- libservices/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ libservices/CMakeLists.txt @@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES plugin_registry_service.c) ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES}) +IF(FALSE) IF(INSTALL_STATIC_LIBRARIES) INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() ENDIF() - Index: branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-man_CMakeLists.txt (revision 522470) @@ -1,14 +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 -@@ -21,9 +21,8 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +@@ -23,29 +23,14 @@ # Copy man pages --FILE(GLOB MAN1 *.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN1_ROUTER mysqlrouter*.1) -+FILE(GLOB MAN1 *.1) -+FILE(GLOB MAN1_ROUTER mysqlroutermy_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) - FILE(GLOB MAN8 *.8) - FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) + SET(MAN1 + comp_err.1 +- ibd2sdi.1 +- innochecksum.1 + lz4_decompress.1 +- my_print_defaults.1 +- myisam_ftdump.1 +- myisamchk.1 +- myisamlog.1 +- myisampack.1 + mysql.1 +- 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 + 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 + zlib_decompress.1 + ) ++SET(MAN1_TOOLS ++ ibd2sdi.1 ++ innochecksum.1 ++ my_print_defaults.1 ++ myisam_ftdump.1 ++ myisamchk.1 ++ myisamlog.1 ++ myisampack.1 ++ mysql.server.1 ++ mysql_secure_installation.1 ++ mysql_ssl_rsa_setup.1 ++ mysql_tzinfo_to_sql.1 ++ mysql_upgrade.1 ++ mysqldumpslow.1 ++ mysqld_multi.1 ++ mysqld_safe.1 ++ ) + SET(MAN1_NDB + ndb-common-options.1 + ndb_blob_tool.1 +@@ -99,8 +101,15 @@ SET(MAN8_NDB + ndbmtd.8 + ) + +-INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages) +-INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages) ++IF(NOT WITHOUT_CLIENTLIBS) ++ 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) ++ENDIF() + + IF(WITH_ROUTER) + INSTALL(FILES ${MAN1_ROUTER} Index: branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__default.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__default.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__default.cc (revision 522470) @@ -0,0 +1,62 @@ +--- mysys/my_default.cc.orig 2019-09-20 08:30:51 UTC ++++ mysys/my_default.cc +@@ -203,7 +203,7 @@ bool no_defaults = false; + + /* Which directories are searched for options (and in which order) */ + +-#define MAX_DEFAULT_DIRS 6 ++#define MAX_DEFAULT_DIRS 7 + #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ + static const char **default_directories = NULL; + +@@ -909,6 +909,14 @@ static int search_default_file_with_ext(Process_option + return 1; /* Ignore wrong files */ + } + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { + line++; + /* Ignore comment and empty lines */ +@@ -1228,7 +1236,8 @@ void my_print_default_files(const char *conf_file) { + end[(strlen(end) - 1)] = ' '; + else + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1565,14 +1574,9 @@ static const char **init_default_directories(MEM_ROOT + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ +- + #endif + + if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs); +@@ -1635,7 +1639,7 @@ int check_file_permissions(const char *file_name, bool + #if !defined(_WIN32) + MY_STAT stat_info; + +- if (!my_stat(file_name, &stat_info, MYF(0))) return 1; ++ if (!my_stat(file_name, &stat_info, MYF(0))) return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__default.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__md5.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__md5.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__md5.cc (revision 522470) @@ -0,0 +1,12 @@ +--- mysys/my_md5.cc.orig 2019-09-20 08:30:51 UTC ++++ mysys/my_md5.cc +@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigne + int compute_md5_hash(char *digest, const char *buf, int len) { + int retval = 0; + int fips_mode = 0; ++#ifndef LIBRESSL_VERSION_NUMBER + fips_mode = FIPS_mode(); ++#endif /* LIBRESSL_VERSION_NUMBER */ + /* If fips mode is ON/STRICT restricted method calls will result into abort, + * skipping call. */ + if (fips_mode == 0) { Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-mysys_my__md5.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c (revision 522470) @@ -0,0 +1,31 @@ +--- 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 +@@ -329,6 +329,7 @@ error: + return 1; + } + ++#ifndef LIBRESSL_VERSION_NUMBER + #define OPENSSL_ERROR_LENGTH 512 + static int configure_ssl_fips_mode(const uint fips_mode) { + int rc = -1; +@@ -352,6 +353,7 @@ static int configure_ssl_fips_mode(const uint fips_mod + EXIT: + return rc; + } ++#endif + + static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file, + const char *ca_path) { +@@ -555,10 +557,12 @@ int xcom_init_ssl(const char *server_key_file, const c + int verify_server = SSL_VERIFY_NONE; + int verify_client = SSL_VERIFY_NONE; + ++#ifndef LIBRESSL_VERSION_NUMBER + if (configure_ssl_fips_mode(ssl_fips_mode) != 1) { + G_ERROR("Error setting the ssl fips mode"); + goto error; + } ++#endif + + SSL_library_init(); + SSL_load_error_strings(); Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (revision 522470) @@ -1,12 +1,11 @@ ---- plugin/password_validation/validate_password.cc.orig 2017-06-27 11:44:29 UTC +--- plugin/password_validation/validate_password.cc.orig 2019-09-20 08:30:51 UTC +++ plugin/password_validation/validate_password.cc -@@ -17,6 +17,8 @@ +@@ -25,6 +25,8 @@ #include #include #include +/* solve clash between libc++ bitset::test() and test macro from my_global.h */ +#undef test #include #include #include - Index: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt (revision 522470) @@ -1,16 +1,11 @@ ---- plugin/x/CMakeLists.txt.orig 2018-04-08 06:44:49 UTC +--- plugin/x/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ plugin/x/CMakeLists.txt -@@ -80,11 +80,14 @@ INCLUDE_DIRECTORIES( +@@ -77,6 +77,8 @@ INCLUDE_DIRECTORIES( ${MYSQLX_GENERATE_DIR} ${MYSQLX_PROTOCOL_INCLUDE_DIR} ${MYSQLX_CLIENT_INCLUDE_DIR} ++ ${OPENSSL_INCLUDE_DIR} + ${BOOST_INCLUDE_DIR} ) MY_INCLUDE_SYSTEM_DIRECTORIES(PROTOBUF) - MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT) - MY_INCLUDE_SYSTEM_DIRECTORIES(ICU) -+MY_INCLUDE_SYSTEM_DIRECTORIES(SSL) -+MY_INCLUDE_SYSTEM_DIRECTORIES(ZLIB) - - SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB Index: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc (revision 522470) @@ -0,0 +1,11 @@ +--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig 2019-09-20 08:30:51 UTC ++++ plugin/x/client/authentication/sha256_scramble_generator.cc +@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig + return true; + } + m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if 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: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc (revision 522470) @@ -1,37 +1,32 @@ ---- plugin/x/client/xconnection_impl.cc.orig 2018-04-08 06:44:49 UTC +--- plugin/x/client/xconnection_impl.cc.orig 2019-09-20 08:30:51 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"}; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -- const auto cn = reinterpret_cast(ASN1_STRING_data(cn_asn1)); --#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - const auto cn = - reinterpret_cast(ASN1_STRING_get0_data(cn_asn1)); --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#else -+ const auto cn = reinterpret_cast(ASN1_STRING_data(cn_asn1)); -+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ - 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 +@@ -521,6 +521,7 @@ XError Connection_impl::get_ssl_error(const int error_ return XError(CR_SSL_CONNECTION_ERROR, buffer); } --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef 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() { +@@ -559,6 +560,7 @@ int set_fips_mode(const uint fips_mode, char err_strin + EXIT: + return rc; + } ++#endif + + XError Connection_impl::activate_tls() { + if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET); +@@ -569,11 +571,13 @@ XError Connection_impl::activate_tls() { if (!m_context->m_ssl_config.is_configured()) - return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED}; + return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true}; --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef 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) { + if (set_fips_mode(static_cast(m_context->m_ssl_config.m_ssl_fips_mode), + err_string) != 1) { + return XError{CR_SSL_CONNECTION_ERROR, err_string, true}; + } ++#endif + auto ssl_ctx_flags = process_tls_version( + details::null_when_empty(m_context->m_ssl_config.m_tls_version)); + Index: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_configure.cmake =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_configure.cmake (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_configure.cmake (revision 522470) @@ -1,15 +1,15 @@ ---- plugin/x/configure.cmake.orig 2018-04-08 06:44:49 UTC +--- plugin/x/configure.cmake.orig 2019-09-20 08:30:51 UTC +++ plugin/x/configure.cmake -@@ -44,6 +44,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src - CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in +@@ -45,6 +45,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx + CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in ${MYSQLX_GENERATE_DIR}/mysqlx_version.h ) +IF(FALSE) INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_error.h DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) -@@ -55,3 +56,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mys +@@ -56,3 +57,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_ername.h INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) +ENDIF() Index: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc (revision 522470) @@ -0,0 +1,11 @@ +--- router/src/http/src/tls_client_context.cc.orig 2019-09-20 08:30:51 UTC ++++ router/src/http/src/tls_client_context.cc +@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) { + + void TlsClientContext::cipher_suites(const std::string &ciphers) { + // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites() +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1) ++#ifdef TLS1_3_VERSION + if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) { + throw TlsError("set-cipher-suites"); + } Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__client__context.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc (revision 522470) @@ -0,0 +1,34 @@ +--- router/src/http/src/tls_context.cc.orig 2019-09-20 08:30:51 UTC ++++ router/src/http/src/tls_context.cc +@@ -91,7 +91,7 @@ static constexpr int o11x_version(TlsVersion version) + return TLS1_1_VERSION; + case TlsVersion::TLS_1_2: + return TLS1_2_VERSION; +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1) ++#ifdef TLS1_3_VERSION + case TlsVersion::TLS_1_3: + return TLS1_3_VERSION; + #endif +@@ -121,9 +121,11 @@ void TlsContext::version_range(TlsVersion min_version, + default: + // unknown, leave all disabled + // fallthrough ++#ifdef TLS1_3_VERSION + case TlsVersion::TLS_1_3: + opts |= SSL_OP_NO_TLSv1_2; + // fallthrough ++#endif + case TlsVersion::TLS_1_2: + opts |= SSL_OP_NO_TLSv1_1; + // fallthrough +@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const { + return TlsVersion::TLS_1_1; + case TLS1_2_VERSION: + return TlsVersion::TLS_1_2; ++#ifdef TLS1_3_VERSION + case TLS1_3_VERSION: + return TlsVersion::TLS_1_3; ++#endif + case 0: + return TlsVersion::AUTO; + default: Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc (revision 522470) @@ -0,0 +1,12 @@ +--- router/src/http/src/tls_server_context.cc.orig 2019-09-20 08:30:51 UTC ++++ router/src/http/src/tls_server_context.cc +@@ -166,7 +166,8 @@ void TlsServerContext::init_tmp_dh(const std::string & + } + + } else { +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) ++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) + dh2048.reset(DH_get_2048_256()); + #else + /* Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__server__context.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt (revision 522470) @@ -1,45 +1,64 @@ ---- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- scripts/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ scripts/CMakeLists.txt -@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -327,7 +327,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) + FOREACH(lib ${${target}_LIB_DEPENDS}) + # Filter out "general", it is not a library, just CMake hint +- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") ++ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto") + IF (lib MATCHES "^\\-l") + SET(${var} "${${var}} ${lib} ") + ELSEIF (lib MATCHES "^\\-L") +@@ -337,6 +337,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,14 +432,13 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) +@@ -423,18 +425,23 @@ ELSE() -+ IF(WITH_SYSTEMD) SET(BIN_SCRIPTS - mysql_config mysqldumpslow ) ELSE() SET(BIN_SCRIPTS - mysql_config mysqldumpslow mysqld_multi mysqld_safe -@@ -485,7 +486,7 @@ + ) + ENDIF() + ++ IF(NOT WITHOUT_CLIENTLIBS) ++ SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++ ) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) + STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") + SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig") +@@ -449,7 +456,7 @@ ELSE() ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} ESCAPE_QUOTES @ONLY) - IF(INSTALL_PKGCONFIGDIR) -+ IF(FALSE) ++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} -@@ -498,7 +499,7 @@ +@@ -462,7 +469,7 @@ ELSE() FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) Index: branches/2020Q1/databases/mysql80-server/files/patch-sql-common_client.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-sql-common_client.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-sql-common_client.cc (revision 522470) @@ -1,11 +1,11 @@ ---- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC +--- sql-common/client.cc.orig 2019-09-20 08:30:51 UTC +++ sql-common/client.cc -@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, +@@ -7715,7 +7715,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt #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) +-#if defined(HAVE_OPENSSL) ++#if defined(HAVE_OPENSSL) && !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; + mysql->options.extension->ssl_fips_mode = *static_cast(arg); Index: branches/2020Q1/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc (revision 522470) @@ -1,11 +1,11 @@ ---- sql/auth/sha2_password_common.cc.orig 2018-05-06 18:47:55 UTC +--- sql/auth/sha2_password_common.cc.orig 2019-09-20 08:30:51 UTC +++ sql/auth/sha2_password_common.cc -@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsi - DBUG_RETURN(true); +@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig + 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 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if 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); Index: branches/2020Q1/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (revision 522470) @@ -1,32 +1,32 @@ ---- sql/conn_handler/socket_connection.cc.orig 2019-01-21 20:10:03 UTC +--- sql/conn_handler/socket_connection.cc.orig 2019-09-20 08:30:51 UTC +++ sql/conn_handler/socket_connection.cc -@@ -873,9 +873,11 @@ bool check_connection_refused_by_tcp_wra +@@ -950,9 +950,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE, mysql_socket_getfd(connect_sock), NULL); - fromhost(&req); + void (*my_fromhost) (void *) = (void (*)(void *)) fromhost; + my_fromhost(&req); - if (!hosts_access(&req)) { + int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; + if (!my_hosts_access(&req)) { /* This may be stupid but refuse() includes an exit(0) which we surely don't want... -@@ -887,12 +889,13 @@ bool check_connection_refused_by_tcp_wra +@@ -964,12 +966,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC This is unproblematic as TCP-wrapper is unix specific, anyway. */ + char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; syslog(LOG_AUTH | LOG_WARNING, "refused connect from %s", - eval_client(&req)); + my_eval_client(&req)); #ifdef HAVE_LIBWRAP_PROTOTYPES // Some distros have patched tcpd.h to have proper prototypes - if (req.sink) (req.sink)(req.fd); + if (req.sink) ((void (*)(int)) (req.sink))(req.fd); #else // Some distros have not patched tcpd.h if (req.sink) ((void (*)(int))req.sink)(req.fd); Index: branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc (revision 522470) @@ -1,20 +1,11 @@ ---- sql/mysqld.cc.orig 2018-10-07 08:44:22 UTC +--- sql/mysqld.cc.orig 2019-09-20 08:30:51 UTC +++ sql/mysqld.cc -@@ -4493,7 +4493,7 @@ static int warn_self_signed_ca() { +@@ -4797,7 +4797,7 @@ static int init_thread_environment() { static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int -@@ -4530,7 +4530,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, Index: branches/2020Q1/databases/mysql80-server/files/patch-sql_sys__vars.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-sql_sys__vars.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-sql_sys__vars.cc (revision 522470) @@ -1,65 +1,55 @@ ---- sql/sys_vars.cc.orig 2018-04-08 06:44:49 UTC +--- sql/sys_vars.cc.orig 2019-09-20 08:30:51 UTC +++ sql/sys_vars.cc -@@ -1792,7 +1792,7 @@ static Sys_var_ulong Sys_interactive_tim - "The number of seconds the server waits for activity on an interactive " - "connection before closing it", - SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); +@@ -1841,7 +1841,7 @@ static Sys_var_ulong Sys_connect_timeout( + "The number of seconds the mysqld server is waiting for a connect " + "packet before responding with 'Bad handshake'", + GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1)); ++ VALID_RANGE(2, INT_MAX32 / 1000), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1)); - static Sys_var_ulong Sys_join_buffer_size( - "join_buffer_size", "The size of the buffer that is used for full joins", -@@ -2594,7 +2594,7 @@ static Sys_var_ulong Sys_net_read_timeou + static Sys_var_ulong Sys_information_schema_stats_expiry( + "information_schema_stats_expiry", +@@ -2890,7 +2890,7 @@ static Sys_var_ulong Sys_net_read_timeout( "Number of seconds to wait for more data from a connection before " "aborting the read", SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_read_timeout)); -@@ -2615,7 +2615,7 @@ static Sys_var_ulong Sys_net_write_timeo +@@ -2911,7 +2911,7 @@ static Sys_var_ulong Sys_net_write_timeout( "Number of seconds to wait for a block to be written to a connection " "before aborting the write", SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -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) +@@ -4416,7 +4416,7 @@ static Sys_var_ulong Sys_max_execution_time( + "milliseconds", + HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG), + VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); +- ++#ifndef 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), +@@ -4436,6 +4436,16 @@ static Sys_var_enum Sys_ssl_fips_mode( + GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, 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), -@@ -4429,7 +4429,7 @@ static Sys_var_ulong Sys_net_wait_timeou - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32 / 1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32 / 1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + ON_CHECK(NULL), ON_UPDATE(update_fips_mode), NULL); ++#else ++static const char *ssl_fips_mode_names[] = {"OFF", 0}; ++static Sys_var_enum Sys_ssl_fips_mode( ++ "ssl_fips_mode", ++ "SSL FIPS mode (applies only for OpenSSL); " ++ "permitted values are: OFF", ++ GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), ++ ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ++ ON_CHECK(NULL), ON_UPDATE(NULL), NULL); ++#endif - static Sys_var_plugin Sys_default_storage_engine( + #if defined(HAVE_OPENSSL) + static Sys_var_bool Sys_auto_generate_certs( Index: branches/2020Q1/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h (revision 522470) @@ -1,13 +1,13 @@ ---- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC +--- storage/innobase/include/srv0mon.h.orig 2019-09-20 08:30:51 UTC +++ storage/innobase/include/srv0mon.h -@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang +@@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, /* Required for FreeBSD so that INT64_MAX is defined. */ #define __STDC_LIMIT_MACROS #endif /* __STDC_LIMIT_MACROS */ +#ifdef __DragonFly__ +/* The hack above doen't work for dragonfly, stdint.h already imported */ +#include +#endif #include Index: branches/2020Q1/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc (revision 522470) @@ -1,22 +1,22 @@ ---- storage/myisam/mi_dynrec.cc.orig 2016-03-28 18:06:12 UTC +--- storage/myisam/mi_dynrec.cc.orig 2019-09-20 08:30:51 UTC +++ storage/myisam/mi_dynrec.cc -@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my - DBUG_RETURN(1); +@@ -83,17 +83,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) { + return 1; } /* - I wonder if it is good to use MAP_NORESERVE. From the Linux man page: - MAP_NORESERVE - Do not reserve swap space for this mapping. When swap space is - reserved, one has the guarantee that it is possible to modify the - mapping. When swap space is not reserved one might get SIGSEGV - upon a write if no physical memory is available. + MAP_NORESERVE is unimplemented in FreeBSD */ info->s->file_map = (uchar *)my_mmap( 0, (size_t)size, info->s->mode == O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_NORESERVE, info->dfile, 0L); + MAP_SHARED, info->dfile, 0L); if (info->s->file_map == (uchar *)MAP_FAILED) { info->s->file_map = NULL; - + return 1; Index: branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt (revision 522470) @@ -1,13 +1,27 @@ ---- support-files/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +--- support-files/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ support-files/CMakeLists.txt -@@ -24,8 +24,10 @@ IF(NOT UNIX) +@@ -24,8 +24,9 @@ IF(NOT UNIX) RETURN() ENDIF() -+IF(FALSE) - INSTALL(FILES mysql.m4 - DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() +-INSTALL(FILES mysql.m4 +- DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) ++IF(NOT WITHOUT_CLIENTLIBS) ++ INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) ++ENDIF(NOT WITHOUT_CLIENTLIBS) SET(localstatedir "${MYSQL_DATADIR}") - + +@@ -39,6 +40,7 @@ ELSE() + SET (PIDOF "pgrep -d' ' -f") + ENDIF() + ++IF(NOT WITHOUT_SERVER) + FOREACH(script + mysql.server + mysqld_multi.server +@@ -54,3 +56,4 @@ FOREACH(script + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + ENDFOREACH() ++ENDIF() Index: branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt (revision 522470) @@ -0,0 +1,59 @@ +--- utilities/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC ++++ utilities/CMakeLists.txt +@@ -99,10 +99,30 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) + ADD_DEPENDENCIES(comp_err copy_openssl_dlls) + ENDIF() + ++IF(WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(my_print_defaults + my_print_defaults.cc + COMPONENT Server + LINK_LIBRARIES mysys ++ SKIP_INSTALL ) ++MYSQL_ADD_EXECUTABLE(perror ++ perror.cc ++ COMPONENT Server ++ DEPENDENCIES GenError ++ LINK_LIBRARIES mysys ++ SKIP_INSTALL ) ++IF(BUILD_BUNDLED_LZ4) ++ MYSQL_ADD_EXECUTABLE(lz4_decompress ++ lz4_decompress.cc ++ COMPONENT Server ++ LINK_LIBRARIES ${LZ4_LIBRARY} mysys ++ SKIP_INSTALL ) ++ENDIF() ++ELSE(WITHOUT_CLIENTLIBS) ++MYSQL_ADD_EXECUTABLE(my_print_defaults ++ my_print_defaults.cc ++ COMPONENT Server ++ LINK_LIBRARIES mysys + ) + MYSQL_ADD_EXECUTABLE(perror + perror.cc +@@ -117,14 +137,25 @@ 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 ++ 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(WITHOUT_CLIENTLIBS) + + # All targets below belong to COMPONENT Server and depend on InnoDB. + IF(WITHOUT_SERVER) Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc (nonexistent) +++ branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc (revision 522470) @@ -0,0 +1,20 @@ +--- vio/viossl.cc.orig 2019-09-20 08:30:51 UTC ++++ vio/viossl.cc +@@ -490,7 +490,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l + #if !defined(DBUG_OFF) + { + STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; +- ssl_comp_methods = SSL_COMP_get_compression_methods(); ++ ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods(); + n = sk_SSL_COMP_num(ssl_comp_methods); + DBUG_PRINT("info", ("Available compression methods:\n")); + if (n == 0) +@@ -498,7 +498,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l + else + for (j = 0; j < n; j++) { + SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + DBUG_PRINT("info", Property changes on: branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/databases/mysql80-server/files/patch-vio_viosslfactories.cc =================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-vio_viosslfactories.cc (revision 522469) +++ branches/2020Q1/databases/mysql80-server/files/patch-vio_viosslfactories.cc (revision 522470) @@ -1,56 +1,26 @@ ---- vio/viosslfactories.cc.orig 2018-04-08 06:44:49 UTC +--- vio/viosslfactories.cc.orig 2019-09-20 08:30:51 UTC +++ vio/viosslfactories.cc -@@ -37,6 +37,7 @@ +@@ -38,6 +38,7 @@ #ifdef HAVE_OPENSSL #include +#include #define TLS_VERSION_OPTION_SIZE 256 #define SSL_CIPHER_LIST_SIZE 4096 -@@ -135,7 +136,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 --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - || !DH_set0_pqg(dh, p, NULL, g) - #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ - ) { -@@ -143,7 +144,7 @@ static DH *get_dh2048(void) { - DH_free(dh); - return NULL; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - dh->p = p; - dh->g = g; - #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -@@ -426,7 +427,7 @@ void ssl_start() { +@@ -420,6 +421,7 @@ void ssl_start() { } } --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef 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'; - } +@@ -473,6 +475,7 @@ EXIT: + @returns openssl current fips mode + */ + uint get_fips_mode() { return FIPS_mode(); } +#endif - EXIT: - return rc; - } + + long process_tls_version(const char *tls_version) { + const char *separator = ","; Index: branches/2020Q1/databases/mysql80-server/pkg-plist =================================================================== --- branches/2020Q1/databases/mysql80-server/pkg-plist (revision 522469) +++ branches/2020Q1/databases/mysql80-server/pkg-plist (revision 522470) @@ -1,217 +1,223 @@ LICENSE.router README.router bin/ibd2sdi bin/innochecksum -bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack +bin/mysqldumpslow +bin/mysql_client_test bin/mysql_secure_installation +bin/mysql_ssl_rsa_setup bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe -bin/mysqldumpslow bin/mysqlrouter +bin/mysqlrouter_keyring bin/mysqlrouter_passwd bin/mysqlrouter_plugin_info bin/mysqltest +bin/mysqltest_safe_process bin/mysqlxtest -bin/perror -bin/zlib_decompress lib/mysql/libmysqlharness.a lib/mysql/libmysqlharness.so lib/mysql/libmysqlharness.so.1 lib/mysql/libmysqlrouter.so lib/mysql/libmysqlrouter.so.1 lib/mysql/libmysqlrouter_http.so lib/mysql/libmysqlrouter_http.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/keepalive.so lib/mysql/mysqlrouter/metadata_cache.so lib/mysql/mysqlrouter/mysql_protocol.so 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/routing.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/component_audit_api_message_emit.so lib/mysql/plugin/component_example_component1.so lib/mysql/plugin/component_example_component2.so lib/mysql/plugin/component_example_component3.so lib/mysql/plugin/component_log_filter_dragnet.so lib/mysql/plugin/component_log_sink_json.so lib/mysql/plugin/component_log_sink_syseventlog.so lib/mysql/plugin/component_log_sink_test.so +lib/mysql/plugin/component_mysqlbackup.so lib/mysql/plugin/component_mysqlx_global_reset.so 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_host_application_signal.so lib/mysql/plugin/component_test_mysql_current_thread_reader.so lib/mysql/plugin/component_test_mysql_runtime_error.so lib/mysql/plugin/component_test_pfs_notification.so lib/mysql/plugin/component_test_pfs_resource_group.so lib/mysql/plugin/component_test_status_var_service.so lib/mysql/plugin/component_test_status_var_service_int.so lib/mysql/plugin/component_test_status_var_service_reg_only.so lib/mysql/plugin/component_test_status_var_service_str.so lib/mysql/plugin/component_test_status_var_service_unreg_only.so lib/mysql/plugin/component_test_string_service.so lib/mysql/plugin/component_test_string_service_charset.so lib/mysql/plugin/component_test_string_service_long.so lib/mysql/plugin/component_test_sys_var_service.so lib/mysql/plugin/component_test_sys_var_service_int.so lib/mysql/plugin/component_test_sys_var_service_same.so lib/mysql/plugin/component_test_sys_var_service_str.so lib/mysql/plugin/component_test_system_variable_source.so lib/mysql/plugin/component_test_udf_registration.so lib/mysql/plugin/component_udf_reg_3_func.so lib/mysql/plugin/component_udf_reg_avg_func.so lib/mysql/plugin/component_udf_reg_int_func.so lib/mysql/plugin/component_udf_reg_int_same_func.so lib/mysql/plugin/component_udf_reg_only_3_func.so lib/mysql/plugin/component_udf_reg_real_func.so lib/mysql/plugin/component_udf_unreg_3_func.so lib/mysql/plugin/component_udf_unreg_int_func.so lib/mysql/plugin/component_udf_unreg_real_func.so lib/mysql/plugin/component_validate_password.so lib/mysql/plugin/connection_control.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/ddl_rewriter.so lib/mysql/plugin/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/ha_mock.so lib/mysql/plugin/keyring_file.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libtest_framework.so lib/mysql/plugin/libtest_services.so lib/mysql/plugin/libtest_services_threaded.so lib/mysql/plugin/libtest_session_attach.so lib/mysql/plugin/libtest_session_detach.so lib/mysql/plugin/libtest_session_in_thd.so lib/mysql/plugin/libtest_session_info.so lib/mysql/plugin/libtest_sql_2_sessions.so lib/mysql/plugin/libtest_sql_all_col_types.so lib/mysql/plugin/libtest_sql_cmds_1.so lib/mysql/plugin/libtest_sql_commit.so lib/mysql/plugin/libtest_sql_complex.so lib/mysql/plugin/libtest_sql_errors.so lib/mysql/plugin/libtest_sql_lock.so lib/mysql/plugin/libtest_sql_processlist.so lib/mysql/plugin/libtest_sql_replication.so lib/mysql/plugin/libtest_sql_reset_connection.so lib/mysql/plugin/libtest_sql_shutdown.so lib/mysql/plugin/libtest_sql_sqlmode.so lib/mysql/plugin/libtest_sql_stmt.so lib/mysql/plugin/libtest_sql_stored_procedures_functions.so lib/mysql/plugin/libtest_sql_views_triggers.so lib/mysql/plugin/libtest_x_sessions_deinit.so lib/mysql/plugin/libtest_x_sessions_init.so lib/mysql/plugin/locking_service.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_clone.so lib/mysql/plugin/mysql_no_login.so lib/mysql/plugin/pfs_example_plugin_employee.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/replication_observers_example_plugin.so lib/mysql/plugin/rewrite_example.so lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so lib/mysql/plugin/test_services_host_application_signal.so lib/mysql/plugin/test_services_plugin_registry.so lib/mysql/plugin/udf_example.so lib/mysql/plugin/keyring_udf.so lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so libexec/mysqld +man/man1/ibd2sdi.1.gz +man/man1/innochecksum.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.server.1.gz man/man1/mysql_secure_installation.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/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz -man/man1/mysqlman.1.gz -man/man1/perror.1.gz +man/man1/mysqlrouter_passwd.1.gz +man/man1/mysqlrouter_plugin_info.1.gz +man/man1/mysqlrouter.1.gz man/man8/mysqld.8.gz %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dictionary.txt %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/french/errmsg.sys %%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 %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%DATADIR%%/uninstall_rewriter.sql @dir lib/mysql/plugin/debug @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample @dir(mysql,mysql,0750) %%ETCDIR%%/keyring @dir(mysql,mysql,0750) %%MY_SECDIR%% @dir(mysql,mysql,0750) %%MY_TMPDIR%% Index: branches/2020Q1 =================================================================== --- branches/2020Q1 (revision 522469) +++ branches/2020Q1 (revision 522470) Property changes on: branches/2020Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r522436