Attachment 252295 Details for Bug 280456 – git diff of mysql update

[patch] git diff of mysql update

mysql84_8.4.2.diff (text/plain), 10.64 KB, created by mickael.maillot on 2024-07-26 10:38:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mickael.maillot

Created: 2024-07-26 10:38:04 UTC

Size: 10.64 KB

patch

obsolete

>diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile
>index b3558ea2613..aa16428a1ce 100644
>--- a/databases/mysql84-server/Makefile
>+++ b/databases/mysql84-server/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME?=		mysql
>-PORTVERSION=		8.4.0
>+PORTVERSION=		8.4.2
> PORTREVISION?=		0
> CATEGORIES=		databases
> MASTER_SITES=		MYSQL/MySQL-8.4
>@@ -97,8 +97,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)
>diff --git a/databases/mysql84-server/distinfo b/databases/mysql84-server/distinfo
>index 3c5822a40a5..4eb3b871ecf 100644
>--- a/databases/mysql84-server/distinfo
>+++ b/databases/mysql84-server/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1715251111
>-SHA256 (mysql-8.4.0.tar.gz) = 47a5433fcdd639db836b99e1b5459c2b813cbdad23ff2b5dd4ad27f792ba918e
>-SIZE (mysql-8.4.0.tar.gz) = 413221068
>+TIMESTAMP = 1721979278
>+SHA256 (mysql-8.4.2.tar.gz) = 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814
>+SIZE (mysql-8.4.2.tar.gz) = 425791134
>diff --git a/databases/mysql84-server/files/patch-CMakeLists.txt b/databases/mysql84-server/files/patch-CMakeLists.txt
>index 8ad23c61d72..8994243f163 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-04-10 06:26:28 UTC
>+--- CMakeLists.txt.orig	2024-06-03 11:39:00 UTC
> +++ CMakeLists.txt
>-@@ -1836,7 +1836,7 @@ IF(WITH_AUTHENTICATION_LDAP)
>+@@ -1845,7 +1845,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
>-@@ -1887,6 +1887,7 @@ ENDIF()
>+@@ -1896,6 +1896,7 @@ ENDIF()
>    ENDIF()
>  ENDIF()
>  
>@@ -17,7 +17,7 @@
>  # Add system/bundled editline.
>  MYSQL_CHECK_EDITLINE()
>  SET(EDITLINE_WARN_GIVEN)
>-@@ -1897,6 +1898,7 @@ ENDIF()
>+@@ -1906,6 +1907,7 @@ ENDIF()
>      "You can use -DWITH_EDITLINE=bundled instead."
>      )
>  ENDIF()
>@@ -36,7 +36,7 @@
>  ADD_SUBDIRECTORY(strings)
>  ADD_SUBDIRECTORY(vio)
>  ADD_SUBDIRECTORY(mysys)
>-@@ -2235,12 +2239,15 @@ ENDIF()
>+@@ -2239,12 +2243,15 @@ ENDIF()
>    ADD_SUBDIRECTORY(unittest/mytap/t)
>  ENDIF()
>  
>@@ -54,7 +54,7 @@
>    ADD_SUBDIRECTORY(testclients)
>    ADD_SUBDIRECTORY(sql)
>  ENDIF()
>-@@ -2318,11 +2325,11 @@ ADD_SUBDIRECTORY(scripts)
>+@@ -2322,11 +2329,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()
>-@@ -2350,8 +2357,10 @@ ENDIF()
>+@@ -2354,8 +2361,10 @@ ENDIF()
>    INCLUDE(fastcov)
>  ENDIF()
>  
>diff --git a/databases/mysql84-server/files/patch-cmake_libutils.cmake b/databases/mysql84-server/files/patch-cmake_libutils.cmake
>new file mode 100644
>index 00000000000..a96fa8f41fb
>--- /dev/null
>+++ b/databases/mysql84-server/files/patch-cmake_libutils.cmake
>@@ -0,0 +1,22 @@
>+--- cmake/libutils.cmake.orig	2024-06-03 11:39:00 UTC
>++++ cmake/libutils.cmake
>+@@ -384,9 +384,6 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
>+     ELSE()
>+       SET(DESTINATION "${INSTALL_LIBDIR}")
>+     ENDIF()
>+-    IF(ARG_NAMELINK_SKIP)
>+-      SET(INSTALL_ARGS NAMELINK_SKIP)
>+-    ENDIF()
>+     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
>+       ${INSTALL_ARGS})
>+   ENDIF()
>+@@ -642,9 +639,6 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG)
>+       SET(COMP COMPONENT ${ARG_COMPONENT})
>+     ELSE()
>+       SET(COMP COMPONENT SharedLibraries)
>+-    ENDIF()
>+-    IF(ARG_NAMELINK_SKIP)
>+-      SET(INSTALL_ARGS NAMELINK_SKIP)
>+     ENDIF()
>+     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
>+       ${INSTALL_ARGS})
>diff --git a/databases/mysql84-server/files/patch-man_CMakeLists.txt b/databases/mysql84-server/files/patch-man_CMakeLists.txt
>index 89140e0259e..5131ef28428 100644
>--- a/databases/mysql84-server/files/patch-man_CMakeLists.txt
>+++ b/databases/mysql84-server/files/patch-man_CMakeLists.txt
>@@ -1,4 +1,4 @@
>---- man/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
>+--- man/CMakeLists.txt.orig	2024-06-03 11:39:00 UTC
> +++ man/CMakeLists.txt
> @@ -24,13 +24,6 @@ SET(MAN1
>  # Copy man pages
>@@ -52,7 +52,7 @@
>  
>  SET(MAN1_NDB
>    ndb_blob_tool.1
>-@@ -101,8 +103,14 @@ SET(MAN8_NDB
>+@@ -102,8 +104,14 @@ SET(MAN8_NDB
>    ndbmtd.8
>  )
>  
>diff --git a/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt
>deleted file mode 100644
>index 223346bbf72..00000000000
>--- a/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt
>+++ /dev/null
>@@ -1,24 +0,0 @@
>---- router/src/harness/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
>-+++ router/src/harness/src/CMakeLists.txt
>-@@ -241,7 +241,6 @@ ELSE()
>-   INSTALL(TARGETS harness-library
>-     LIBRARY
>-     DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
>--    NAMELINK_SKIP
>-     )
>- ENDIF()
>- 
>-@@ -273,7 +272,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
>--  NAMELINK_SKIP
>-   )
>- 
>- ## harness_tls
>-@@ -315,5 +313,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
>--  NAMELINK_SKIP
>-   )
>diff --git a/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt
>deleted file mode 100644
>index 8c7d705207f..00000000000
>--- a/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- router/src/http/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
>-+++ router/src/http/src/CMakeLists.txt
>-@@ -72,7 +72,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
>--  NAMELINK_SKIP
>-   )
>- 
>- ## split library code from the plugin to use them _passwd and tests
>-@@ -99,7 +98,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
>--  NAMELINK_SKIP
>-   )
>- TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC
>-   ${CMAKE_CURRENT_SOURCE_DIR}
>-@@ -152,7 +150,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
>--  NAMELINK_SKIP
>-   )
>- ## the rpath for the bundled openssl
>- ADD_INSTALL_RPATH_FOR_OPENSSL(http_auth_realm_lib)
>diff --git a/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt
>deleted file mode 100644
>index 33ad809e338..00000000000
>--- a/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- router/src/io/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
>-+++ router/src/io/src/CMakeLists.txt
>-@@ -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
>--  NAMELINK_SKIP
>-   )
>- 
>- GENERATE_EXPORT_HEADER(io_component
>diff --git a/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt b/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt
>deleted file mode 100644
>index 6be721ccac1..00000000000
>--- a/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- router/src/router/src/CMakeLists.txt.orig	2024-04-10 06:26:28 UTC
>-+++ router/src/router/src/CMakeLists.txt
>-@@ -156,7 +156,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
>--  NAMELINK_SKIP
>-   )
>- 
>- MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring
>diff --git a/databases/mysql84-server/pkg-plist b/databases/mysql84-server/pkg-plist
>index ccfd0220023..b1849b78fa3 100644
>--- a/databases/mysql84-server/pkg-plist
>+++ b/databases/mysql84-server/pkg-plist
>@@ -31,7 +31,11 @@ lib/mysql/libmysqlharness_tls.so
> lib/mysql/libmysqlharness_tls.so.1
> lib/mysql/libmysqlrouter.so
> lib/mysql/libmysqlrouter.so.1
>+lib/mysql/libmysqlrouter_cluster.so
>+lib/mysql/libmysqlrouter_cluster.so.1
>+lib/mysql/libmysqlrouter_connection_pool.so
> lib/mysql/libmysqlrouter_connection_pool.so.1
>+lib/mysql/libmysqlrouter_destination_status.so
> lib/mysql/libmysqlrouter_destination_status.so.1
> lib/mysql/libmysqlrouter_http.so
> lib/mysql/libmysqlrouter_http.so.1
>@@ -39,12 +43,22 @@ lib/mysql/libmysqlrouter_http_auth_backend.so
> lib/mysql/libmysqlrouter_http_auth_backend.so.1
> lib/mysql/libmysqlrouter_http_auth_realm.so
> lib/mysql/libmysqlrouter_http_auth_realm.so.1
>+lib/mysql/libmysqlrouter_http_server.so
>+lib/mysql/libmysqlrouter_http_server.so.1
> lib/mysql/libmysqlrouter_io_component.so
> lib/mysql/libmysqlrouter_io_component.so.1
>+lib/mysql/libmysqlrouter_metadata_cache.so
> lib/mysql/libmysqlrouter_metadata_cache.so.1
>+lib/mysql/libmysqlrouter_mysql.so
>+lib/mysql/libmysqlrouter_mysql.so.1
>+lib/mysql/libmysqlrouter_mysqlxmessages.so
> lib/mysql/libmysqlrouter_mysqlxmessages.so.1
>+lib/mysql/libmysqlrouter_routing.so
> lib/mysql/libmysqlrouter_routing.so.1
>+lib/mysql/libmysqlrouter_routing_connections.so
> lib/mysql/libmysqlrouter_routing_connections.so.1
>+lib/mysql/libmysqlrouter_utils.so
>+lib/mysql/libmysqlrouter_utils.so.1
> lib/mysql/libprotobuf-lite.so.24.4.0
> lib/mysql/mysqlrouter/connection_pool.so
> lib/mysql/mysqlrouter/destination_status.so
>@@ -249,7 +263,7 @@ libexec/mysqld
> %%DATADIR%%/ukrainian/errmsg.sys
> %%DATADIR%%/uninstall_rewriter.sql
> %%DATADIR%%router/docs/sample_mysqlrouter.conf
>-@dir %%ETCDIR%%/keyring
>+@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
> @dir lib/mysql/plugin/debug
>-@dir %%MY_SECDIR%%
>-@dir %%MY_TMPDIR%%
>+@dir(mysql,mysql,0750) %%MY_SECDIR%%
>+@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Actions: View | Diff

Attachments on bug 280456: 252295