sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-03 11:56:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:05:50 +02:00
parent 4195a8fa98
commit 25218e3b20
47 changed files with 172 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
databases/mysql80-server/Makefile
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)

6
databases/mysql80-server/distinfo
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

33
databases/mysql80-server/files/patch-CMakeLists.txt
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,

16
databases/mysql80-server/files/patch-client_CMakeLists.txt
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
)

14
databases/mysql80-server/files/patch-cmake_install_layout.cmake → databases/mysql80-server/files/patch-cmake_install__layout.cmake
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()

4
databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
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()

4
databases/mysql80-server/files/patch-cmake_plugin.cmake
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

6
databases/mysql80-server/files/patch-cmake_ssl.cmake
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()

11
databases/mysql80-server/files/patch-extra_abseil_abseil-cpp-20230802.1_absl_time_internal_cctz_src_time__zone__format.cc Normal file
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

8
databases/mysql80-server/files/patch-include_dh__ecdh__config.h
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;
};

4
databases/mysql80-server/files/patch-include_my__compare.h
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.
*/

4
databases/mysql80-server/files/patch-include_my__stacktrace.h
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
*/

4
databases/mysql80-server/files/patch-include_my__thread__os__id.h
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

4
databases/mysql80-server/files/patch-include_myisam.h
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.
*/

10
databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
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.

4
databases/mysql80-server/files/patch-libservices_CMakeLists.txt
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})

8
databases/mysql80-server/files/patch-man_CMakeLists.txt
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
)

12
databases/mysql80-server/files/patch-mysys_my__default.cc
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;

6
databases/mysql80-server/files/patch-mysys_my__kdf.cc
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);
}

4
databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc
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>

6
databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- plugin/x/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- plugin/x/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ plugin/x/CMakeLists.txt
@@ -77,6 +77,8 @@ INCLUDE_DIRECTORIES(
@@ -75,6 +75,8 @@ INCLUDE_DIRECTORIES(
${MYSQLX_GENERATE_DIR}
${MYSQLX_PROTOCOL_INCLUDE_DIR}
${MYSQLX_CLIENT_INCLUDE_DIR}
@ -8,4 +8,4 @@
+ ${BOOST_INCLUDE_DIR}
)
MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT)
ADD_COMPILE_FLAGS(${XPLUGIN_SRC}

4
databases/mysql80-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc
View file

@ -1,6 +1,6 @@
--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig 2019-09-20 08:30:51 UTC
--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig 2024-07-12 19:15:25 UTC
+++ plugin/x/client/authentication/sha256_scramble_generator.cc
@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
@@ -98,7 +98,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
return true;
}
m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr);

6
databases/mysql80-server/files/patch-plugin_x_configure.cmake
View file

@ -1,6 +1,6 @@
--- plugin/x/configure.cmake.orig 2019-09-20 08:30:51 UTC
--- plugin/x/configure.cmake.orig 2024-07-12 19:15:25 UTC
+++ plugin/x/configure.cmake
@@ -45,6 +45,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
@@ -46,6 +46,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in
${MYSQLX_GENERATE_DIR}/mysqlx_version.h )
@ -8,7 +8,7 @@
INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_error.h
DESTINATION ${INSTALL_INCLUDEDIR}
COMPONENT Development)
@@ -56,3 +57,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_ername.h
@@ -57,3 +58,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h
INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h
DESTINATION ${INSTALL_INCLUDEDIR}
COMPONENT Development)

4
databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h → databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h
View file

@ -1,6 +1,6 @@
--- router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h.orig 2020-09-23 12:37:48 UTC
--- router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h.orig 2024-07-12 19:15:25 UTC
+++ router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h
@@ -190,8 +190,8 @@
@@ -191,8 +191,8 @@ class kqueue_io_service : public IoServiceBase {
auto secs = std::chrono::duration_cast<std::chrono::seconds>(timeout);
timeout -= secs;

4
databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h
View file

@ -1,6 +1,6 @@
--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig 2020-11-09 00:30:01 UTC
--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig 2024-07-12 19:15:25 UTC
+++ router/src/harness/include/mysql/harness/net_ts/internet.h
@@ -43,6 +43,7 @@
@@ -44,6 +44,7 @@
#include <arpa/inet.h> // inet_ntop
#include <netdb.h> // getaddrinfo
#include <netinet/in.h> // in_addr_t

8
databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- router/src/harness/src/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- router/src/harness/src/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ router/src/harness/src/CMakeLists.txt
@@ -212,7 +212,6 @@ ELSE()
@@ -222,7 +222,6 @@ ELSE()
INSTALL(TARGETS harness-library
LIBRARY
DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@ -8,7 +8,7 @@
)
ENDIF()
@@ -243,7 +242,6 @@ INSTALL(TARGETS harness_stdx
@@ -254,7 +253,6 @@ INSTALL(TARGETS harness_stdx
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@ -16,7 +16,7 @@
)
## harness_tls
@@ -284,5 +282,4 @@ INSTALL(TARGETS harness_tls
@@ -296,5 +294,4 @@ INSTALL(TARGETS harness_tls
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

4
databases/mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc
View file

@ -1,6 +1,6 @@
--- router/src/harness/src/tls_client_context.cc.orig 2021-12-17 16:07:27 UTC
--- router/src/harness/src/tls_client_context.cc.orig 2024-07-12 19:15:25 UTC
+++ router/src/harness/src/tls_client_context.cc
@@ -61,7 +61,7 @@ stdx::expected<void, std::error_code> TlsClientContext
@@ -66,7 +66,7 @@ stdx::expected<void, std::error_code> TlsClientContext
stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(
const std::string &ciphers) {
// TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()

10
databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc
View file

@ -1,6 +1,6 @@
--- router/src/harness/src/tls_context.cc.orig 2021-12-17 16:07:27 UTC
--- router/src/harness/src/tls_context.cc.orig 2024-07-12 19:15:25 UTC
+++ router/src/harness/src/tls_context.cc
@@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) {
@@ -243,7 +243,7 @@ static int o11x_version(TlsVersion version) {
return TLS1_1_VERSION;
case TlsVersion::TLS_1_2:
return TLS1_2_VERSION;
@ -9,7 +9,7 @@
case TlsVersion::TLS_1_3:
return TLS1_3_VERSION;
#endif
@@ -272,9 +272,11 @@ stdx::expected<void, std::error_code> TlsContext::vers
@@ -274,9 +274,11 @@ stdx::expected<void, std::error_code> TlsContext::vers
default:
// unknown, leave all disabled
[[fallthrough]];
@ -21,7 +21,7 @@
case TlsVersion::TLS_1_2:
opts |= SSL_OP_NO_TLSv1_1;
[[fallthrough]];
@@ -322,8 +324,10 @@ TlsVersion TlsContext::min_version() const {
@@ -324,8 +326,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:
@@ -382,7 +386,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c
@@ -377,7 +381,8 @@ int TlsContext::security_level() const {
}
int TlsContext::security_level() const {

6
databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
View file

@ -1,6 +1,6 @@
--- router/src/harness/src/tls_server_context.cc.orig 2023-11-18 19:39:18.923205000 +0100
+++ router/src/harness/src/tls_server_context.cc 2023-11-18 19:42:53.690094000 +0100
@@ -474,7 +474,8 @@ int TlsServerContext::security_level() const {
--- router/src/harness/src/tls_server_context.cc.orig 2024-07-12 19:15:25 UTC
+++ router/src/harness/src/tls_server_context.cc
@@ -475,7 +475,8 @@ int TlsServerContext::security_level() const {
}
int TlsServerContext::security_level() const {

8
databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- router/src/http/src/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- router/src/http/src/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ router/src/http/src/CMakeLists.txt
@@ -58,7 +58,6 @@ INSTALL(TARGETS http_common
@@ -59,7 +59,6 @@ INSTALL(TARGETS http_common
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@ -8,7 +8,7 @@
)
## split library code from the plugin to use them _passwd and tests
@@ -84,7 +83,6 @@ INSTALL(TARGETS http_auth_backend_lib
@@ -85,7 +84,6 @@ INSTALL(TARGETS http_auth_backend_lib
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@ -16,7 +16,7 @@
)
TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
@@ -137,7 +135,6 @@ INSTALL(TARGETS http_auth_realm_lib
@@ -138,7 +136,6 @@ INSTALL(TARGETS http_auth_realm_lib
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

4
databases/mysql80-server/files/patch-router_src_io_src_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- router/src/io/src/CMakeLists.txt.orig 2020-09-23 12:37:48 UTC
--- router/src/io/src/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ router/src/io/src/CMakeLists.txt
@@ -47,7 +47,6 @@ INSTALL(TARGETS io_component
@@ -48,7 +48,6 @@ INSTALL(TARGETS io_component
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

4
databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- router/src/router/src/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
--- router/src/router/src/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ router/src/router/src/CMakeLists.txt
@@ -124,7 +124,6 @@ INSTALL(TARGETS router_lib
@@ -149,7 +149,6 @@ INSTALL(TARGETS router_lib
RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router

8
databases/mysql80-server/files/patch-scripts_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- scripts/CMakeLists.txt.orig 2022-07-06 21:36:34 UTC
--- scripts/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ scripts/CMakeLists.txt
@@ -332,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
SET(${var} "${${var}}-L${dir} " )
ENDIF()
SET(${var} "${${var}}-l${lib} " )
@ -9,7 +9,7 @@
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
@@ -405,7 +407,7 @@ ELSE()
@@ -420,7 +422,7 @@ ELSE()
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
ESCAPE_QUOTES @ONLY)
@ -18,7 +18,7 @@
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
@@ -418,23 +420,28 @@ ELSE()
@@ -433,23 +435,28 @@ ELSE()
# mysqld_safe used in mtr even for systemd platforms
IF(WITH_SYSTEMD)
SET(BIN_SCRIPTS

4
databases/mysql80-server/files/patch-sql_auth_sha2__password__common.cc
View file

@ -1,6 +1,6 @@
--- sql/auth/sha2_password_common.cc.orig 2019-09-20 08:30:51 UTC
--- sql/auth/sha2_password_common.cc.orig 2024-07-12 19:15:25 UTC
+++ sql/auth/sha2_password_common.cc
@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
@@ -102,7 +102,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
return true;
}
m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr);

4
databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc
View file

@ -1,6 +1,6 @@
--- sql/auth/sql_authorization.cc.orig 2023-03-16 17:22:37 UTC
--- sql/auth/sql_authorization.cc.orig 2024-07-12 19:15:25 UTC
+++ sql/auth/sql_authorization.cc
@@ -7430,6 +7430,10 @@ bool operator==(const Role_id &a, const std::string &b
@@ -7445,6 +7445,10 @@ bool operator==(const Role_id &a, const std::string &b
return tmp == b;
}

6
databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
View file

@ -1,6 +1,6 @@
--- sql/conn_handler/socket_connection.cc.orig 2021-12-17 16:07:27 UTC
--- sql/conn_handler/socket_connection.cc.orig 2024-07-12 19:15:25 UTC
+++ sql/conn_handler/socket_connection.cc
@@ -953,9 +953,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
@@ -961,9 +961,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
signal(SIGCHLD, SIG_DFL);
request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,
mysql_socket_getfd(connect_sock), NULL);
@ -14,7 +14,7 @@
/*
This may be stupid but refuse() includes an exit(0)
which we surely don't want...
@@ -967,12 +969,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
@@ -975,12 +977,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
This is unproblematic as TCP-wrapper is unix specific,
anyway.
*/

4
databases/mysql80-server/files/patch-sql_mysqld.cc
View file

@ -1,6 +1,6 @@
--- sql/mysqld.cc.orig 2022-07-06 21:36:34 UTC
--- sql/mysqld.cc.orig 2024-07-12 19:15:25 UTC
+++ sql/mysqld.cc
@@ -5299,7 +5299,7 @@ static int init_thread_environment() {
@@ -5381,7 +5381,7 @@ static PSI_memory_key key_memory_openssl = PSI_NOT_INS
static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;

6
databases/mysql80-server/files/patch-sql_ssl__init__callback.cc
View file

@ -1,6 +1,6 @@
--- sql/ssl_init_callback.cc.orig 2021-12-17 16:07:27 UTC
--- sql/ssl_init_callback.cc.orig 2024-07-12 19:15:25 UTC
+++ sql/ssl_init_callback.cc
@@ -106,14 +106,14 @@ static Sys_var_charptr Sys_ssl_capath(
@@ -154,14 +154,14 @@ static Sys_var_charptr Sys_tls_version(
static Sys_var_charptr Sys_tls_version(
"tls_version",
@ -17,7 +17,7 @@
"TLSv1.2,TLSv1.3",
#else
"TLSv1.2",
@@ -175,14 +175,14 @@ static Sys_var_charptr Sys_admin_ssl_capath(
@@ -242,14 +242,14 @@ static Sys_var_charptr Sys_admin_tls_version(
static Sys_var_charptr Sys_admin_tls_version(
"admin_tls_version",

8
databases/mysql80-server/files/patch-sql_sys__vars.cc
View file

@ -1,6 +1,6 @@
--- sql/sys_vars.cc.orig 2022-07-06 21:36:34 UTC
--- sql/sys_vars.cc.orig 2024-07-12 19:15:25 UTC
+++ sql/sys_vars.cc
@@ -2039,7 +2039,7 @@ static Sys_var_ulong Sys_connect_timeout(
@@ -2058,7 +2058,7 @@ static Sys_var_ulong Sys_connect_timeout(
"The number of seconds the mysqld server is waiting for a connect "
"packet before responding with 'Bad handshake'",
GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
@ -9,7 +9,7 @@
static Sys_var_ulong Sys_information_schema_stats_expiry(
"information_schema_stats_expiry",
@@ -3189,7 +3189,7 @@ static Sys_var_ulong Sys_net_read_timeout(
@@ -3214,7 +3214,7 @@ static Sys_var_ulong Sys_net_read_timeout(
"Number of seconds to wait for more data from a connection before "
"aborting the read",
SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
@ -18,7 +18,7 @@
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
ON_UPDATE(fix_net_read_timeout));
@@ -3210,7 +3210,7 @@ static Sys_var_ulong Sys_net_write_timeout(
@@ -3235,7 +3235,7 @@ static Sys_var_ulong Sys_net_write_timeout(
"Number of seconds to wait for a block to be written to a connection "
"before aborting the write",
SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),

4
databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h
View file

@ -1,6 +1,6 @@
--- storage/innobase/include/srv0mon.h.orig 2019-09-20 08:30:51 UTC
--- storage/innobase/include/srv0mon.h.orig 2024-07-12 19:15:25 UTC
+++ storage/innobase/include/srv0mon.h
@@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
@@ -41,6 +41,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
/* Required for FreeBSD so that INT64_MAX is defined. */
#define __STDC_LIMIT_MACROS
#endif /* __STDC_LIMIT_MACROS */

6
databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h
View file

@ -1,6 +1,6 @@
--- storage/innobase/include/ut0crc32.h.orig 2023-11-27 21:02:58.728994000 +0100
+++ storage/innobase/include/ut0crc32.h 2023-11-27 21:04:10.010362000 +0100
@@ -132,7 +132,9 @@ CRC32_DEFAULT
--- storage/innobase/include/ut0crc32.h.orig 2024-07-12 19:15:25 UTC
+++ storage/innobase/include/ut0crc32.h
@@ -133,7 +133,9 @@ CRC32_DEFAULT
#endif /* CRC32_ARM64 */
#ifdef CRC32_ARM64_DEFAULT

14
databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
View file

@ -1,6 +1,6 @@
--- storage/innobase/ut/crc32.cc.orig 2023-11-18 19:47:31.364606000 +0100
+++ storage/innobase/ut/crc32.cc 2023-11-18 20:51:42.956171000 +0100
@@ -332,8 +332,25 @@ bool can_use_poly_mul() { return true; }
--- storage/innobase/ut/crc32.cc.orig 2024-07-12 19:15:25 UTC
+++ storage/innobase/ut/crc32.cc
@@ -333,8 +333,25 @@ bool can_use_poly_mul() { return true; }
#endif /* CRC32_ARM64_APPLE */
#ifdef CRC32_ARM64_DEFAULT
@ -26,7 +26,7 @@
#endif /* CRC32_ARM64_DEFAULT */
/** A helper template to statically unroll a loop with a fixed number of
@@ -442,25 +459,39 @@ uint64_t crc32_impl::update(uint64_t crc, uint64_t dat
@@ -443,25 +460,39 @@ uint64_t crc32_impl::update(uint64_t crc, uint64_t dat
#ifdef CRC32_ARM64
#ifdef CRC32_ARM64_DEFAULT
@ -66,7 +66,7 @@
#endif /* CRC32_ARM64_DEFAULT */
uint64_t crc32_impl::update(uint64_t crc, uint64_t data) {
return (uint64_t)__crc32cd((uint32_t)crc, data);
@@ -506,7 +537,11 @@ template <uint32_t w>
@@ -507,7 +538,11 @@ template <uint32_t w>
}
template <uint32_t w>
#ifdef CRC32_ARM64_DEFAULT
@ -78,7 +78,7 @@
#endif /* CRC32_ARM64_DEFAULT */
uint64_t use_pclmul::polynomial_mul_rev(uint32_t rev_u) {
constexpr uint64_t flipped_w = flip_at_32(w);
@@ -749,7 +784,11 @@ MY_ATTRIBUTE((flatten))
@@ -750,7 +785,11 @@ MY_ATTRIBUTE((flatten))
MY_ATTRIBUTE((flatten))
#endif /* CRC32_ARM64_APPLE */
#ifdef CRC32_ARM64_DEFAULT
@ -90,7 +90,7 @@
#endif /* CRC32_ARM64_DEFAULT */
uint32_t crc32_using_pclmul(const byte *data, size_t len) {
return crc32<use_pclmul>(0, data, len);
@@ -769,7 +808,11 @@ MY_ATTRIBUTE((flatten))
@@ -770,7 +809,11 @@ MY_ATTRIBUTE((flatten))
MY_ATTRIBUTE((flatten))
#endif /* CRC32_ARM64_APPLE */
#ifdef CRC32_ARM64_DEFAULT

4
databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.cc
View file

@ -1,6 +1,6 @@
--- storage/myisam/mi_dynrec.cc.orig 2019-09-20 08:30:51 UTC
--- storage/myisam/mi_dynrec.cc.orig 2024-07-12 19:15:25 UTC
+++ storage/myisam/mi_dynrec.cc
@@ -85,17 +85,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
@@ -86,17 +86,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
return true;
}
/*

8
databases/mysql80-server/files/patch-storage_temptable_include_temptable_lock_free_type.h → databases/mysql80-server/files/patch-storage_temptable_include_temptable_lock__free__type.h
View file

@ -1,7 +1,7 @@
--- storage/temptable/include/temptable/lock_free_type.h.orig 2020-06-16 16:31:03 UTC
--- storage/temptable/include/temptable/lock_free_type.h.orig 2024-07-12 19:15:25 UTC
+++ storage/temptable/include/temptable/lock_free_type.h
@@ -31,6 +31,14 @@ Lock-free type (selection) implementation. */
@@ -33,6 +33,14 @@ Lock-free type (selection) implementation. */
#include "my_config.h"
#include "storage/temptable/include/temptable/constants.h"
+#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
@ -14,4 +14,4 @@
+
namespace temptable {
/** Enum class describing alignment-requirements. */
/** Clang has a bug which causes ATOMIC_LLONG_LOCK_FREE to be defined as 1

12
databases/mysql80-server/files/patch-support-files_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- support-files/CMakeLists.txt.orig 2020-09-23 12:37:48 UTC
--- support-files/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ support-files/CMakeLists.txt
@@ -24,8 +24,9 @@ IF(NOT UNIX)
@@ -25,8 +25,9 @@ ENDIF()
RETURN()
ENDIF()
@ -12,7 +12,7 @@
SET(localstatedir "${MYSQL_DATADIR}")
@@ -43,7 +44,7 @@ ENDIF()
@@ -44,7 +45,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-r
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in
${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY)
@ -21,7 +21,7 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY
)
@@ -59,6 +60,7 @@ IF(NOT WITH_SYSTEMD)
@@ -60,6 +61,7 @@ ENDIF()
)
ENDIF()
@ -29,11 +29,11 @@
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate
COMPONENT Server_Scripts
DESTINATION ${INSTALL_SUPPORTFILESDIR}
@@ -66,6 +68,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro
@@ -67,6 +69,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro
OWNER_READ OWNER_WRITE
GROUP_READ WORLD_READ
)
+ENDIF()
IF(WITH_ROUTER)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysqlrouter-log-rotate.in
IF(NOT WITH_SYSTEMD)

10
databases/mysql80-server/files/patch-utilities_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- utilities/CMakeLists.txt.orig 2023-06-14 08:24:40.103026000 +0200
+++ utilities/CMakeLists.txt 2023-06-22 20:43:33.353592000 +0200
@@ -24,13 +24,19 @@ MSVC_CPPCHECK_DISABLE()
--- utilities/CMakeLists.txt.orig 2024-07-12 19:15:25 UTC
+++ utilities/CMakeLists.txt
@@ -25,13 +25,19 @@ MSVC_CPPCHECK_DISABLE()
DISABLE_MISSING_PROFILE_WARNING()
MSVC_CPPCHECK_DISABLE()
@ -22,7 +22,7 @@
MYSQL_ADD_EXECUTABLE(comp_client_err
comp_client_err.cc
@@ -113,10 +119,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
@@ -114,10 +120,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
EXCLUDE_FROM_ALL
)
@ -53,7 +53,7 @@
)
MYSQL_ADD_EXECUTABLE(perror
perror.cc
@@ -131,12 +157,23 @@ ENDIF()
@@ -132,12 +158,23 @@ ENDIF()
LINK_LIBRARIES ext::lz4 mysys
)
ENDIF()

6
databases/mysql80-server/pkg-plist
View file

@ -177,9 +177,9 @@ 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
lib/mysql/private/libprotobuf-lite.so.3.19.4
lib/mysql/private/libprotobuf.so.3.19.4
lib/mysql/libprotobuf-lite.so.3.19.4
lib/mysql/private/libprotobuf-lite.so.24.4.0
lib/mysql/private/libprotobuf.so.24.4.0
lib/mysql/libprotobuf-lite.so.24.4.0
libexec/mysqld
@comment share/man/man1/ibd2sdi.1.gz
@comment share/man/man1/innochecksum.1.gz