ports/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
Thomas Zander f83159f188 Update to 5.7.12, fixing 31 partially critical vulnerabilities
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
2016-05-06 14:39:59 +00:00

64 lines
1.9 KiB
Text

--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
+++ scripts/CMakeLists.txt
@@ -43,6 +43,7 @@ ELSE()
MESSAGE(FATAL_ERROR "Cannot concatenate files")
ENDIF()
+IF(FALSE)
# Build mysql_fix_privilege_tables.c
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
)
+ENDIF()
# If we do not have performance schema compiled in then sys will not work,
# so only create an empty sys database with an auto-generated file,
@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER)
)
ENDIF()
+IF(FALSE)
IF(UNIX)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
@@ -150,6 +153,7 @@ IF(UNIX)
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
)
ENDIF()
+ENDIF()
IF(NOT WITHOUT_SERVER)
INSTALL(FILES
@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
SET(${var} "${${var}}-l${lib} " )
+ ELSEIF(lib STREQUAL "-pthread")
+ SET(${var} "${${var}}-pthread " )
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
@@ -430,19 +436,7 @@ ELSE()
# On Unix, most of the files end up in the bin directory
SET(mysql_config_COMPONENT COMPONENT Development)
- IF(WITH_SYSTEMD)
- SET(BIN_SCRIPTS
- mysql_config
- mysqldumpslow
- )
- ELSE()
- SET(BIN_SCRIPTS
- mysql_config
- mysqldumpslow
- mysqld_multi
- mysqld_safe
- )
- ENDIF()
+ SET(BIN_SCRIPTS mysql_config)
SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")