mirror of
https://git.freebsd.org/ports.git
synced 2025-05-22 03:45:17 -04:00
aefc391f38
This update includes security fixes on issues that are mentioned on upstream critical patch report. Further info: https://www.oracle.com/technetwork/security-advisory/cpujul2019-5072835.html#AppendixMSQL Delete upstream-merged patches Change other local-patches according upstream changes PR: 239272 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: EuroBSDCon 2019 DevSummit
39 lines
1.3 KiB
Text
39 lines
1.3 KiB
Text
--- client/CMakeLists.txt.orig 2019-04-13 13:46:31.000000000 +0200
|
|
+++ client/CMakeLists.txt 2019-04-30 00:27:10.627236000 +0200
|
|
@@ -35,10 +35,12 @@
|
|
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
|
|
ENDIF(UNIX)
|
|
|
|
+IF(FALSE)
|
|
IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
SET(MYSQLTEST_SRC
|
|
mysqltest/error_names.cc
|
|
@@ -49,10 +51,12 @@
|
|
mysqltest/utils.cc
|
|
)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)
|
|
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
|
|
TARGET_LINK_LIBRARIES(mysqltest mysqlclient)
|
|
ADD_DEPENDENCIES(mysqltest GenError GenClientError)
|
|
+ENDIF()
|
|
|
|
ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
|
|
@@ -108,8 +112,10 @@
|
|
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
|