mirror of
https://git.freebsd.org/ports.git
synced 2025-07-16 16:59:17 -04:00
f83159f188
List of vulnerabilities is documented on: http://vuxml.freebsd.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html CVE IDs see below. PR: 206998 Submitted by: mokhi64@gmail.com (maintainer) Reviewed by: rootservice@gmail.com Approved by: mokhi64@gmail.com (maintainer) MFH: 2016Q2 Security: CVE-2016-0705 CVE-2016-0639 CVE-2015-3194 CVE-2016-0640 CVE-2016-0641 CVE-2016-3461 CVE-2016-2047 CVE-2016-0642 CVE-2016-0643 CVE-2016-0644 CVE-2016-0646 CVE-2016-0647 CVE-2016-0648 CVE-2016-0649 CVE-2016-0650 CVE-2016-0652 CVE-2016-0653 CVE-2016-0654 CVE-2016-0655 CVE-2016-0656 CVE-2016-0657 CVE-2016-0658 CVE-2016-0651 CVE-2016-0659 CVE-2016-0661 CVE-2016-0662 CVE-2016-0663 CVE-2016-0665 CVE-2016-0666 CVE-2016-0667 CVE-2016-0668
78 lines
2.4 KiB
Text
78 lines
2.4 KiB
Text
--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
|
|
|
|
## Subdirectory with common client code.
|
|
ADD_SUBDIRECTORY(base)
|
|
-## Subdirectory for mysqlpump code.
|
|
-ADD_SUBDIRECTORY(dump)
|
|
|
|
## We will need libeay32.dll and ssleay32.dll when running client executables.
|
|
COPY_OPENSSL_DLLS(copy_openssl_client)
|
|
@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
|
|
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
|
|
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
|
|
TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
|
|
ENDIF(UNIX)
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade
|
|
@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
|
|
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
|
|
|
|
@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
ADD_COMPILE_FLAGS(
|
|
mysqlbinlog.cc
|
|
@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
|
|
ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
|
|
ENDIF()
|
|
|
|
+IF(FALSE)
|
|
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)
|
|
SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
|
|
+ENDIF()
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|
|
@@ -123,11 +129,6 @@ ENDIF(WIN32)
|
|
|
|
SET_TARGET_PROPERTIES (
|
|
mysql_plugin
|
|
- mysqlcheck
|
|
- mysqldump
|
|
- mysqlimport
|
|
- mysqlshow
|
|
- mysqlslap
|
|
PROPERTIES HAS_CXX TRUE)
|
|
|
|
ADD_DEFINITIONS(-DHAVE_DLOPEN)
|