Attachment #252295 for bug #280456

View | Details | Raw Unified | Return to bug 280456
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/databases/mysql84-server/Makefile (-3 / +2 lines)
1	PORTNAME?= mysql	1	PORTNAME?= mysql
2	PORTVERSION= 8.4.0	2	PORTVERSION= 8.4.2
3	PORTREVISION?= 0	3	PORTREVISION?= 0
4	CATEGORIES= databases	4	CATEGORIES= databases
5	MASTER_SITES= MYSQL/MySQL-8.4	5	MASTER_SITES= MYSQL/MySQL-8.4
Lines 97-104 SUB_LIST= MY_DBDIR=${MY_DBDIR} \ Link Here
97		97
98	PLIST_SUB= MY_DBDIR=${MY_DBDIR} \	98	PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
99	MY_SECDIR=${MY_SECDIR} \	99	MY_SECDIR=${MY_SECDIR} \
100	MY_TMPDIR=${MY_TMPDIR} \	100	MY_TMPDIR=${MY_TMPDIR}
101	MYSQL80_LIBVER=${MYSQL80_LIBVER}
102		101
103	# MySQL-Server part	102	# MySQL-Server part
104	.if !defined(CLIENT_ONLY)	103	.if !defined(CLIENT_ONLY)

Lines 1-3 Link Here

(-)b/databases/mysql84-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1715251111	1	TIMESTAMP = 1721979278
2	SHA256 (mysql-8.4.0.tar.gz) = 47a5433fcdd639db836b99e1b5459c2b813cbdad23ff2b5dd4ad27f792ba918e	2	SHA256 (mysql-8.4.2.tar.gz) = 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814
3	SIZE (mysql-8.4.0.tar.gz) = 413221068	3	SIZE (mysql-8.4.2.tar.gz) = 425791134




--- CMakeLists.txt.orig	2024-06-03 11:39:00 UTC
+++ CMakeLists.txt
@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP)
 ENDIF()
 
 IF(WITH_AUTHENTICATION_LDAP)

     # 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()
   ENDIF()
 ENDIF()
 

 # Add system/bundled editline.
 MYSQL_CHECK_EDITLINE()
 SET(EDITLINE_WARN_GIVEN)
@@ -1906,6 +1907,7 @@ ENDIF()
     "You can use -DWITH_EDITLINE=bundled instead."
     )
 ENDIF()

 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
@@ -2239,12 +2243,15 @@ ENDIF()
   ADD_SUBDIRECTORY(unittest/mytap/t)
 ENDIF()
 

   ADD_SUBDIRECTORY(testclients)
   ADD_SUBDIRECTORY(sql)
 ENDIF()
@@ -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)

   IF(WITH_INTERNAL)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
@@ -2354,8 +2361,10 @@ ENDIF()
   INCLUDE(fastcov)
 ENDIF()
 




--- 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})

Lines 1-4 Link Here

(-)b/databases/mysql84-server/files/patch-man_CMakeLists.txt (-2 / +2 lines)
1	--- man/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC	1	--- man/CMakeLists.txt.orig 2024-06-03 11:39:00 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -24,13 +24,6 @@ SET(MAN1	3	@@ -24,13 +24,6 @@ SET(MAN1
4	# Copy man pages	4	# Copy man pages
Lines 52-58 Link Here
52		52
53	SET(MAN1_NDB	53	SET(MAN1_NDB
54	ndb_blob_tool.1	54	ndb_blob_tool.1
55	@@ -101,8 +103,14 @@ SET(MAN8_NDB	55	@@ -102,8 +104,14 @@ SET(MAN8_NDB
56	ndbmtd.8	56	ndbmtd.8
57	)	57	)
58		58




--- 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
   )




--- 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)

Removed Link Here

(-)a/databases/mysql84-server/files/patch-router_src_io_src_CMakeLists.txt (-10 lines)
1	--- router/src/io/src/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC
2	+++ router/src/io/src/CMakeLists.txt
3	@@ -48,7 +48,6 @@ INSTALL(TARGETS io_component
4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
5	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
6	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
7	- NAMELINK_SKIP
8	)
9
10	GENERATE_EXPORT_HEADER(io_component

Removed Link Here

(-)a/databases/mysql84-server/files/patch-router_src_router_src_CMakeLists.txt (-10 lines)
1	--- router/src/router/src/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC
2	+++ router/src/router/src/CMakeLists.txt
3	@@ -156,7 +156,6 @@ INSTALL(TARGETS router_lib
4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
5	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
6	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
7	- NAMELINK_SKIP
8	)
9
10	MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring

Lines 31-37 lib/mysql/libmysqlharness_tls.so Link Here

(-)b/databases/mysql84-server/pkg-plist (-3 / +17 lines)
31	lib/mysql/libmysqlharness_tls.so.1	31	lib/mysql/libmysqlharness_tls.so.1
32	lib/mysql/libmysqlrouter.so	32	lib/mysql/libmysqlrouter.so
33	lib/mysql/libmysqlrouter.so.1	33	lib/mysql/libmysqlrouter.so.1
		34	lib/mysql/libmysqlrouter_cluster.so
		35	lib/mysql/libmysqlrouter_cluster.so.1
		36	lib/mysql/libmysqlrouter_connection_pool.so
34	lib/mysql/libmysqlrouter_connection_pool.so.1	37	lib/mysql/libmysqlrouter_connection_pool.so.1
		38	lib/mysql/libmysqlrouter_destination_status.so
35	lib/mysql/libmysqlrouter_destination_status.so.1	39	lib/mysql/libmysqlrouter_destination_status.so.1
36	lib/mysql/libmysqlrouter_http.so	40	lib/mysql/libmysqlrouter_http.so
37	lib/mysql/libmysqlrouter_http.so.1	41	lib/mysql/libmysqlrouter_http.so.1
Lines 39-50 lib/mysql/libmysqlrouter_http_auth_backend.so Link Here
39	lib/mysql/libmysqlrouter_http_auth_backend.so.1	43	lib/mysql/libmysqlrouter_http_auth_backend.so.1
40	lib/mysql/libmysqlrouter_http_auth_realm.so	44	lib/mysql/libmysqlrouter_http_auth_realm.so
41	lib/mysql/libmysqlrouter_http_auth_realm.so.1	45	lib/mysql/libmysqlrouter_http_auth_realm.so.1
		46	lib/mysql/libmysqlrouter_http_server.so
		47	lib/mysql/libmysqlrouter_http_server.so.1
42	lib/mysql/libmysqlrouter_io_component.so	48	lib/mysql/libmysqlrouter_io_component.so
43	lib/mysql/libmysqlrouter_io_component.so.1	49	lib/mysql/libmysqlrouter_io_component.so.1
		50	lib/mysql/libmysqlrouter_metadata_cache.so
44	lib/mysql/libmysqlrouter_metadata_cache.so.1	51	lib/mysql/libmysqlrouter_metadata_cache.so.1
		52	lib/mysql/libmysqlrouter_mysql.so
		53	lib/mysql/libmysqlrouter_mysql.so.1
		54	lib/mysql/libmysqlrouter_mysqlxmessages.so
45	lib/mysql/libmysqlrouter_mysqlxmessages.so.1	55	lib/mysql/libmysqlrouter_mysqlxmessages.so.1
		56	lib/mysql/libmysqlrouter_routing.so
46	lib/mysql/libmysqlrouter_routing.so.1	57	lib/mysql/libmysqlrouter_routing.so.1
		58	lib/mysql/libmysqlrouter_routing_connections.so
47	lib/mysql/libmysqlrouter_routing_connections.so.1	59	lib/mysql/libmysqlrouter_routing_connections.so.1
		60	lib/mysql/libmysqlrouter_utils.so
		61	lib/mysql/libmysqlrouter_utils.so.1
48	lib/mysql/libprotobuf-lite.so.24.4.0	62	lib/mysql/libprotobuf-lite.so.24.4.0
49	lib/mysql/mysqlrouter/connection_pool.so	63	lib/mysql/mysqlrouter/connection_pool.so
50	lib/mysql/mysqlrouter/destination_status.so	64	lib/mysql/mysqlrouter/destination_status.so
Lines 249-255 libexec/mysqld Link Here
249	%%DATADIR%%/ukrainian/errmsg.sys	263	%%DATADIR%%/ukrainian/errmsg.sys
250	%%DATADIR%%/uninstall_rewriter.sql	264	%%DATADIR%%/uninstall_rewriter.sql
251	%%DATADIR%%router/docs/sample_mysqlrouter.conf	265	%%DATADIR%%router/docs/sample_mysqlrouter.conf
252	@dir %%ETCDIR%%/keyring	266	@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
253	@dir lib/mysql/plugin/debug	267	@dir lib/mysql/plugin/debug
254	@dir %%MY_SECDIR%%	268	@dir(mysql,mysql,0750) %%MY_SECDIR%%
255	@dir %%MY_TMPDIR%%	269	@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Return to bug 280456

Lines 1-6 Link Here

(-)b/databases/mysql84-server/files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2024-04-10 06:26:28 UTC	1	--- CMakeLists.txt.orig 2024-06-03 11:39:00 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1836,7 +1836,7 @@ IF(WITH_AUTHENTICATION_LDAP)	3	@@ -1845,7 +1845,7 @@ IF(WITH_AUTHENTICATION_LDAP)
4	ENDIF()	4	ENDIF()
5		5
6	IF(WITH_AUTHENTICATION_LDAP)	6	IF(WITH_AUTHENTICATION_LDAP)
Lines 9-15 Link Here
9	# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.	9	# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
10	IF(WITH_LDAP STREQUAL "system" OR	10	IF(WITH_LDAP STREQUAL "system" OR
11	WITH_SASL STREQUAL "system" OR	11	WITH_SASL STREQUAL "system" OR
12	@@ -1887,6 +1887,7 @@ ENDIF()	12	@@ -1896,6 +1896,7 @@ ENDIF()
13	ENDIF()	13	ENDIF()
14	ENDIF()	14	ENDIF()
15		15
Lines 17-23 Link Here
17	# Add system/bundled editline.	17	# Add system/bundled editline.
18	MYSQL_CHECK_EDITLINE()	18	MYSQL_CHECK_EDITLINE()
19	SET(EDITLINE_WARN_GIVEN)	19	SET(EDITLINE_WARN_GIVEN)
20	@@ -1897,6 +1898,7 @@ ENDIF()	20	@@ -1906,6 +1907,7 @@ ENDIF()
21	"You can use -DWITH_EDITLINE=bundled instead."	21	"You can use -DWITH_EDITLINE=bundled instead."
22	)	22	)
23	ENDIF()	23	ENDIF()
Lines 36-42 Link Here
36	ADD_SUBDIRECTORY(strings)	36	ADD_SUBDIRECTORY(strings)
37	ADD_SUBDIRECTORY(vio)	37	ADD_SUBDIRECTORY(vio)
38	ADD_SUBDIRECTORY(mysys)	38	ADD_SUBDIRECTORY(mysys)
39	@@ -2235,12 +2239,15 @@ ENDIF()	39	@@ -2239,12 +2243,15 @@ ENDIF()
40	ADD_SUBDIRECTORY(unittest/mytap/t)	40	ADD_SUBDIRECTORY(unittest/mytap/t)
41	ENDIF()	41	ENDIF()
42		42
Lines 54-60 Link Here
54	ADD_SUBDIRECTORY(testclients)	54	ADD_SUBDIRECTORY(testclients)
55	ADD_SUBDIRECTORY(sql)	55	ADD_SUBDIRECTORY(sql)
56	ENDIF()	56	ENDIF()
57	@@ -2318,11 +2325,11 @@ ADD_SUBDIRECTORY(scripts)	57	@@ -2322,11 +2329,11 @@ ADD_SUBDIRECTORY(scripts)
58	# scripts/mysql_config depends on client and server targets loaded above.	58	# scripts/mysql_config depends on client and server targets loaded above.
59	# It is referenced by some of the directories below, so we insert it here.	59	# It is referenced by some of the directories below, so we insert it here.
60	ADD_SUBDIRECTORY(scripts)	60	ADD_SUBDIRECTORY(scripts)
Lines 67-73 Link Here
67	IF(WITH_INTERNAL)	67	IF(WITH_INTERNAL)
68	ADD_SUBDIRECTORY(internal)	68	ADD_SUBDIRECTORY(internal)
69	ENDIF()	69	ENDIF()
70	@@ -2350,8 +2357,10 @@ ENDIF()	70	@@ -2354,8 +2361,10 @@ ENDIF()
71	INCLUDE(fastcov)	71	INCLUDE(fastcov)
72	ENDIF()	72	ENDIF()
73		73

Added Link Here

(-)b/databases/mysql84-server/files/patch-cmake_libutils.cmake (+22 lines)
1	--- cmake/libutils.cmake.orig 2024-06-03 11:39:00 UTC
2	+++ cmake/libutils.cmake
3	@@ -384,9 +384,6 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
4	ELSE()
5	SET(DESTINATION "${INSTALL_LIBDIR}")
6	ENDIF()
7	- IF(ARG_NAMELINK_SKIP)
8	- SET(INSTALL_ARGS NAMELINK_SKIP)
9	- ENDIF()
10	MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
11	${INSTALL_ARGS})
12	ENDIF()
13	@@ -642,9 +639,6 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG)
14	SET(COMP COMPONENT ${ARG_COMPONENT})
15	ELSE()
16	SET(COMP COMPONENT SharedLibraries)
17	- ENDIF()
18	- IF(ARG_NAMELINK_SKIP)
19	- SET(INSTALL_ARGS NAMELINK_SKIP)
20	ENDIF()
21	MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
22	${INSTALL_ARGS})

Removed Link Here

(-)a/databases/mysql84-server/files/patch-router_src_harness_src_CMakeLists.txt (-24 lines)
1	--- router/src/harness/src/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC
2	+++ router/src/harness/src/CMakeLists.txt
3	@@ -241,7 +241,6 @@ ELSE()
4	INSTALL(TARGETS harness-library
5	LIBRARY
6	DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
7	- NAMELINK_SKIP
8	)
9	ENDIF()
10
11	@@ -273,7 +272,6 @@ INSTALL(TARGETS harness_stdx
12	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
13	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
14	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
15	- NAMELINK_SKIP
16	)
17
18	## harness_tls
19	@@ -315,5 +313,4 @@ INSTALL(TARGETS harness_tls
20	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
21	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
22	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
23	- NAMELINK_SKIP
24	)

Removed Link Here

(-)a/databases/mysql84-server/files/patch-router_src_http_src_CMakeLists.txt (-26 lines)
1	--- router/src/http/src/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC
2	+++ router/src/http/src/CMakeLists.txt
3	@@ -72,7 +72,6 @@ INSTALL(TARGETS http_common
4	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
5	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
6	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
7	- NAMELINK_SKIP
8	)
9
10	## split library code from the plugin to use them _passwd and tests
11	@@ -99,7 +98,6 @@ INSTALL(TARGETS http_auth_backend_lib
12	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
13	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
14	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
15	- NAMELINK_SKIP
16	)
17	TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC
18	${CMAKE_CURRENT_SOURCE_DIR}
19	@@ -152,7 +150,6 @@ INSTALL(TARGETS http_auth_realm_lib
20	RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
21	ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
22	LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
23	- NAMELINK_SKIP
24	)
25	## the rpath for the bundled openssl
26	ADD_INSTALL_RPATH_FOR_OPENSSL(http_auth_realm_lib)