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-client/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-client/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mariadb55-client/files/patch-CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt index c290e0ed6ecc..ded5ff508152 100644 --- a/databases/mariadb55-client/files/patch-CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200 -+++ CMakeLists.txt 2014-10-17 21:36:43.000000000 +0200 -@@ -411,28 +411,8 @@ +--- CMakeLists.txt.orig 2017-04-11 22:03:13.000000000 +0200 ++++ CMakeLists.txt 2017-04-18 10:11:38.582817000 +0200 +@@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(scripts) @@ -29,7 +29,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -@@ -444,7 +424,6 @@ +@@ -426,7 +406,6 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -37,15 +37,15 @@ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -477,6 +456,7 @@ +@@ -460,6 +439,7 @@ 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(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -487,6 +467,7 @@ + # MDEV-6526 these files are not installed anymore +@@ -469,6 +449,7 @@ INSTALL_DOCUMENTATION(README COPYING EXC IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() |