diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index c9b0f181711a..1d43316113a1 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -1,7 +1,7 @@ # Created by: "Mahdi Mokhtari " PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index c525a921bee0..6a633ba35b21 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -1,8 +1,8 @@ # Created by: Mahdi Mokhtari PORTNAME?= mysql -PORTVERSION= 8.0.26 -PORTREVISION?= 1 +PORTVERSION= 8.0.27 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo index 6b639dd456da..55029d0a7a90 100644 --- a/databases/mysql80-server/distinfo +++ b/databases/mysql80-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628702352 -SHA256 (mysql-boost-8.0.26.tar.gz) = 209442c1001c37bcbc001845e1dc623d654cefb555b47b528742a53bf21c0b4d -SIZE (mysql-boost-8.0.26.tar.gz) = 291285918 +TIMESTAMP = 1635786797 +SHA256 (mysql-boost-8.0.27.tar.gz) = 74b5bc6ff88fe225560174a24b7d5ff139f4c17271c43000dbcf3dcc9507b3f9 +SIZE (mysql-boost-8.0.27.tar.gz) = 292184025 diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt index bbfb4249c799..5c9f5b96a444 100644 --- a/databases/mysql80-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt @@ -1,5 +1,5 @@ ---- client/CMakeLists.txt.orig 2021-03-22 08:44:50 UTC -+++ client/CMakeLists.txt +--- client/CMakeLists.txt.orig 2021-11-02 19:00:34.829019000 +0100 ++++ client/CMakeLists.txt 2021-11-02 20:17:02.705241000 +0100 @@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING() ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) @@ -10,37 +10,27 @@ ADD_SUBDIRECTORY(migrate_keyring) +ENDIF() -+IF(NOT WITHOUT_CLIENTLIBS) - MYSQL_ADD_EXECUTABLE(mysql - ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc - completion_hash.cc -@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql - client_query_attributes.cc ++IF(NOT_WITHOUT_CLIENTLIBS) + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/include + ) +@@ -47,6 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysql + ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} ) +ENDIF() IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND - ) - ENDIF() - -+IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysqltest - mysqltest.cc - mysqltest/error_names.cc -@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest +@@ -71,6 +75,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest ENABLE_EXPORTS LINK_LIBRARIES mysqlclient ) -+ENDIF() -+ +IF(WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc check/mysqlcheck_core.cc -@@ -248,7 +256,9 @@ ENDIF() +@@ -250,7 +255,9 @@ ENDIF() TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) @@ -49,18 +39,18 @@ +IF(WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc - LINK_LIBRARIES mysqlclient -@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor + multi_factor_passwordopt-vars.cc +@@ -265,6 +272,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc LINK_LIBRARIES mysqlclient ) +ENDIF() + -+IF(NOT WITHOUT_SERVER) ++IF(NOT_WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc LINK_LIBRARIES mysqlclient -@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup +@@ -275,6 +285,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup path.cc LINK_LIBRARIES mysys ) diff --git a/databases/mysql80-server/files/patch-mysys_my__default.cc b/databases/mysql80-server/files/patch-mysys_my__default.cc index 6a8cb5ebbaf2..6e479597e24a 100644 --- a/databases/mysql80-server/files/patch-mysys_my__default.cc +++ b/databases/mysql80-server/files/patch-mysys_my__default.cc @@ -1,5 +1,5 @@ ---- mysys/my_default.cc.orig 2021-04-23 15:06:40 UTC -+++ mysys/my_default.cc +--- mysys/my_default.cc.orig 2021-11-02 20:29:18.337621000 +0100 ++++ mysys/my_default.cc 2021-11-02 20:57:11.624299000 +0100 @@ -204,7 +204,7 @@ bool no_defaults = false; /* Which directories are searched for options (and in which order) */ @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = nullptr; -@@ -915,6 +915,14 @@ static int search_default_file_with_ext(Process_option +@@ -922,6 +922,14 @@ static int search_default_file_with_ext(Process_option return 1; /* Ignore wrong files */ } @@ -17,24 +17,24 @@ + { + fprintf(stderr, + "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); ++ name,name); + goto err; + } + while (true) { auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file); char *linebuff = fileline.get(); -@@ -1300,7 +1308,8 @@ void my_print_default_files(const char *conf_file) { +@@ -1315,7 +1323,8 @@ void my_print_default_files(const char *conf_file) { end[(strlen(end) - 1)] = ' '; else strxmov(end, conf_file, *ext, " ", NullS); - fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); } } } -@@ -1640,14 +1649,9 @@ static const char **init_default_directories(MEM_ROOT +@@ -1655,14 +1664,9 @@ static const char **init_default_directories(MEM_ROOT #else @@ -51,12 +51,12 @@ #endif if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs); -@@ -1710,7 +1714,7 @@ int check_file_permissions(const char *file_name, bool +@@ -1727,7 +1731,7 @@ int check_file_permissions(const char *file_name, bool #if !defined(_WIN32) MY_STAT stat_info; -- if (!my_stat(file_name, &stat_info, MYF(0))) return 1; -+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0; +- if (!my_stat(file_name, &stat_info, flags)) return 1; ++ if (!my_stat(file_name, &stat_info, flags)) return 0; /* Ignore .mylogin.cnf file if not exclusively readable/writable by current user. diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc index 9b53b3aae974..2d5ba1470260 100644 --- a/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc +++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc @@ -1,6 +1,6 @@ ---- router/src/harness/src/tls_context.cc.orig 2019-09-20 08:30:51 UTC -+++ router/src/harness/src/tls_context.cc -@@ -91,7 +91,7 @@ static constexpr int o11x_version(TlsVersion version) +--- router/src/harness/src/tls_context.cc.orig 2021-11-04 17:14:44.779135000 +0100 ++++ router/src/harness/src/tls_context.cc 2021-11-04 17:35:31.121070000 +0100 +@@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) { return TLS1_1_VERSION; case TlsVersion::TLS_1_2: return TLS1_2_VERSION; @@ -9,19 +9,19 @@ case TlsVersion::TLS_1_3: return TLS1_3_VERSION; #endif -@@ -121,9 +121,11 @@ void TlsContext::version_range(TlsVersion min_version, +@@ -272,9 +272,11 @@ stdx::expected TlsContext::vers default: // unknown, leave all disabled - // fallthrough + [[fallthrough]]; +#ifdef TLS1_3_VERSION case TlsVersion::TLS_1_3: opts |= SSL_OP_NO_TLSv1_2; - // fallthrough + [[fallthrough]]; +#endif case TlsVersion::TLS_1_2: opts |= SSL_OP_NO_TLSv1_1; - // fallthrough -@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const { + [[fallthrough]]; +@@ -322,8 +324,10 @@ TlsVersion TlsContext::min_version() const { return TlsVersion::TLS_1_1; case TLS1_2_VERSION: return TlsVersion::TLS_1_2; @@ -32,7 +32,7 @@ case 0: return TlsVersion::AUTO; default: -@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c +@@ -382,7 +386,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c } int TlsContext::security_level() const { diff --git a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt index 19e53914846e..976c2397e16d 100644 --- a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt @@ -1,24 +1,15 @@ ---- scripts/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC -+++ scripts/CMakeLists.txt -@@ -330,7 +330,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) - FOREACH(lib ${${target}_LIB_DEPENDS}) - # Filter out "general", it is not a library, just CMake hint -- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") -+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto") - IF (lib MATCHES "^\\-l") - SET(${var} "${${var}} ${lib} ") - ELSEIF (lib MATCHES "^\\-L") -@@ -340,6 +340,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} " ) +--- scripts/CMakeLists.txt.orig 2021-11-04 17:42:29.686664000 +0100 ++++ scripts/CMakeLists.txt 2021-11-04 17:57:49.957200000 +0100 +@@ -323,6 +323,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() -@@ -414,7 +416,7 @@ ELSE() + ELSE() + SET(${var} "${${var}}-l${lib} " ) + ENDIF() +@@ -396,7 +398,7 @@ ELSE() ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} ESCAPE_QUOTES @ONLY) @@ -27,7 +18,7 @@ MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} -@@ -427,23 +429,28 @@ ELSE() +@@ -409,23 +411,28 @@ ELSE() # mysqld_safe used in mtr even for systemd platforms IF(WITH_SYSTEMD) SET(BIN_SCRIPTS diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc index 6c0f821e8911..8c88903163ee 100644 --- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc +++ b/databases/mysql80-server/files/patch-vio_viosslfactories.cc @@ -1,5 +1,5 @@ ---- vio/viosslfactories.cc.orig 2019-09-20 08:30:51 UTC -+++ vio/viosslfactories.cc +--- vio/viosslfactories.cc.orig 2021-11-04 18:02:40.921064000 +0100 ++++ vio/viosslfactories.cc 2021-11-04 18:15:24.992676000 +0100 @@ -40,6 +40,7 @@ #include "vio/vio_priv.h" @@ -16,13 +16,15 @@ /** Set fips mode in openssl library, When we set fips mode ON/STRICT, it will perform following operations: -@@ -525,12 +527,13 @@ EXIT: +@@ -525,6 +527,7 @@ EXIT: @returns openssl current fips mode */ uint get_fips_mode() { return FIPS_mode(); } +#endif - long process_tls_version(const char *tls_version) { + /** + Toggle FIPS mode, to see whether it is available with the current SSL library. +@@ -545,7 +548,7 @@ long process_tls_version(const char *tls_version) { const char *separator = ","; char *token, *lasts = nullptr; @@ -31,7 +33,7 @@ const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"}; const char ctx_flag_default[] = "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3"; -@@ -609,7 +612,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -624,7 +627,7 @@ static struct st_VioSSLFd *new_VioSSLFd( ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) & (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 @@ -40,7 +42,7 @@ | SSL_OP_NO_TLSv1_3 #endif /* HAVE_TLSv13 */ | SSL_OP_NO_TICKET); -@@ -618,7 +621,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -633,7 +636,7 @@ static struct st_VioSSLFd *new_VioSSLFd( return nullptr; if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ? @@ -49,7 +51,7 @@ TLS_client_method() : TLS_server_method() #else /* HAVE_TLSv13 */ -@@ -633,7 +636,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -648,7 +651,7 @@ static struct st_VioSSLFd *new_VioSSLFd( return nullptr; }