netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

databases/mysql80-server: Update to 8.0.39

Browse Source 
- fixes multiple CVEs
- fixed startup error with large table set

PR: 280455
This commit is contained in:
Oleksii Samorukov
2024-07-31 10:07:34 +02:00
parent 4195a8fa98
commit 25218e3b20
47 changed files with 172 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
databases/mysql80-server/Makefile
+3 -4
View File
@@ -1,6 +1,6 @@
PORTNAME?= mysql
PORTVERSION= 8.0.35
PORTREVISION?= 1
PORTVERSION= 8.0.39
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server
@@ -111,8 +111,7 @@ SUB_LIST= MY_DBDIR=${MY_DBDIR} \
PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
MY_TMPDIR=${MY_TMPDIR} \
MYSQL80_LIBVER=${MYSQL80_LIBVER}
MY_TMPDIR=${MY_TMPDIR}
# MySQL-Server part
.if !defined(CLIENT_ONLY)
databases/mysql80-server/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1700321902
SHA256 (mysql-boost-8.0.35.tar.gz) = 41253c3a99cefcf6d806040c6687692eb0c37b4c7aae5882417dfb9c5d3ce4ce
SIZE (mysql-boost-8.0.35.tar.gz) = 438111810
TIMESTAMP = 1721978886
SHA256 (mysql-boost-8.0.39.tar.gz) = 93208da9814116d81a384eae42120fd6c2ed507f1696064c510bc36047050241
SIZE (mysql-boost-8.0.39.tar.gz) = 449265424
databases/mysql80-server/files/patch-CMakeLists.txt
+13 -20
View File
@@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
--- CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ CMakeLists.txt
@@ -1819,7 +1819,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
@@ -1848,7 +1848,7 @@ IF(WITH_AUTHENTICATION_LDAP)
ENDIF()
IF(WITH_AUTHENTICATION_LDAP)
@@ -9,7 +9,7 @@
# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
IF(WITH_LDAP STREQUAL "system" OR
WITH_SASL STREQUAL "system" OR
@@ -1868,6 +1868,7 @@ IF(WITH_AUTHENTICATION_KERBEROS)
@@ -1897,6 +1897,7 @@ ENDIF()
ENDIF()
ENDIF()
@@ -17,7 +17,7 @@
# Add system/bundled editline.
MYSQL_CHECK_EDITLINE()
SET(EDITLINE_WARN_GIVEN)
@@ -1878,7 +1879,9 @@ IF(EDITLINE_WARN_GIVEN)
@@ -1907,7 +1908,9 @@ ENDIF()
"You can use -DWITH_EDITLINE=bundled instead."
)
ENDIF()
@@ -26,8 +26,8 @@
+IF(NOT WITHOUT_SERVER)
# Add libevent
MYSQL_CHECK_LIBEVENT()
SET(LIBEVENT_WARN_GIVEN)
@@ -1889,6 +1892,7 @@ IF(LIBEVENT_WARN_GIVEN)
UNSET(LIBEVENT_WARN_GIVEN)
@@ -1918,6 +1921,7 @@ ENDIF()
"You can use -DWITH_LIBEVENT=bundled instead."
)
ENDIF()
@@ -35,7 +35,7 @@
# Add lz4 library
MYSQL_CHECK_LZ4()
@@ -2142,7 +2146,9 @@ ADD_CUSTOM_TARGET(clang_tidy_prerequisites)
@@ -2180,7 +2184,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
@@ -46,7 +46,7 @@
ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(mysys)
@@ -2187,12 +2193,15 @@ IF(WITH_UNIT_TESTS)
@@ -2230,12 +2236,15 @@ ENDIF()
ADD_SUBDIRECTORY(unittest/mytap/t)
ENDIF()
@@ -64,7 +64,7 @@
ADD_SUBDIRECTORY(testclients)
ADD_SUBDIRECTORY(sql)
ENDIF()
@@ -2247,11 +2256,11 @@ ENDIF()
@@ -2305,11 +2314,11 @@ ADD_SUBDIRECTORY(scripts)
# scripts/mysql_config depends on client and server targets loaded above.
# It is referenced by some of the directories below, so we insert it here.
ADD_SUBDIRECTORY(scripts)
@@ -77,19 +77,12 @@
IF(WITH_INTERNAL)
ADD_SUBDIRECTORY(internal)
ENDIF()
@@ -2361,6 +2370,7 @@ IF(PACK_SEPARATE_COMPONENTS)
SET(CPACK_COMPONENTS_GROUPING IGNORE)
@@ -2336,7 +2345,7 @@ ENDIF()
INCLUDE(fastcov)
ENDIF()
-IF(UNIX)
+IF(FALSE)
IF(UNIX)
INSTALL(FILES
Docs/mysql.info
@@ -2395,6 +2405,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "sp-imp-spec.txt" EXCLUDE
PATTERN "README.build" EXCLUDE
)
+ENDIF()
ADD_SUBDIRECTORY(man)
ENDIF()
# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
databases/mysql80-server/files/patch-client_CMakeLists.txt
+8 -8
View File
@@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig 2021-09-28 11:46:34 UTC
--- client/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ client/CMakeLists.txt
@@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
@@ -29,10 +29,13 @@ ADD_SUBDIRECTORY(base)
## Subdirectory with common client code.
ADD_SUBDIRECTORY(base)
## Subdirectory for mysqlpump code.
@@ -14,7 +14,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/include
)
@@ -47,6 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysql
@@ -48,6 +51,7 @@ MYSQL_ADD_EXECUTABLE(mysql
${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
)
@@ -22,7 +22,7 @@
IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -55,6 +59,7 @@ IF(NOT_WITHOUT_SERVER)
@@ -56,6 +60,7 @@ ENDIF()
)
ENDIF()
@@ -30,7 +30,7 @@
MYSQL_ADD_EXECUTABLE(mysqltest
mysqltest.cc
mysqltest/error_names.cc
@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
@@ -72,6 +77,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
ENABLE_EXPORTS
LINK_LIBRARIES mysqlclient
)
@@ -40,7 +40,7 @@
MYSQL_ADD_EXECUTABLE(mysqlcheck
check/mysqlcheck.cc
check/mysqlcheck_core.cc
@@ -250,7 +258,9 @@ ENDIF()
@@ -276,7 +284,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE
TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
@@ -50,7 +50,7 @@
MYSQL_ADD_EXECUTABLE(mysqladmin
mysqladmin.cc
multi_factor_passwordopt-vars.cc
@@ -265,6 +275,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
@@ -291,6 +301,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
mysql_config_editor.cc
LINK_LIBRARIES mysqlclient
)
@@ -60,7 +60,7 @@
MYSQL_ADD_EXECUTABLE(mysql_secure_installation
mysql_secure_installation.cc
LINK_LIBRARIES mysqlclient
@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
@@ -301,6 +314,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
path.cc
LINK_LIBRARIES mysys
)
databases/mysql80-server/files/patch-cmake_install_layout.cmake → databases/mysql80-server/files/patch-cmake_install__layout.cmake
+7 -7
View File
@@ -1,6 +1,6 @@
--- cmake/install_layout.cmake.orig 2019-12-09 19:53:17 UTC
--- cmake/install_layout.cmake.orig 2024-07-12 19:15:25 UTC
+++ cmake/install_layout.cmake
@@ -41,6 +41,10 @@
@@ -42,6 +42,10 @@
# Build with prefix=/usr/local/mysql, create tarball with install prefix="."
# and relative links.
#
@@ -11,7 +11,7 @@
# To force a directory layout, use -DINSTALL_LAYOUT=<layout>.
#
# The default is STANDALONE.
@@ -80,7 +84,7 @@ IF(NOT INSTALL_LAYOUT)
@@ -81,7 +85,7 @@ SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
ENDIF()
SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
@@ -20,7 +20,7 @@
)
IF(UNIX)
@@ -98,7 +102,7 @@ IF(UNIX)
@@ -99,7 +103,7 @@ IF(UNIX)
CACHE PATH "install prefix" FORCE)
ENDIF()
SET(VALID_INSTALL_LAYOUTS
@@ -29,7 +29,7 @@
LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
@@ -167,6 +171,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring")
@@ -168,6 +172,32 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_fi
SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
#
@@ -62,7 +62,7 @@
# TARGZ layout
#
SET(INSTALL_BINDIR_TARGZ "bin")
@@ -361,7 +391,7 @@ ENDIF()
@@ -362,7 +392,7 @@ SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LA
SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
CACHE
STRING
@@ -71,7 +71,7 @@
# If we are shared STANDALONE with the the server, we shouldn't write
# into the server's data/ as that would create a "schemadir" in
@@ -405,6 +435,21 @@ FOREACH(var
@@ -406,6 +436,21 @@ ENDFOREACH()
)
SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
ENDFOREACH()
databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
+2 -2
View File
@@ -1,6 +1,6 @@
--- cmake/os/FreeBSD.cmake.orig 2021-12-17 16:07:27 UTC
--- cmake/os/FreeBSD.cmake.orig 2024-07-12 19:15:25 UTC
+++ cmake/os/FreeBSD.cmake
@@ -48,8 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
@@ -49,8 +49,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
ENDIF()
databases/mysql80-server/files/patch-cmake_plugin.cmake
+2 -2
View File
@@ -1,6 +1,6 @@
--- cmake/plugin.cmake.orig 2021-12-17 16:07:27 UTC
--- cmake/plugin.cmake.orig 2024-07-12 19:15:25 UTC
+++ cmake/plugin.cmake
@@ -247,15 +247,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
@@ -274,15 +274,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
# For testing purposes, we need
# <...>/lib/plugin/debug/authentication_ldap_sasl_client.so
databases/mysql80-server/files/patch-cmake_ssl.cmake
+3 -3
View File
@@ -1,6 +1,6 @@
--- cmake/ssl.cmake.orig 2022-07-06 21:36:34 UTC
--- cmake/ssl.cmake.orig 2024-07-12 19:15:25 UTC
+++ cmake/ssl.cmake
@@ -142,7 +142,7 @@ MACRO(FIND_OPENSSL_VERSION)
@@ -143,7 +143,7 @@ MACRO(FIND_OPENSSL_VERSION)
# Encoded as MNNFFPPS: major minor fix patch status
FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
OPENSSL_VERSION_NUMBER
@@ -9,7 +9,7 @@
)
STRING(REGEX REPLACE
"^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
@@ -380,8 +380,9 @@ MACRO (MYSQL_CHECK_SSL)
@@ -381,8 +381,9 @@ MACRO (MYSQL_CHECK_SSL)
"Not a supported openssl version in WITH_SSL=${WITH_SSL}.")
ENDIF()
databases/mysql80-server/files/patch-extra_abseil_abseil-cpp-20230802.1_absl_time_internal_cctz_src_time__zone__format.cc
+11
View File
@@ -0,0 +1,11 @@
--- extra/abseil/abseil-cpp-20230802.1/absl/time/internal/cctz/src/time_zone_format.cc.orig 2024-07-26 08:50:41 UTC
+++ extra/abseil/abseil-cpp-20230802.1/absl/time/internal/cctz/src/time_zone_format.cc
@@ -19,7 +19,7 @@
#endif
#if defined(HAS_STRPTIME) && HAS_STRPTIME
-#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__)
+#if !defined(_XOPEN_SOURCE) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#define _XOPEN_SOURCE 500 // Exposes definitions for SUSv2 (UNIX 98).
#endif
#endif
databases/mysql80-server/files/patch-include_dh__ecdh__config.h
+4 -4
View File
@@ -1,6 +1,6 @@
--- include/dh_ecdh_config.h.orig 2023-12-03 10:42:56 UTC
--- include/dh_ecdh_config.h.orig 2024-07-12 19:15:25 UTC
+++ include/dh_ecdh_config.h
@@ -38,7 +38,7 @@
@@ -39,7 +39,7 @@ namespace {
#endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */
namespace {
@@ -9,7 +9,7 @@
/* Following primes are from https://www.rfc-editor.org/rfc/rfc7919#appendix-A
*/
@@ -257,6 +257,7 @@ bool set_dh(SSL_CTX *ctx) {
@@ -258,6 +258,7 @@ bool set_dh(SSL_CTX *ctx) {
DH *dh = nullptr;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
@@ -17,7 +17,7 @@
switch (security_level) {
case 1:
[[fallthrough]];
@@ -275,6 +276,43 @@ bool set_dh(SSL_CTX *ctx) {
@@ -276,6 +277,43 @@ bool set_dh(SSL_CTX *ctx) {
default:
break;
};
databases/mysql80-server/files/patch-include_my__compare.h
+2 -2
View File
@@ -1,6 +1,6 @@
--- include/my_compare.h.orig 2019-09-20 08:30:51 UTC
--- include/my_compare.h.orig 2024-07-12 19:15:25 UTC
+++ include/my_compare.h
@@ -49,7 +49,7 @@
@@ -50,7 +50,7 @@
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
*/
databases/mysql80-server/files/patch-include_my__stacktrace.h
+2 -2
View File
@@ -1,6 +1,6 @@
--- include/my_stacktrace.h.orig 2021-12-17 16:07:27 UTC
--- include/my_stacktrace.h.orig 2024-07-12 19:15:25 UTC
+++ include/my_stacktrace.h
@@ -43,7 +43,7 @@
@@ -44,7 +44,7 @@
HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris
_WIN32 - Windows
*/
databases/mysql80-server/files/patch-include_my__thread__os__id.h
+2 -2
View File
@@ -1,6 +1,6 @@
--- include/my_thread_os_id.h.orig 2019-09-20 08:30:51 UTC
--- include/my_thread_os_id.h.orig 2024-07-12 19:15:25 UTC
+++ include/my_thread_os_id.h
@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
@@ -85,8 +85,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
return pthread_getthreadid_np();
#else
#ifdef HAVE_INTEGER_PTHREAD_SELF
databases/mysql80-server/files/patch-include_myisam.h
+2 -2
View File
@@ -1,6 +1,6 @@
--- include/myisam.h.orig 2021-12-17 16:07:27 UTC
--- include/myisam.h.orig 2024-07-12 19:15:25 UTC
+++ include/myisam.h
@@ -60,7 +60,7 @@
@@ -61,7 +61,7 @@
The following defines can be increased if necessary.
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
*/
databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
+5 -5
View File
@@ -1,6 +1,6 @@
--- libmysql/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- libmysql/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ libmysql/CMakeLists.txt
@@ -198,6 +198,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
@@ -205,6 +205,11 @@ ENDIF()
)
ENDIF()
@@ -12,7 +12,7 @@
#
# Include protocol tracing infrastructure and the test
# trace plugin if enabled by build options.
@@ -271,8 +276,15 @@ IF(WIN32)
@@ -281,8 +286,15 @@ ENDIF()
LIST(APPEND LIBS_TO_MERGE auth_win_client)
ENDIF()
@@ -30,7 +30,7 @@
# FIDO authentication client plugin
ADD_SUBDIRECTORY(authentication_fido)
@@ -288,6 +300,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
@@ -298,6 +310,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
COMPONENT Development
LINK_LIBRARIES ${LIBS_TO_LINK}
)
@@ -38,7 +38,7 @@
# Visual Studio users need debug static library for debug projects
IF(MSVC)
@@ -334,17 +347,27 @@ ENDIF()
@@ -344,17 +357,27 @@ ENDIF()
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
databases/mysql80-server/files/patch-libservices_CMakeLists.txt
+2 -2
View File
@@ -1,6 +1,6 @@
--- libservices/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- libservices/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ libservices/CMakeLists.txt
@@ -47,7 +47,9 @@ SET(MYSQLSERVICES_SOURCES
@@ -48,7 +48,9 @@ ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURC
plugin_registry_service.c)
ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES})
databases/mysql80-server/files/patch-man_CMakeLists.txt
+4 -4
View File
@@ -1,6 +1,6 @@
--- man/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- man/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ man/CMakeLists.txt
@@ -23,26 +23,14 @@
@@ -24,26 +24,14 @@ SET(MAN1
# Copy man pages
SET(MAN1
comp_err.1
@@ -27,7 +27,7 @@
mysqlimport.1
mysqlman.1
mysqlpump.1
@@ -52,13 +40,23 @@ SET(MAN1
@@ -53,13 +41,23 @@ SET(MAN1
zlib_decompress.1
)
@@ -57,7 +57,7 @@
SET(MAN1_NDB
ndb_blob_tool.1
@@ -103,8 +101,14 @@ SET(MAN8_NDB
@@ -106,8 +104,14 @@ SET(MAN8_NDB
ndbmtd.8
)
databases/mysql80-server/files/patch-mysys_my__default.cc
+6 -6
View File
@@ -1,6 +1,6 @@
--- mysys/my_default.cc.orig 2021-12-17 16:07:27 UTC
--- mysys/my_default.cc.orig 2024-07-12 19:15:25 UTC
+++ mysys/my_default.cc
@@ -204,7 +204,7 @@ bool no_defaults = false;
@@ -205,7 +205,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;
@@ -922,6 +922,14 @@ static int search_default_file_with_ext(Process_option
@@ -923,6 +923,14 @@ static int search_default_file_with_ext(Process_option
return 1; /* Ignore wrong files */
}
@@ -24,7 +24,7 @@
while (true) {
auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file);
char *linebuff = fileline.get();
@@ -1311,7 +1319,8 @@ void my_print_default_files(const char *conf_file) {
@@ -1312,7 +1320,8 @@ void my_print_default_files(const char *conf_file) {
end[(strlen(end) - 1)] = ' ';
else
strxmov(end, conf_file, *ext, " ", NullS);
@@ -34,7 +34,7 @@
}
}
}
@@ -1651,14 +1660,9 @@ static const char **init_default_directories(MEM_ROOT
@@ -1652,14 +1661,9 @@ static const char **init_default_directories(MEM_ROOT
#else
@@ -51,7 +51,7 @@
#endif
if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
@@ -1723,7 +1727,7 @@ int check_file_permissions(const char *file_name, bool
@@ -1724,7 +1728,7 @@ int check_file_permissions(const char *file_name, bool
#if !defined(_WIN32)
MY_STAT stat_info;
databases/mysql80-server/files/patch-mysys_my__kdf.cc
+3 -3
View File
@@ -1,6 +1,6 @@
--- mysys/my_kdf.cc.orig 2022-12-11 13:12:02 UTC
--- mysys/my_kdf.cc.orig 2024-07-12 19:15:25 UTC
+++ mysys/my_kdf.cc
@@ -56,7 +56,7 @@ int create_kdf_key(const unsigned char *key, const uns
@@ -57,7 +57,7 @@ int create_kdf_key(const unsigned char *key, const uns
std::unique_ptr<Key_derivation_function> kdf_function;
if (kdf_name == "hkdf") {
@@ -9,7 +9,7 @@
kdf_function = std::make_unique<Key_hkdf_function>(kdf_options);
#else
return 1;
@@ -71,7 +71,7 @@ int create_kdf_key(const unsigned char *key, const uns
@@ -72,7 +72,7 @@ int create_kdf_key(const unsigned char *key, const uns
return kdf_function->derive_key(key, key_length, rkey, rkey_size);
}
databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
+2 -2
View File
@@ -1,6 +1,6 @@
--- plugin/password_validation/validate_password.cc.orig 2019-09-20 08:30:51 UTC
--- plugin/password_validation/validate_password.cc.orig 2024-07-12 19:15:25 UTC
+++ plugin/password_validation/validate_password.cc
@@ -25,6 +25,8 @@
@@ -26,6 +26,8 @@
#include <mysql/plugin_validate_password.h>
#include <mysql/service_my_plugin_log.h>
#include <mysql/service_mysql_string.h>

Some files were not shown because too many files have changed in this diff Show More