mirror of
https://git.freebsd.org/ports.git
synced 2025-06-18 11:10:32 -04:00
017db20ddf
This update fixes several issues including CVEs. Bug-fixes: - Return better error messages for OpenSSL errors - Incorrect copying of an integer value by X Plugin caused an error relating to misaligned memory access Improvement: - Important Change: X Protocol now provides a connection pooling option Upstream notes: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-13 While here, fix the build with GCC-based architectures too (ported from fix on MySQL57) Sponsored by: The FreeBSD Foundation
29 lines
1.1 KiB
Text
29 lines
1.1 KiB
Text
--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
+++ libmysql/CMakeLists.txt
|
|
@@ -215,7 +215,7 @@ IF(WIN32)
|
|
ADD_SUBDIRECTORY(authentication_ldap)
|
|
|
|
# Merge several convenience libraries into one big mysqlclient
|
|
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
|
|
+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
|
|
TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
|
|
|
|
IF(MSVC)
|
|
@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED)
|
|
# and link them together into shared library.
|
|
MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
|
|
EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
|
|
- COMPONENT SharedLibraries)
|
|
+ COMPONENT SharedLibraries SKIP_INSTALL)
|
|
TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
|
|
|
|
+IF(FALSE)
|
|
IF(WIN32)
|
|
@@ -313,6 +314,7 @@ ENDIF()
|
|
# to initialize api_calls[] array in api_test.c
|
|
#
|
|
SET(CLIENT_API_FUNCTION_LIST "")
|
|
+ ENDIF()
|
|
FOREACH(api ${CLIENT_API_FUNCTIONS})
|
|
SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
|
|
ENDFOREACH()
|