diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-04-29 18:54:07 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-04-29 18:54:07 +0000 |
| commit | c37876b36c90210e93bb2912ff7af802f97af554 (patch) | |
| tree | 424950b212020ff66a4bb33740c87ed8ba3caa58 /databases/mariadb55-server/files/patch-CMakeLists.txt | |
| parent | Do not separate ${DESTDIR}${PREFIX} with a slash: this is redundant when (diff) | |
databases/mariadb55-server: Update to 5.5.55
- Security and bugfix update to 5.5.55
- Fix up patches
- Remove CVE-2017-3302 patch (now included)
- Add upstream patch for WITHOUT_SERVER issue
MFH: 2017Q2
Security: d9e01c35-2531-11e7-b291-b499baebfeaf
Security: CVE-2017-3308
Security: CVE-2017-3309
Security: CVE-2017-3313
Security: CVE-2017-3453
Security: CVE-2017-3456
Security: CVE-2017-3464
Notes
Notes:
svn path=/head/; revision=439769
Diffstat (limited to 'databases/mariadb55-server/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mariadb55-server/files/patch-CMakeLists.txt | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/databases/mariadb55-server/files/patch-CMakeLists.txt b/databases/mariadb55-server/files/patch-CMakeLists.txt index 90a15c8f3469..45eb8c736289 100644 --- a/databases/mariadb55-server/files/patch-CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-CMakeLists.txt @@ -1,45 +1,46 @@ ---- CMakeLists.txt.orig 2014-06-13 13:53:43.304277057 +0300 -+++ CMakeLists.txt 2014-06-13 13:57:07.790256621 +0300 -@@ -407,18 +407,12 @@ +--- CMakeLists.txt.orig 2017-04-11 20:03:13 UTC ++++ CMakeLists.txt +@@ -397,22 +397,22 @@ ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ++# ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) ++# ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(sql-bench) -- ++# ADD_SUBDIRECTORY(sql-bench) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -437,7 +431,6 @@ - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) +- ADD_SUBDIRECTORY(packaging/rpm-oel) ++# ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -470,6 +463,7 @@ + IF(UNIX) +@@ -460,14 +460,14 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -+IF(FALSE) - INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) - INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -477,6 +471,7 @@ +-INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) ++#INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) + + # MDEV-6526 these files are not installed anymore + #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC + # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) + IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) +- INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ++# INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() -+ENDIF() INCLUDE(CPack) - |