git: 56b89132b297 - main - databases/mysql84-{server|client}: Update to 8.4.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Jan 2025 15:52:45 UTC
The branch main has been updated by joneum:
URL: https://cgit.FreeBSD.org/ports/commit/?id=56b89132b2975ac65db580e860945f0ad63257cb
commit 56b89132b2975ac65db580e860945f0ad63257cb
Author: Oleksii Samorukov <samm@FreeBSD.org>
AuthorDate: 2025-01-10 15:49:06 +0000
Commit: Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2025-01-10 15:52:08 +0000
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
---
databases/mysql84-client/Makefile | 1 -
databases/mysql84-server/Makefile | 3 +--
databases/mysql84-server/distinfo | 6 +++---
databases/mysql84-server/files/patch-CMakeLists.txt | 16 ++++++++--------
.../mysql84-server/files/patch-client_CMakeLists.txt | 14 +++++++-------
5 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/databases/mysql84-client/Makefile b/databases/mysql84-client/Makefile
index bfb4f1e7263d..97e03aed58b9 100644
--- a/databases/mysql84-client/Makefile
+++ b/databases/mysql84-client/Makefile
@@ -1,5 +1,4 @@
PORTNAME= mysql
-PORTREVISION= 1
PKGNAMESUFFIX= 84-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile
index 684cd4306543..eae373857f5b 100644
--- a/databases/mysql84-server/Makefile
+++ b/databases/mysql84-server/Makefile
@@ -1,6 +1,5 @@
PORTNAME?= mysql
-PORTVERSION= 8.4.2
-PORTREVISION?= 1
+PORTVERSION= 8.4.3
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.4
PKGNAMESUFFIX?= 84-server
diff --git a/databases/mysql84-server/distinfo b/databases/mysql84-server/distinfo
index 4eb3b871ecf8..0da85a689377 100644
--- a/databases/mysql84-server/distinfo
+++ b/databases/mysql84-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721979278
-SHA256 (mysql-8.4.2.tar.gz) = 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814
-SIZE (mysql-8.4.2.tar.gz) = 425791134
+TIMESTAMP = 1735595165
+SHA256 (mysql-8.4.3.tar.gz) = 7ac9564c478022f73005ff89bbb40f67b381fc06d5518416bdffec75e625b818
+SIZE (mysql-8.4.3.tar.gz) = 465097732
diff --git a/databases/mysql84-server/files/patch-CMakeLists.txt b/databases/mysql84-server/files/patch-CMakeLists.txt
index 8994243f163f..ad5e829a5b73 100644
--- a/databases/mysql84-server/files/patch-CMakeLists.txt
+++ b/databases/mysql84-server/files/patch-CMakeLists.txt
@@ -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
-@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP)
+@@ -1870,7 +1870,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
-@@ -1896,6 +1896,7 @@ ENDIF()
+@@ -1921,6 +1921,7 @@ ENDIF()
ENDIF()
ENDIF()
@@ -17,7 +17,7 @@
# Add system/bundled editline.
MYSQL_CHECK_EDITLINE()
SET(EDITLINE_WARN_GIVEN)
-@@ -1906,6 +1907,7 @@ ENDIF()
+@@ -1931,6 +1932,7 @@ ENDIF()
"You can use -DWITH_EDITLINE=bundled instead."
)
ENDIF()
@@ -25,7 +25,7 @@
# Add lz4 library
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 GenError)
@@ -36,7 +36,7 @@
ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(mysys)
-@@ -2239,12 +2243,15 @@ ENDIF()
+@@ -2263,12 +2267,15 @@ ENDIF()
ADD_SUBDIRECTORY(unittest/mytap/t)
ENDIF()
@@ -54,7 +54,7 @@
ADD_SUBDIRECTORY(testclients)
ADD_SUBDIRECTORY(sql)
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.
# It is referenced by some of the directories below, so we insert it here.
ADD_SUBDIRECTORY(scripts)
@@ -67,7 +67,7 @@
IF(WITH_INTERNAL)
ADD_SUBDIRECTORY(internal)
ENDIF()
-@@ -2354,8 +2361,10 @@ ENDIF()
+@@ -2377,8 +2384,10 @@ ENDIF()
INCLUDE(fastcov)
ENDIF()
diff --git a/databases/mysql84-server/files/patch-client_CMakeLists.txt b/databases/mysql84-server/files/patch-client_CMakeLists.txt
index 780490a1b465..ebdc438598f2 100644
--- a/databases/mysql84-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql84-server/files/patch-client_CMakeLists.txt
@@ -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
@@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING()
# We are not interesting in profiling clients.
@@ -23,17 +23,17 @@
MYSQL_ADD_EXECUTABLE(mysqltest
mysqltest.cc
mysqltest/error_names.cc
-@@ -59,6 +64,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
- ENABLE_EXPORTS
- LINK_LIBRARIES mysqlclient
- )
+@@ -64,6 +69,9 @@ ENDIF()
+ TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
+ ENDIF()
+
+ENDIF()
+
+IF(WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysqlcheck
check/mysqlcheck.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_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
@@ -43,7 +43,7 @@
MYSQL_ADD_EXECUTABLE(mysqladmin
mysqladmin.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
LINK_LIBRARIES mysqlclient
)