Index: head/databases/mysql80-client/Makefile =================================================================== --- head/databases/mysql80-client/Makefile (revision 469733) +++ head/databases/mysql80-client/Makefile (revision 469734) @@ -1,41 +1,42 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 BROKEN_powerpc64= does not build: reports unsupported compiler BROKEN_sparc64= does not build: reports unsupported compiler MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/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 CLIENT_ONLY= 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: head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-client/files/patch-sql_share_CMakeLists.txt (nonexistent) @@ -1,27 +0,0 @@ ---- sql/share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC -+++ sql/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}/sql/share/dictionary.txt) - ENDIF() - -+IF (FALSE) - INSTALL(FILES ${files} - DESTINATION ${INSTALL_MYSQLSHAREDIR} - COMPONENT Server - ) -+ENDIF() Property changes on: head/databases/mysql80-client/files/patch-sql_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: head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.c =================================================================== --- head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.c (revision 469733) +++ head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.c (nonexistent) @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC -+++ storage/myisam/mi_dynrec.c -@@ -65,18 +65,13 @@ my_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, -+ MAP_SHARED, - info->dfile, 0L); - if (info->s->file_map == (uchar*) MAP_FAILED) - { Property changes on: head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.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: head/databases/mysql80-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-CMakeLists.txt (revision 469733) +++ head/databases/mysql80-client/files/patch-CMakeLists.txt (revision 469734) @@ -1,44 +1,40 @@ ---- CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +--- CMakeLists.txt.orig 2018-05-03 10:27:45 UTC +++ CMakeLists.txt -@@ -700,9 +700,6 @@ IF(NOT WITHOUT_SERVER) +@@ -835,14 +835,12 @@ 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 "") # Add storage engines and plugins. CONFIGURE_PLUGINS() -ELSE() - # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1 - ADD_SUBDIRECTORY(storage/ndb) ENDIF() - ADD_SUBDIRECTORY(include) -@@ -715,6 +712,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_COMPONENT_LIBS "" CACHE INTERNAL "") -@@ -811,14 +809,13 @@ ELSE() - SET(CPACK_GENERATOR "TGZ") - ENDIF() +@@ -966,12 +964,10 @@ ENDIF() ADD_SUBDIRECTORY(packaging/WiX) --ADD_SUBDIRECTORY(packaging/solaris) + ADD_SUBDIRECTORY(packaging/solaris) - IF(UNIX) +-IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - ENDIF() +-ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -841,6 +838,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE + 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}) +@@ -990,6 +986,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "README.build" EXCLUDE ) ENDIF() +ENDIF() - INCLUDE(CPack) - + IF(UNIX) + EXECUTE_PROCESS( Index: head/databases/mysql80-client/files/patch-cmake_ssl.cmake =================================================================== --- head/databases/mysql80-client/files/patch-cmake_ssl.cmake (revision 469733) +++ head/databases/mysql80-client/files/patch-cmake_ssl.cmake (revision 469734) @@ -1,15 +1,14 @@ ---- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC +--- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC +++ cmake/ssl.cmake -@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION STREQUAL "1" +@@ -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) -+ ELSEIF(OPENSSL_INCLUDE_DIR AND -+ OPENSSL_LIBRARY AND -+ CRYPTO_LIBRARY AND -+ OPENSSL_MAJOR_VERSION STREQUAL "2" -+ ) -+ SET(OPENSSL_FOUND TRUE) - ELSE() - SET(OPENSSL_FOUND FALSE) - ENDIF() + FIND_PROGRAM(OPENSSL_EXECUTABLE openssl Index: head/databases/mysql80-client/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-include_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-client/files/patch-include_CMakeLists.txt (revision 469734) @@ -1,182 +1,176 @@ --- include/CMakeLists.txt.orig 2017-09-21 15:51:58 UTC +++ include/CMakeLists.txt -@@ -30,11 +30,179 @@ SET(HEADERS +@@ -30,11 +30,173 @@ SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h ../libbinlogevents/export/binary_log_types.h + base64.h + big_endian.h -+ byte_order_generic.h -+ byte_order_generic_x86.h + c_string_less.h + crypt_genhash_impl.h + decimal.h + depth_first_search.h + dur_prop.h + errmsg.h + ft_global.h -+ hash.h + heap.h + keycache.h + lex_string.h + lf.h + little_endian.h + m_ctype.h + m_string.h + map_helpers.h -+ mem_root_fwd.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 -+ str_uca_type.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_my_snprintf.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) Index: head/databases/mysql80-client/files/patch-include_my__compare.h =================================================================== --- head/databases/mysql80-client/files/patch-include_my__compare.h (revision 469733) +++ head/databases/mysql80-client/files/patch-include_my__compare.h (revision 469734) @@ -1,11 +1,11 @@ ---- include/my_compare.h.orig 2016-03-28 18:06:12 UTC +--- include/my_compare.h.orig 2018-04-08 06:44:49 UTC +++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { +@@ -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_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) + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6) Index: head/databases/mysql80-client/files/patch-include_myisam.h =================================================================== --- head/databases/mysql80-client/files/patch-include_myisam.h (revision 469733) +++ head/databases/mysql80-client/files/patch-include_myisam.h (revision 469734) @@ -1,11 +1,11 @@ ---- include/myisam.h.orig 2016-03-28 18:06:12 UTC +--- include/myisam.h.orig 2018-04-08 06:44:49 UTC +++ include/myisam.h -@@ -45,7 +45,7 @@ extern "C" { +@@ -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_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) + #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8) Index: head/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc =================================================================== --- head/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (revision 469733) +++ head/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc (revision 469734) @@ -1,61 +1,60 @@ --- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +++ mysys_ssl/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 */ + #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 */ + 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)) - { + 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)] = ' '; + end[(strlen(end) - 1)] = ' '; else - strxmov(end, conf_file, *ext , " ", NullS); + 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; -+ return 0; +- 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. Index: head/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc =================================================================== --- head/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc (revision 469734) @@ -0,0 +1,11 @@ +--- mysys_ssl/my_md5.cc.orig 2018-04-08 06:44:49 UTC ++++ mysys_ssl/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: head/databases/mysql80-client/files/patch-mysys__ssl_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: head/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc =================================================================== --- head/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc (revision 469734) @@ -0,0 +1,37 @@ +--- 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: head/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.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: head/databases/mysql80-client/files/patch-share_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-share_CMakeLists.txt (nonexistent) +++ head/databases/mysql80-client/files/patch-share_CMakeLists.txt (revision 469734) @@ -0,0 +1,27 @@ +--- 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: head/databases/mysql80-client/files/patch-share_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: head/databases/mysql80-client/files/patch-sql-common_client.cc =================================================================== --- head/databases/mysql80-client/files/patch-sql-common_client.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-sql-common_client.cc (revision 469734) @@ -0,0 +1,27 @@ +--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC ++++ sql-common/client.cc +@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- cn = (char *)ASN1_STRING_data(cn_asn1); +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + cn = (char *)ASN1_STRING_get0_data(cn_asn1); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ ++ cn = (char *)ASN1_STRING_data(cn_asn1); ++#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ + + // There should not be any NULL embedded in the CN + if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) { +@@ -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: head/databases/mysql80-client/files/patch-sql-common_client.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: head/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc =================================================================== --- head/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc (revision 469734) @@ -0,0 +1,11 @@ +--- 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: head/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.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: head/databases/mysql80-client/files/patch-sql_mysqld.cc =================================================================== --- head/databases/mysql80-client/files/patch-sql_mysqld.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-sql_mysqld.cc (revision 469734) @@ -0,0 +1,20 @@ +--- sql/mysqld.cc.orig 2018-05-06 19:15:48 UTC ++++ sql/mysqld.cc +@@ -4321,7 +4321,7 @@ static void init_ssl() { + + static int init_ssl_communication() { + #ifdef HAVE_OPENSSL +-#ifndef HAVE_WOLFSSL ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; + int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); + if (ret_fips_mode != 1) { +@@ -8647,7 +8647,7 @@ bool mysqld_get_one_option(int optid, + One can disable SSL later by using --skip-ssl or --ssl=0. + */ + opt_use_ssl = true; +-#ifdef HAVE_WOLFSSL ++#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) + /* crl has no effect in wolfSSL. */ + opt_ssl_crl = NULL; + opt_ssl_crlpath = NULL; Property changes on: head/databases/mysql80-client/files/patch-sql_mysqld.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: head/databases/mysql80-client/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mysql80-client/files/patch-sql_sys__vars.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-sql_sys__vars.cc (revision 469734) @@ -0,0 +1,29 @@ +--- 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: head/databases/mysql80-client/files/patch-sql_sys__vars.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: head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc =================================================================== --- head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc (revision 469734) @@ -0,0 +1,22 @@ +--- 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: head/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.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: head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt =================================================================== --- head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt (revision 469734) @@ -1,33 +1,31 @@ --- utilities/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +++ utilities/CMakeLists.txt @@ -45,6 +45,7 @@ ENDIF() - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys -+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ + 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}/sql/share/charsets - --out-dir=${PROJECT_BINARY_DIR}/sql/share/ -@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY + --charset=${PROJECT_SOURCE_DIR}/share/charsets + --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/ +@@ -73,4 +74,5 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY ENDIF() - +IF(FALSE) MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) - SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) @@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY}) ADD_DEPENDENCIES(innochecksum GenError) ENDIF() +ENDIF() +IF(FALSE) IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) ENDIF() +ENDIF() # In published release builds on Solaris, we need to bundle gcc source. # PB2 will take care of putting it in extra/ when needed Index: head/databases/mysql80-client/files/patch-vio_viosslfactories.cc =================================================================== --- head/databases/mysql80-client/files/patch-vio_viosslfactories.cc (nonexistent) +++ head/databases/mysql80-client/files/patch-vio_viosslfactories.cc (revision 469734) @@ -0,0 +1,47 @@ +--- 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: head/databases/mysql80-client/files/patch-vio_viosslfactories.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: head/databases/mysql80-client/pkg-plist =================================================================== --- head/databases/mysql80-client/pkg-plist (revision 469733) +++ head/databases/mysql80-client/pkg-plist (revision 469734) @@ -1,203 +1,196 @@ 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 include/mysql/base64.h include/mysql/big_endian.h include/mysql/binary_log_types.h -include/mysql/byte_order_generic.h -include/mysql/byte_order_generic_x86.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/ft_global.h -include/mysql/hash.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/mem_root_fwd.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_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_my_snprintf.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/str_uca_type.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 -lib/mysql/libmysqlservices.a libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.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/mysqlshow.1.gz man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 Index: head/databases/mysql80-server/Makefile =================================================================== --- head/databases/mysql80-server/Makefile (revision 469733) +++ head/databases/mysql80-server/Makefile (revision 469734) @@ -1,172 +1,174 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.2 -PORTREVISION?= 3 -DISTVERSIONSUFFIX?= -dmr +PORTVERSION= 8.0.11 +PORTREVISION?= 0 CATEGORIES= databases ipv6 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 -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= member access into incomplete type 'DH' (aka 'dh_st') - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 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 \ - liblz4.so:archivers/liblz4 + libicutu.so:devel/icu \ + liblz4.so:archivers/liblz4 \ + libre2.so:devel/re2 \ + libprotobuf.so:devel/protobuf 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" \ -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_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_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ + -DWITH_ICU=system \ + -DWITH_RE2=system \ + -DWITH_PROTOBUF=system \ -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 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="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: head/databases/mysql80-server/distinfo =================================================================== --- head/databases/mysql80-server/distinfo (revision 469733) +++ head/databases/mysql80-server/distinfo (revision 469734) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505989679 -SHA256 (mysql-boost-8.0.2-dmr.tar.gz) = a93f63e8ac72046bc5b0dc8515c60dd72faaaff352652aa46375f3a484ac3872 -SIZE (mysql-boost-8.0.2-dmr.tar.gz) = 60697707 +TIMESTAMP = 1524414416 +SHA256 (mysql-boost-8.0.11.tar.gz) = f40711a9bd91ab2ccea331484a6d281f806b0fdecf78f4c9e9d8a4c91208f309 +SIZE (mysql-boost-8.0.11.tar.gz) = 77647598 Index: head/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt (nonexistent) @@ -1,19 +0,0 @@ ---- rapid/plugin/x/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC -+++ rapid/plugin/x/CMakeLists.txt -@@ -70,13 +70,14 @@ ELSE() - ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include - ${CMAKE_SOURCE_DIR}/include #temporary - ${CMAKE_CURRENT_BINARY_DIR}/generated -- ${SSL_INCLUDE_DIRS} -- ${ZLIB_INCLUDE_DIR} -+ ${BOOST_INCLUDE_DIR} - ) - - INCLUDE_DIRECTORIES(SYSTEM - ${PROTOBUF_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIR} -+ ${SSL_INCLUDE_DIRS} -+ ${ZLIB_INCLUDE_DIR} - ) - - IF(XPLUGIN_NO_LITE_PROTOBUF) Property changes on: head/databases/mysql80-server/files/patch-rapid_plugin_x_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: head/databases/mysql80-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake =================================================================== --- head/databases/mysql80-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (revision 469733) +++ head/databases/mysql80-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (nonexistent) @@ -1,15 +0,0 @@ ---- rapid/plugin/x/mysqlx_configure.cmake.orig 2016-09-14 15:25:26 UTC -+++ rapid/plugin/x/mysqlx_configure.cmake -@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src - CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h ) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h - DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Developement) -@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h - DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Developement) -+ENDIF() Property changes on: head/databases/mysql80-server/files/patch-rapid_plugin_x_mysqlx__configure.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: head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.c =================================================================== --- head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.c (revision 469733) +++ head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.c (nonexistent) @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC -+++ storage/myisam/mi_dynrec.c -@@ -65,18 +65,13 @@ my_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, -+ MAP_SHARED, - info->dfile, 0L); - if (info->s->file_map == (uchar*) MAP_FAILED) - { Property changes on: head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.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: head/databases/mysql80-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-sql_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-server/files/patch-sql_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC -+++ sql/CMakeLists.txt -@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES( - ${ZLIB_INCLUDE_DIR} - ${SSL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/sql -+ ${CMAKE_BINARY_DIR}/include -+ ${CMAKE_BINARY_DIR} - ${LZ4_INCLUDE_DIR} - ) - Property changes on: head/databases/mysql80-server/files/patch-sql_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: head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (nonexistent) @@ -1,10 +0,0 @@ ---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2017-09-21 12:20:03 UTC -+++ rapid/unittest/gunit/xplugin/CMakeLists.txt -@@ -63,6 +63,7 @@ INCLUDE_DIRECTORIES( - ${PROJECT_SOURCE_DIR}/include/mysql - ${ZLIB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/rapid/plugin/x/generated/ -+ ${BOOST_INCLUDE_DIR} - ) - - FILE( Property changes on: head/databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_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: head/databases/mysql80-server/files/my.cnf.sample.in =================================================================== --- head/databases/mysql80-server/files/my.cnf.sample.in (revision 469733) +++ head/databases/mysql80-server/files/my.cnf.sample.in (revision 469734) @@ -1,64 +1,62 @@ # $FreeBSD$ [client] port = 3306 socket = /tmp/mysql.sock [mysql] prompt = \u@\h [\d]>\_ no_auto_rehash [mysqld] user = mysql port = 3306 socket = /tmp/mysql.sock bind-address = 127.0.0.1 basedir = %%PREFIX%% datadir = %%MY_DBDIR%% tmpdir = %%MY_TMPDIR%% slave-load-tmpdir = %%MY_TMPDIR%% secure-file-priv = %%MY_SECDIR%% log-bin = mysql-bin log-output = TABLE master-info-repository = TABLE relay-log-info-repository = TABLE relay-log-recovery = 1 slow-query-log = 1 server-id = 1 sync_binlog = 1 sync_relay_log = 1 binlog_cache_size = 16M expire_logs_days = 30 default_password_lifetime = 0 enforce-gtid-consistency = 1 gtid-mode = ON safe-user-create = 1 lower_case_table_names = 1 explicit-defaults-for-timestamp = 1 myisam-recover-options = BACKUP,FORCE open_files_limit = 32768 table_open_cache = 16384 table_definition_cache = 8192 net_retry_count = 16384 key_buffer_size = 256M max_allowed_packet = 64M -query_cache_type = 0 -query_cache_size = 0 long_query_time = 0.5 innodb_buffer_pool_size = 1G innodb_data_home_dir = %%MY_DBDIR%% innodb_log_group_home_dir = %%MY_DBDIR%% innodb_data_file_path = ibdata1:128M:autoextend innodb_temp_data_file_path = ibtmp1:128M:autoextend innodb_flush_method = O_DIRECT innodb_log_file_size = 256M innodb_log_buffer_size = 16M innodb_write_io_threads = 8 innodb_read_io_threads = 8 innodb_autoinc_lock_mode = 2 skip-symbolic-links [mysqldump] max_allowed_packet = 256M quote_names quick Index: head/databases/mysql80-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-CMakeLists.txt (revision 469733) +++ head/databases/mysql80-server/files/patch-CMakeLists.txt (revision 469734) @@ -1,35 +1,35 @@ ---- CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +--- CMakeLists.txt.orig 2018-05-07 12:26:59 UTC +++ CMakeLists.txt -@@ -750,7 +750,6 @@ IF(UNIX) +@@ -870,7 +870,6 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -759,8 +758,6 @@ ENDIF() +@@ -879,8 +878,6 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) - 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) -@@ -819,6 +816,7 @@ ENDIF() +@@ -972,6 +969,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -841,6 +839,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE + 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}) +@@ -990,6 +988,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "README.build" EXCLUDE ) ENDIF() +ENDIF() - INCLUDE(CPack) - + IF(UNIX) + EXECUTE_PROCESS( Index: head/databases/mysql80-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-client_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt (revision 469734) @@ -1,60 +1,60 @@ --- client/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC +++ client/CMakeLists.txt @@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) -## Subdirectory for mysqlpump code. -ADD_SUBDIRECTORY(dump) ## We will need libeay32.dll and ssleay32.dll when running client executables. COPY_OPENSSL_DLLS(copy_openssl_client) @@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade @@ -66,6 +66,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) @@ -78,7 +79,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) SET(MYSQLBINLOG_LIB_SOURCES ${CMAKE_SOURCE_DIR}/strings/decimal.cc @@ -112,13 +115,16 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +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 mysys_ssl) SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) Index: head/databases/mysql80-server/files/patch-cmake_ssl.cmake =================================================================== --- head/databases/mysql80-server/files/patch-cmake_ssl.cmake (revision 469733) +++ head/databases/mysql80-server/files/patch-cmake_ssl.cmake (revision 469734) @@ -1,15 +1,14 @@ ---- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC +--- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC +++ cmake/ssl.cmake -@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION STREQUAL "1" +@@ -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) -+ ELSEIF(OPENSSL_INCLUDE_DIR AND -+ OPENSSL_LIBRARY AND -+ CRYPTO_LIBRARY AND -+ OPENSSL_MAJOR_VERSION STREQUAL "2" -+ ) -+ SET(OPENSSL_FOUND TRUE) - ELSE() - SET(OPENSSL_FOUND FALSE) - ENDIF() + FIND_PROGRAM(OPENSSL_EXECUTABLE openssl Index: head/databases/mysql80-server/files/patch-include_my__compare.h =================================================================== --- head/databases/mysql80-server/files/patch-include_my__compare.h (revision 469733) +++ head/databases/mysql80-server/files/patch-include_my__compare.h (revision 469734) @@ -1,11 +1,11 @@ ---- include/my_compare.h.orig 2016-03-28 18:06:12 UTC +--- include/my_compare.h.orig 2018-04-08 06:44:49 UTC +++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { +@@ -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_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) + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6) Index: head/databases/mysql80-server/files/patch-include_myisam.h =================================================================== --- head/databases/mysql80-server/files/patch-include_myisam.h (revision 469733) +++ head/databases/mysql80-server/files/patch-include_myisam.h (revision 469734) @@ -1,11 +1,11 @@ ---- include/myisam.h.orig 2016-03-28 18:06:12 UTC +--- include/myisam.h.orig 2018-04-08 06:44:49 UTC +++ include/myisam.h -@@ -45,7 +45,7 @@ extern "C" { +@@ -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_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) + #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8) Index: head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (revision 469733) +++ head/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt (revision 469734) @@ -1,29 +1,29 @@ --- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +++ libmysql/CMakeLists.txt @@ -215,7 +215,7 @@ IF(WIN32) - ENDIF() + ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) # Visual Studio users need debug static library for debug projects IF(MSVC) @@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) ++ COMPONENT SharedLibraries SKIP_INSTALL) +IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) @@ -313,6 +314,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() Index: head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc =================================================================== --- head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc (revision 469733) +++ head/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc (revision 469734) @@ -1,61 +1,60 @@ --- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +++ mysys_ssl/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 */ + #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 */ + 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)) - { + 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)] = ' '; + end[(strlen(end) - 1)] = ' '; else - strxmov(end, conf_file, *ext , " ", NullS); + 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; -+ return 0; +- 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. Index: head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc =================================================================== --- head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-mysys__ssl_my__md5.cc (revision 469734) @@ -0,0 +1,11 @@ +--- mysys_ssl/my_md5.cc.orig 2018-04-08 06:44:49 UTC ++++ mysys_ssl/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: head/databases/mysql80-server/files/patch-mysys__ssl_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: head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc =================================================================== --- head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (revision 469733) +++ head/databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc (revision 469734) @@ -1,11 +1,12 @@ --- plugin/password_validation/validate_password.cc.orig 2017-06-27 11:44:29 UTC +++ plugin/password_validation/validate_password.cc @@ -17,6 +17,8 @@ #include #include #include +/* solve clash between libc++ bitset::test() and test macro from my_global.h */ +#undef test + #include #include #include - #include + Index: head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt =================================================================== --- head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt (nonexistent) +++ head/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt (revision 469734) @@ -0,0 +1,17 @@ +--- plugin/x/CMakeLists.txt.orig 2018-04-08 06:44:49 UTC ++++ plugin/x/CMakeLists.txt +@@ -82,11 +82,14 @@ INCLUDE_DIRECTORIES( + ${MYSQLX_PROTOCOL_INCLUDE_DIR} + ${MYSQLX_PROJECT_DIR}/client/ + ${CMAKE_SOURCE_DIR}/extra/regex ++ ${BOOST_INCLUDE_DIR} + ) + + INCLUDE_DIRECTORIES(SYSTEM + ${PROTOBUF_INCLUDE_DIRS} + ${LIBEVENT_INCLUDE_DIR} ++ ${SSL_INCLUDE_DIRS} ++ ${ZLIB_INCLUDE_DIR} + ) + + SET(MYSQLX_PROTBUF_AND_PROTOCOL_LIB Property changes on: head/databases/mysql80-server/files/patch-plugin_x_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: head/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc =================================================================== --- head/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-plugin_x_client_sha256__scramble__generator.cc (revision 469734) @@ -0,0 +1,11 @@ +--- 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: head/databases/mysql80-server/files/patch-plugin_x_client_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: head/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc =================================================================== --- head/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc (revision 469734) @@ -0,0 +1,37 @@ +--- 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: head/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.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: head/databases/mysql80-server/files/patch-plugin_x_configure.cmake =================================================================== --- head/databases/mysql80-server/files/patch-plugin_x_configure.cmake (nonexistent) +++ head/databases/mysql80-server/files/patch-plugin_x_configure.cmake (revision 469734) @@ -0,0 +1,15 @@ +--- plugin/x/configure.cmake.orig 2018-04-08 06:44:49 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 + ${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 + INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h + DESTINATION ${INSTALL_INCLUDEDIR} + COMPONENT Development) ++ENDIF() Property changes on: head/databases/mysql80-server/files/patch-plugin_x_configure.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: head/databases/mysql80-server/files/patch-sql-common_client.cc =================================================================== --- head/databases/mysql80-server/files/patch-sql-common_client.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-sql-common_client.cc (revision 469734) @@ -0,0 +1,27 @@ +--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC ++++ sql-common/client.cc +@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v + goto error; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- cn = (char *)ASN1_STRING_data(cn_asn1); +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + cn = (char *)ASN1_STRING_get0_data(cn_asn1); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ ++ cn = (char *)ASN1_STRING_data(cn_asn1); ++#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ + + // There should not be any NULL embedded in the CN + if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) { +@@ -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: head/databases/mysql80-server/files/patch-sql-common_client.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: head/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc =================================================================== --- head/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc (revision 469734) @@ -0,0 +1,11 @@ +--- 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: head/databases/mysql80-server/files/patch-sql_auth_sha2__password__common.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: head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc =================================================================== --- head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (revision 469733) +++ head/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc (revision 469734) @@ -1,33 +1,31 @@ ---- sql/conn_handler/socket_connection.cc.orig 2017-06-27 11:44:29 UTC +--- sql/conn_handler/socket_connection.cc.orig 2018-04-08 06:44:49 UTC +++ sql/conn_handler/socket_connection.cc -@@ -903,22 +903,26 @@ Channel_info* Mysqld_socket_listener::li +@@ -810,20 +810,24 @@ Channel_info *Mysqld_socket_listener::li signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, m_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)) +- if (!hosts_access(&req)) { + int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; -+ if (!my_hosts_access(&req)) - { ++ if (!my_hosts_access(&req)) { /* This may be stupid but refuse() includes an exit(0) which we surely don't want... clean_exit() - same stupid thing ... */ + char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; - syslog(LOG_AUTH | m_deny_severity, -- "refused connect from %s", eval_client(&req)); -+ "refused connect from %s", my_eval_client(&req)); + syslog(LOG_AUTH | m_deny_severity, "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); -+ ((void (*)(int)) (req.sink))(req.fd); +- 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) + if (req.sink) ((void (*)(int))req.sink)(req.fd); Index: head/databases/mysql80-server/files/patch-sql_mysqld.cc =================================================================== --- head/databases/mysql80-server/files/patch-sql_mysqld.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-sql_mysqld.cc (revision 469734) @@ -0,0 +1,29 @@ +--- sql/mysqld.cc.orig 2018-04-08 06:44:49 UTC ++++ sql/mysqld.cc +@@ -4309,7 +4309,7 @@ static int warn_self_signed_ca() { + static void init_ssl() { + #ifdef HAVE_OPENSSL + #ifndef HAVE_WOLFSSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); +@@ -4321,7 +4321,7 @@ static void init_ssl() { + + static int init_ssl_communication() { + #ifdef HAVE_OPENSSL +-#ifndef HAVE_WOLFSSL ++#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; + int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); + if (ret_fips_mode != 1) { +@@ -8647,7 +8647,7 @@ bool mysqld_get_one_option(int optid, + One can disable SSL later by using --skip-ssl or --ssl=0. + */ + opt_use_ssl = true; +-#ifdef HAVE_WOLFSSL ++#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) + /* crl has no effect in wolfSSL. */ + opt_ssl_crl = NULL; + opt_ssl_crlpath = NULL; Property changes on: head/databases/mysql80-server/files/patch-sql_mysqld.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: head/databases/mysql80-server/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mysql80-server/files/patch-sql_sys__vars.cc (revision 469733) +++ head/databases/mysql80-server/files/patch-sql_sys__vars.cc (revision 469734) @@ -1,38 +1,65 @@ ---- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC +--- sql/sys_vars.cc.orig 2018-04-08 06:44:49 UTC +++ sql/sys_vars.cc -@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim - "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)); +@@ -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)); static Sys_var_ulong Sys_join_buffer_size( - "join_buffer_size", -@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou - "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)); + "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 + "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)); -@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo - "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)); +@@ -2615,7 +2615,7 @@ static Sys_var_ulong Sys_net_write_timeo + "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)); -@@ -4083,7 +4083,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)); +@@ -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), +@@ -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)); static Sys_var_plugin Sys_default_storage_engine( Index: head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc =================================================================== --- head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc (revision 469734) @@ -0,0 +1,22 @@ +--- 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: head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.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: head/databases/mysql80-server/files/patch-vio_viosslfactories.cc =================================================================== --- head/databases/mysql80-server/files/patch-vio_viosslfactories.cc (nonexistent) +++ head/databases/mysql80-server/files/patch-vio_viosslfactories.cc (revision 469734) @@ -0,0 +1,56 @@ +--- 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 */ + ) { +@@ -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() { + } + } + +-#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: head/databases/mysql80-server/files/patch-vio_viosslfactories.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: head/databases/mysql80-server/pkg-message =================================================================== --- head/databases/mysql80-server/pkg-message (revision 469733) +++ head/databases/mysql80-server/pkg-message (revision 469734) @@ -1,18 +1,18 @@ ***************************************************************************** WARNING: THIS IS STILL-IN-DEV PROJECT! USE WITH CAUTION ON PRODUCTION ENVS! ***************************************************************************** ***************************************************************************** Remember to run mysql_upgrade the first time you start the MySQL server after an upgrade from an earlier version. There is no initial password for first time use of MySQL. Keep in mind to reset it to a secure password. MySQL80 has a default %%ETCDIR%%/my.cnf, -remember to replace it wit your own +remember to replace it with your own or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf. ***************************************************************************** Index: head/databases/mysql80-server/pkg-plist =================================================================== --- head/databases/mysql80-server/pkg-plist (revision 469733) +++ head/databases/mysql80-server/pkg-plist (revision 469734) @@ -1,179 +1,195 @@ bin/ibd2sdi bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_secure_installation bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysqltest bin/mysqlxtest bin/perror bin/resolve_stack_dump bin/resolveip +bin/zlib_decompress lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.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_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_backup_lock_service.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/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.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_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_no_login.so -lib/mysql/plugin/mysqlx.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_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 libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc libexec/mysqld 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_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.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/mysqltest.1.gz man/man1/perror.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.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%%/fill_help_tables.sql %%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%%/magic %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_sys_schema.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%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%%