databases/mysql84-{server|client}: Update to 8.4.3

Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-3.html

PR:	283752
Sponsored by:	Netzkommune GmbH
This commit is contained in:
Oleksii Samorukov 2025-01-10 16:49:06 +01:00 committed by Jochen Neumeister
parent c4179e6bc0
commit 56b89132b2
5 changed files with 19 additions and 21 deletions

View file

@ -1,5 +1,4 @@
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 1
PKGNAMESUFFIX= 84-client PKGNAMESUFFIX= 84-client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)

View file

@ -1,6 +1,5 @@
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 8.4.2 PORTVERSION= 8.4.3
PORTREVISION?= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.4 MASTER_SITES= MYSQL/MySQL-8.4
PKGNAMESUFFIX?= 84-server PKGNAMESUFFIX?= 84-server

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1721979278 TIMESTAMP = 1735595165
SHA256 (mysql-8.4.2.tar.gz) = 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814 SHA256 (mysql-8.4.3.tar.gz) = 7ac9564c478022f73005ff89bbb40f67b381fc06d5518416bdffec75e625b818
SIZE (mysql-8.4.2.tar.gz) = 425791134 SIZE (mysql-8.4.3.tar.gz) = 465097732

View file

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2024-06-03 11:39:00 UTC --- CMakeLists.txt.orig 2024-09-17 10:40:37 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP) @@ -1870,7 +1870,7 @@ IF(WITH_AUTHENTICATION_LDAP)
ENDIF() ENDIF()
IF(WITH_AUTHENTICATION_LDAP) IF(WITH_AUTHENTICATION_LDAP)
@ -9,7 +9,7 @@
# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix. # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
IF(WITH_LDAP STREQUAL "system" OR IF(WITH_LDAP STREQUAL "system" OR
WITH_SASL STREQUAL "system" OR WITH_SASL STREQUAL "system" OR
@@ -1896,6 +1896,7 @@ ENDIF() @@ -1921,6 +1921,7 @@ ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
@ -17,7 +17,7 @@
# Add system/bundled editline. # Add system/bundled editline.
MYSQL_CHECK_EDITLINE() MYSQL_CHECK_EDITLINE()
SET(EDITLINE_WARN_GIVEN) SET(EDITLINE_WARN_GIVEN)
@@ -1906,6 +1907,7 @@ ENDIF() @@ -1931,6 +1932,7 @@ ENDIF()
"You can use -DWITH_EDITLINE=bundled instead." "You can use -DWITH_EDITLINE=bundled instead."
) )
ENDIF() ENDIF()
@ -25,7 +25,7 @@
# Add lz4 library # Add lz4 library
MYSQL_CHECK_LZ4() MYSQL_CHECK_LZ4()
@@ -2189,7 +2191,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) @@ -2213,7 +2215,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all) ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
@ -36,7 +36,7 @@
ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(mysys)
@@ -2239,12 +2243,15 @@ ENDIF() @@ -2263,12 +2267,15 @@ ENDIF()
ADD_SUBDIRECTORY(unittest/mytap/t) ADD_SUBDIRECTORY(unittest/mytap/t)
ENDIF() ENDIF()
@ -54,7 +54,7 @@
ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(testclients)
ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql)
ENDIF() ENDIF()
@@ -2322,11 +2329,11 @@ ADD_SUBDIRECTORY(scripts) @@ -2346,11 +2353,11 @@ ADD_SUBDIRECTORY(scripts)
# scripts/mysql_config depends on client and server targets loaded above. # 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. # It is referenced by some of the directories below, so we insert it here.
ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(scripts)
@ -67,7 +67,7 @@
IF(WITH_INTERNAL) IF(WITH_INTERNAL)
ADD_SUBDIRECTORY(internal) ADD_SUBDIRECTORY(internal)
ENDIF() ENDIF()
@@ -2354,8 +2361,10 @@ ENDIF() @@ -2377,8 +2384,10 @@ ENDIF()
INCLUDE(fastcov) INCLUDE(fastcov)
ENDIF() ENDIF()

View file

@ -1,4 +1,4 @@
--- client/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC --- client/CMakeLists.txt.orig 2024-09-17 10:40:37 UTC
+++ client/CMakeLists.txt +++ client/CMakeLists.txt
@@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING() @@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING()
# We are not interesting in profiling clients. # We are not interesting in profiling clients.
@ -23,17 +23,17 @@
MYSQL_ADD_EXECUTABLE(mysqltest MYSQL_ADD_EXECUTABLE(mysqltest
mysqltest.cc mysqltest.cc
mysqltest/error_names.cc mysqltest/error_names.cc
@@ -59,6 +64,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest @@ -64,6 +69,9 @@ ENDIF()
ENABLE_EXPORTS TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
LINK_LIBRARIES mysqlclient ENDIF()
)
+ENDIF() +ENDIF()
+ +
+IF(WITHOUT_SERVER) +IF(WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysqlcheck MYSQL_ADD_EXECUTABLE(mysqlcheck
check/mysqlcheck.cc check/mysqlcheck.cc
check/mysqlcheck_core.cc check/mysqlcheck_core.cc
@@ -274,7 +282,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE @@ -289,7 +297,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE
TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
@ -43,7 +43,7 @@
MYSQL_ADD_EXECUTABLE(mysqladmin MYSQL_ADD_EXECUTABLE(mysqladmin
mysqladmin.cc mysqladmin.cc
multi_factor_passwordopt-vars.cc multi_factor_passwordopt-vars.cc
@@ -289,10 +299,14 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor @@ -304,10 +314,14 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
mysql_config_editor.cc mysql_config_editor.cc
LINK_LIBRARIES mysqlclient LINK_LIBRARIES mysqlclient
) )