diff options
Diffstat (limited to 'databases/mysql80-client')
27 files changed, 25 insertions, 801 deletions
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 65ca161d00cd..d93737fc9ebc 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) @@ -12,7 +12,7 @@ LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files +PATCHDIR= ${MASTERDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql8[1-9]-client-* \ @@ -24,12 +24,22 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 USE_LDCONFIG+= ${PREFIX}/lib/mysql -MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 +MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ + mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \ + mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 CLIENT_ONLY= yes +OPTIONS_GROUP+= PLUGINS +PLUGINS_DESC= Default Client Plugins +OPTIONS_GROUP_PLUGINS= SASLCLIENT +SASLCLIENT_DESC= SASL client plugin module +SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP +SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASLCLIENT_USE= OPENLDAP=yes +OPTIONS_DEFAULT+= SASLCLIENT +OPTIONS_SUB= yes + # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a diff --git a/databases/mysql80-client/files/patch-CMakeLists.txt b/databases/mysql80-client/files/patch-CMakeLists.txt deleted file mode 100644 index 663e7b22f29a..000000000000 --- a/databases/mysql80-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ ---- CMakeLists.txt.orig 2019-01-21 18:42:44 UTC -+++ CMakeLists.txt -@@ -1011,6 +1011,7 @@ ADD_SUBDIRECTORY(extra/regex) - ADD_SUBDIRECTORY(libmysql) - ADD_SUBDIRECTORY(libbinlogevents) - ADD_SUBDIRECTORY(libbinlogstandalone) -+ADD_SUBDIRECTORY(support-files) - - IF(NOT WITHOUT_SERVER) - SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") -@@ -1146,12 +1147,13 @@ ENDIF() - ADD_SUBDIRECTORY(packaging/WiX) - ADD_SUBDIRECTORY(packaging/solaris) - --IF(UNIX) -- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) --ENDIF() -+#IF(UNIX) -+# INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) -+#ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) - INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) -@@ -1170,6 +1172,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "README.build" EXCLUDE - ) - ENDIF() -+ENDIF() - - # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests, - # we can safely enable ASan on Clang/Win32 if needed. diff --git a/databases/mysql80-client/files/patch-client_CMakeLists.txt b/databases/mysql80-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 26142360bdcd..000000000000 --- a/databases/mysql80-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-04-13 13:46:31.000000000 +0200 -+++ client/CMakeLists.txt 2019-04-30 00:27:10.627236000 +0200 -@@ -35,10 +35,12 @@ - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) - -+IF(FALSE) - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base) - ENDIF() -+ENDIF() - - SET(MYSQLTEST_SRC - mysqltest/error_names.cc -@@ -49,10 +51,12 @@ - mysqltest/utils.cc - ) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) - TARGET_LINK_LIBRARIES(mysqltest mysqlclient) - ADD_DEPENDENCIES(mysqltest GenError GenClientError) -+ENDIF() - - ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) -@@ -108,8 +112,10 @@ - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) diff --git a/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake b/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake deleted file mode 100644 index 83c154ee3bcf..000000000000 --- a/databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake +++ /dev/null @@ -1,27 +0,0 @@ ---- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC -+++ cmake/os/DragonFly.cmake -@@ -0,0 +1,24 @@ -+INCLUDE(CheckCSourceRuns) -+ -+# We require at least GCC 4.4 or Clang 3.3. -+IF(NOT FORCE_UNSUPPORTED_COMPILER) -+ IF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() -+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ < 3) || -+ (__clang_major__ == 3 && __clang_minor__ < 3); -+ }" HAVE_SUPPORTED_CLANG_VERSION) -+ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) -+ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") -+ ENDIF() -+ ELSE() -+ MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ ENDIF() -+ENDIF() diff --git a/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index 2c6ce17ab9bf..000000000000 --- a/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2019-06-25 10:23:30 UTC -+++ cmake/os/FreeBSD.cmake -@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - MESSAGE(FATAL_ERROR - "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})") - ENDIF() -- ELSE() -- MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ >= 4); -+ }" I386_ATOMIC_BUILTINS) -+ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) -+ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") -+ ENDIF() -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() - ENDIF() - ENDIF() - diff --git a/databases/mysql80-client/files/patch-cmake_ssl.cmake b/databases/mysql80-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 8fc3814b1342..000000000000 --- a/databases/mysql80-client/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC -+++ cmake/ssl.cmake -@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" - ) - ENDIF() - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARY AND - CRYPTO_LIBRARY AND -- OPENSSL_MAJOR_VERSION STREQUAL "1" -+ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2") - ) - SET(OPENSSL_FOUND TRUE) - FIND_PROGRAM(OPENSSL_EXECUTABLE openssl diff --git a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h deleted file mode 100644 index 47a9c7ca00ac..000000000000 --- a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC -+++ extra/libedit/chartype.h -@@ -49,7 +49,7 @@ - TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ - #if !defined(__NetBSD__) && !defined(__sun) \ - && !(defined(__APPLE__) && defined(__MACH__)) \ -- && !defined(__FreeBSD__) && !defined(_AIX) -+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c deleted file mode 100644 index 1ee69856abf0..000000000000 --- a/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c +++ /dev/null @@ -1,20 +0,0 @@ ---- extra/libedit/vi.c.orig 2016-03-28 18:06:12 UTC -+++ extra/libedit/vi.c -@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att - * NB: posix implies that we should enter insert mode, however - * this is against historical precedent... - */ --#if defined(__weak_reference) && !defined(__FreeBSD__) -+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) - __weakref_visible char *my_get_alias_text(const char *) - __weak_reference(get_alias_text); - #endif -@@ -928,7 +928,7 @@ protected el_action_t - vi_alias(EditLine *el __attribute__((__unused__)), - Int c __attribute__((__unused__))) - { --#if defined(__weak_reference) && !defined(__FreeBSD__) -+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) - char alias_name[3]; - char *alias_text; - diff --git a/databases/mysql80-client/files/patch-include_CMakeLists.txt b/databases/mysql80-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 5fa5ea35eb42..000000000000 --- a/databases/mysql80-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,176 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-09-21 15:51:58 UTC -+++ include/CMakeLists.txt -@@ -30,11 +30,173 @@ SET(HEADERS - ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h - ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h - field_types.h -+ base64.h -+ big_endian.h -+ c_string_less.h -+ crypt_genhash_impl.h -+ decimal.h -+ depth_first_search.h -+ dur_prop.h -+ errmsg.h -+ ft_global.h -+ heap.h -+ keycache.h -+ lex_string.h -+ lf.h -+ little_endian.h -+ m_ctype.h -+ m_string.h -+ map_helpers.h -+ mf_wcomp.h -+ mutex_lock.h -+ my_aes.h -+ my_alloc.h -+ my_atomic.h -+ my_base.h -+ my_bit.h -+ my_bitmap.h -+ my_byteorder.h -+ my_check_opt.h -+ my_command.h -+ my_compare.h -+ my_compare.h.orig -+ my_compiler.h -+ my_dbug.h -+ my_default.h -+ my_dir.h -+ my_double2ulonglong.h -+ my_getopt.h -+ my_hash_combine.h -+ my_icp.h -+ my_inttypes.h -+ my_io.h -+ my_list.h -+ my_loglevel.h -+ my_macros.h -+ my_md5.h -+ my_md5_size.h -+ my_murmur3.h -+ my_pointer_arithmetic.h -+ my_psi_config.h -+ my_rapidjson_size_t.h -+ my_rdtsc.h -+ my_rnd.h -+ my_sharedlib.h -+ my_shm_defaults.h -+ my_sqlcommand.h -+ my_stacktrace.h -+ my_sys.h -+ my_systime.h -+ my_table_map.h -+ my_thread.h -+ my_thread_local.h -+ my_thread_os_id.h -+ my_time.h -+ my_timer.h -+ my_tree.h -+ my_uctype.h -+ my_user.h -+ my_xml.h -+ myisam.h -+ myisammrg.h -+ myisampack.h -+ mysql.h -+ mysql.h.pp -+ mysql_com.h -+ mysql_com_server.h -+ mysql_time.h -+ mysql_version.h.in -+ mysys_err.h -+ nullable.h -+ password.h -+ pfs_cond_provider.h -+ pfs_error_provider.h -+ pfs_file_provider.h -+ pfs_idle_provider.h -+ pfs_memory_provider.h -+ pfs_metadata_provider.h -+ pfs_mutex_provider.h -+ pfs_rwlock_provider.h -+ pfs_socket_provider.h -+ pfs_stage_provider.h -+ pfs_statement_provider.h -+ pfs_table_provider.h -+ pfs_thread_provider.h -+ pfs_transaction_provider.h -+ prealloced_array.h -+ print_version.h -+ priority_queue.h -+ rwlock_scoped_lock.h -+ scope_guard.h -+ service_versions.h -+ sha1.h -+ sha2.h -+ sql_chars.h -+ sql_common.h -+ sql_string.h -+ sslopt-case.h -+ sslopt-longopts.h -+ sslopt-vars.h -+ template_utils.h -+ thr_cond.h -+ thr_lock.h -+ thr_mutex.h -+ thr_rwlock.h -+ typelib.h -+ varlen_sort.h -+ violite.h -+ welcome_copyright_notice.h - ) - SET(HEADERS_MYSQL_DIR - mysql/client_plugin.h - mysql/plugin_auth_common.h - mysql/udf_registration_types.h -+ mysql/client_authentication.h -+ mysql/client_plugin.h.pp -+ mysql/com_data.h -+ mysql/get_password.h -+ mysql/group_replication_priv.h -+ mysql/innodb_priv.h -+ mysql/mysql_lex_string.h -+ mysql/plugin.h -+ mysql/plugin_audit.h -+ mysql/plugin_audit.h.pp -+ mysql/plugin_auth.h -+ mysql/plugin_auth.h.pp -+ mysql/plugin_auth_common.h -+ mysql/plugin_ftparser.h -+ mysql/plugin_ftparser.h.pp -+ mysql/plugin_group_replication.h -+ mysql/plugin_keyring.h -+ mysql/plugin_keyring.h.pp -+ mysql/plugin_query_rewrite.h -+ mysql/plugin_trace.h -+ mysql/plugin_validate_password.h -+ mysql/service_command.h -+ mysql/service_locking.h -+ mysql/service_my_plugin_log.h -+ mysql/service_mysql_alloc.h -+ mysql/service_mysql_keyring.h -+ mysql/service_mysql_password_policy.h -+ mysql/service_mysql_string.h -+ mysql/service_parser.h -+ mysql/service_plugin_registry.h -+ mysql/service_rpl_transaction_ctx.h -+ mysql/service_rpl_transaction_write_set.h -+ mysql/service_rules_table.h -+ mysql/service_security_context.h -+ mysql/service_srv_session.h -+ mysql/service_srv_session_info.h -+ mysql/service_ssl_wrapper.h -+ mysql/service_thd_alloc.h -+ mysql/service_thd_engine_lock.h -+ mysql/service_thd_wait.h -+ mysql/service_thread_scheduler.h -+ mysql/services.h -+ mysql/services.h.pp -+ mysql/thread_pool_priv.h -+ mysql/thread_type.h -+ mysql/udf_registration_types.h - ) - - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) diff --git a/databases/mysql80-client/files/patch-include_my__compare.h b/databases/mysql80-client/files/patch-include_my__compare.h deleted file mode 100644 index 3b2cd3593e92..000000000000 --- a/databases/mysql80-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2018-04-08 06:44:49 UTC -+++ include/my_compare.h -@@ -49,7 +49,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 16 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6) diff --git a/databases/mysql80-client/files/patch-include_myisam.h b/databases/mysql80-client/files/patch-include_myisam.h deleted file mode 100644 index 99493293f483..000000000000 --- a/databases/mysql80-client/files/patch-include_myisam.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2018-04-08 06:44:49 UTC -+++ include/myisam.h -@@ -59,7 +59,7 @@ - The following defines can be increased if necessary. - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. - */ --#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define MI_MAX_KEY_SEG 16 /* Max segments for key */ - - #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8) diff --git a/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index dd18e86c1149..000000000000 --- a/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC -+++ libmysql/CMakeLists.txt -@@ -181,6 +181,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C) - ) - ENDIF() - -+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) -+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC") -+ENDIF() -+ - # - # Include protocol tracing infrastructure and the test - # trace plugin if enabled by build options. -@@ -254,7 +258,7 @@ IF(NOT DISABLE_SHARED) - COMPONENT SharedLibraries) - IF(UNIX) - # libtool compatability -- IF(FREEBSD OR APPLE) -+ IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly") - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") - ELSE() - SET(OS_SHARED_LIB_VERSION diff --git a/databases/mysql80-client/files/patch-man_CMakeLists.txt b/databases/mysql80-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index 213cddda7a91..000000000000 --- a/databases/mysql80-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC -+++ man/CMakeLists.txt -@@ -22,10 +22,6 @@ - - # Copy man pages - FILE(GLOB MAN1 *.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN1_ROUTER mysqlrouter*.1) --FILE(GLOB MAN8 *.8) --FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_NDB AND NOT WITH_NDBCLUSTER) - LIST(REMOVE_ITEM MAN1 ${MAN1_NDB}) - ENDIF() diff --git a/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index cf0af3c629d9..000000000000 --- a/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc +++ /dev/null @@ -1,60 +0,0 @@ ---- mysys/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys/my_default.cc -@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -914,6 +914,14 @@ static int search_default_file_with_ext( - return 1; /* Ignore wrong files */ - } - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { - line++; - /* Ignore comment and empty lines */ -@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * - end[(strlen(end) - 1)] = ' '; - else - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1411,13 +1420,8 @@ static const char **init_default_directo - - #else - -- errors += add_directory(alloc, "/etc/", dirs); -- errors += add_directory(alloc, "/etc/mysql/", dirs); -- --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - -@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f - MY_STAT stat_info; - -- if (!my_stat(file_name, &stat_info, MYF(0))) return 1; -+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0; - /* - Ignore .mylogin.cnf file if not exclusively readable/writable - by current user. diff --git a/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc b/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc deleted file mode 100644 index bed3c7d521e6..000000000000 --- a/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- mysys/my_md5.cc.orig 2018-04-08 06:44:49 UTC -+++ mysys/my_md5.cc -@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d - int compute_md5_hash(char *digest, const char *buf, int len) { - int retval = 0; - int fips_mode = 0; --#if !defined(HAVE_WOLFSSL) -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - fips_mode = FIPS_mode(); - #endif /* HAVE_WOLFSSL */ - /* If fips mode is ON/STRICT restricted method calls will result into abort, diff --git a/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc b/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc deleted file mode 100644 index f193a77d175c..000000000000 --- a/databases/mysql80-client/files/patch-plugin_x_client_xconnection__impl.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- plugin/x/client/xconnection_impl.cc.orig 2018-04-08 06:44:49 UTC -+++ plugin/x/client/xconnection_impl.cc -@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio, - return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"}; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -- const auto cn = reinterpret_cast<char *>(ASN1_STRING_data(cn_asn1)); --#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - const auto cn = - reinterpret_cast<const char *>(ASN1_STRING_get0_data(cn_asn1)); --#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#else -+ const auto cn = reinterpret_cast<char *>(ASN1_STRING_data(cn_asn1)); -+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ - const auto cn_len = static_cast<size_t>(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) { diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 70b6be73fb7a..000000000000 --- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,73 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2018-10-07 08:44:22 UTC -+++ scripts/CMakeLists.txt -@@ -80,6 +80,7 @@ ELSE() - MESSAGE(FATAL_ERROR "Cannot concatenate files") - ENDIF() - -+IF(FALSE) - # Build mysql_fix_privilege_tables.h - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h -@@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h - ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h - ) -+ENDIF() - - # If we do not have performance schema compiled in then sys will not work, - # so only create an empty sys database with an auto-generated file, -@@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER) - ) - ENDIF() - -+IF(FALSE) - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -211,6 +214,7 @@ IF(UNIX) - COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - ) - ENDIF() -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) - FOREACH(lib ${${target}_LIB_DEPENDS}) - # Filter out "general", it is not a library, just CMake hint -- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") -+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto") - IF (lib MATCHES "^\\-l") - SET(${var} "${${var}} ${lib} ") - ELSEIF(lib MATCHES "^/") -@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -454,19 +460,7 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - -- IF(WITH_SYSTEMD) -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- ) -- ELSE() -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- mysqld_multi -- mysqld_safe -- ) -- ENDIF() -+ SET(BIN_SCRIPTS mysql_config) - - SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) - STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") diff --git a/databases/mysql80-client/files/patch-share_CMakeLists.txt b/databases/mysql80-client/files/patch-share_CMakeLists.txt deleted file mode 100644 index 0f8ffc2e4227..000000000000 --- a/databases/mysql80-client/files/patch-share_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- share/CMakeLists.txt.orig 2017-10-03 10:54:31 UTC -+++ share/CMakeLists.txt -@@ -45,6 +45,7 @@ SET(files - dictionary.txt - ) - -+IF (FALSE) - FOREACH (dir ${dirs}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} - DESTINATION ${INSTALL_MYSQLSHAREDIR} -@@ -57,13 +58,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE - COMPONENT Server - PATTERN "languages.html" EXCLUDE - ) -+ENDIF() - - # Don't copy if we're building in-source. - IF (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - CONFIGURE_FILE(dictionary.txt ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/dictionary.txt) - ENDIF() - -+IF (FALSE) - INSTALL(FILES ${files} - DESTINATION ${INSTALL_MYSQLSHAREDIR} - COMPONENT Server - ) -+ENDIF() diff --git a/databases/mysql80-client/files/patch-sql-common_client.cc b/databases/mysql80-client/files/patch-sql-common_client.cc deleted file mode 100644 index 9758da5c5dcd..000000000000 --- a/databases/mysql80-client/files/patch-sql-common_client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC -+++ sql-common/client.cc -@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, - #endif - break; - case MYSQL_OPT_SSL_FIPS_MODE: { --#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) -+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - ENSURE_EXTENSIONS_PRESENT(&mysql->options); - mysql->options.extension->ssl_fips_mode = *(uint *)arg; diff --git a/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc b/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc deleted file mode 100644 index 6ad939a2b199..000000000000 --- a/databases/mysql80-client/files/patch-sql_auth_sha2__password__common.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/auth/sha2_password_common.cc.orig 2018-05-06 18:47:55 UTC -+++ sql/auth/sha2_password_common.cc -@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsi - DBUG_RETURN(true); - } - m_ok = EVP_DigestFinal_ex(md_context, m_digest, NULL); --#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_MD_CTX_cleanup(md_context); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - EVP_MD_CTX_reset(md_context); diff --git a/databases/mysql80-client/files/patch-sql_mysqld.cc b/databases/mysql80-client/files/patch-sql_mysqld.cc deleted file mode 100644 index e6984955312a..000000000000 --- a/databases/mysql80-client/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig 2018-05-06 19:15:48 UTC -+++ sql/mysqld.cc -@@ -4321,7 +4321,7 @@ static void init_ssl() { - - static void init_ssl() { - #ifdef HAVE_OPENSSL --#if !defined(HAVE_WOLFSSL) && !defined(__sun) -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun) - #if defined(HAVE_PSI_MEMORY_INTERFACE) - static PSI_memory_info all_openssl_memory[] = { - {&key_memory_openssl, "openssl_malloc", 0, 0, diff --git a/databases/mysql80-client/files/patch-sql_sys__vars.cc b/databases/mysql80-client/files/patch-sql_sys__vars.cc deleted file mode 100644 index 883b50f150a4..000000000000 --- a/databases/mysql80-client/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- sql/sys_vars.cc.orig 2018-05-06 19:16:02 UTC -+++ sql/sys_vars.cc -@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version( - READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION), - IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2"); - --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - static bool update_fips_mode(sys_var *, THD *, enum_var_type) { - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { -@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *, - } - #endif - --#ifdef HAVE_WOLFSSL -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) - static const char *ssl_fips_mode_names[] = {"OFF", 0}; - #else - static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0}; -@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode( - GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE), - ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(NULL), --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - ON_UPDATE(update_fips_mode), - #else - ON_UPDATE(NULL), diff --git a/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc b/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc deleted file mode 100644 index 125494d23417..000000000000 --- a/databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- storage/myisam/mi_dynrec.cc.orig 2016-03-28 18:06:12 UTC -+++ storage/myisam/mi_dynrec.cc -@@ -65,18 +65,13 @@ bool mi_dynmap_file(MI_INFO *info, my - DBUG_RETURN(1); - } - /* -- I wonder if it is good to use MAP_NORESERVE. From the Linux man page: -- MAP_NORESERVE -- Do not reserve swap space for this mapping. When swap space is -- reserved, one has the guarantee that it is possible to modify the -- mapping. When swap space is not reserved one might get SIGSEGV -- upon a write if no physical memory is available. -+ MAP_NORESERVE is unimplemented in FreeBSD - */ - info->s->file_map = (uchar *)my_mmap( - 0, (size_t)size, - info->s->mode == O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE, info->dfile, 0L); -+ MAP_SHARED, info->dfile, 0L); - if (info->s->file_map == (uchar *)MAP_FAILED) { - info->s->file_map = NULL; - diff --git a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 3c5e299b1d63..000000000000 --- a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC -+++ support-files/CMakeLists.txt -@@ -29,9 +29,11 @@ - - SET(localstatedir "${MYSQL_DATADIR}") - -+IF(FALSE) - SET(prefix "${CMAKE_INSTALL_PREFIX}") - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) -+ENDIF() - - IF(LINUX) - SET (PIDOF "pidof") -@@ -39,6 +41,7 @@ - SET (PIDOF "pgrep -d' ' -f") - ENDIF() - -+IF(FALSE) - FOREACH(script - mysql.server - mysqld_multi.server -@@ -54,3 +57,4 @@ - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - ENDFOREACH() -+ENDIF() diff --git a/databases/mysql80-client/files/patch-utilities_CMakeLists.txt b/databases/mysql80-client/files/patch-utilities_CMakeLists.txt deleted file mode 100644 index 3a584e82cae9..000000000000 --- a/databases/mysql80-client/files/patch-utilities_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- utilities/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC -+++ utilities/CMakeLists.txt -@@ -59,6 +59,7 @@ FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR - - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h - ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys -+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/ - COMMAND comp_err - --charset=${PROJECT_SOURCE_DIR}/share/charsets - --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/ -@@ -92,6 +93,7 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_ - ADD_DEPENDENCIES(comp_err copy_openssl_dlls) - ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc) - TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) - SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -168,4 +170,5 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - mysys innodb_zipdecompress ${LZ4_LIBRARY}) - ADD_DEPENDENCIES(ibd2sdi GenError) - -+ENDIF() - ENDIF() diff --git a/databases/mysql80-client/files/patch-vio_viosslfactories.cc b/databases/mysql80-client/files/patch-vio_viosslfactories.cc deleted file mode 100644 index f0f74c3812e4..000000000000 --- a/databases/mysql80-client/files/patch-vio_viosslfactories.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- vio/viosslfactories.cc.orig 2018-04-08 06:44:49 UTC -+++ vio/viosslfactories.cc -@@ -37,6 +37,7 @@ - - #ifdef HAVE_OPENSSL - #include <openssl/dh.h> -+#include <openssl/crypto.h> - - #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; - } diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist index c9f72d346d6f..ca9eccb32910 100644 --- a/databases/mysql80-client/pkg-plist +++ b/databases/mysql80-client/pkg-plist @@ -1,7 +1,7 @@ +bin/my_print_defaults bin/mysql bin/mysql_config bin/mysql_config_editor -bin/mysql_ssl_rsa_setup bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck @@ -10,6 +10,8 @@ bin/mysqlimport bin/mysqlpump bin/mysqlshow bin/mysqlslap +bin/perror +bin/zlib_decompress include/mysql/base64.h include/mysql/big_endian.h include/mysql/c_string_less.h @@ -41,6 +43,7 @@ include/mysql/my_check_opt.h include/mysql/my_command.h include/mysql/my_compare.h include/mysql/my_compiler.h +include/mysql/my_compress.h include/mysql/my_dbug.h include/mysql/my_default.h include/mysql/my_dir.h @@ -181,8 +184,10 @@ lib/mysql/libmysqlclient.so.21 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.21 +%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz +man/man1/lz4_decompress.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz @@ -191,6 +196,10 @@ man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqlpump.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz +man/man1/perror.1.gz +man/man1/zlib_decompress.1.gz share/aclocal/mysql.m4 |