diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2019-09-19 12:33:40 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2019-09-19 12:33:40 +0000 |
| commit | aefc391f384c165d1a830113b7c9dd4e8d727ee0 (patch) | |
| tree | 386896ec89bb25cd747765a4425a31bfa1c639b6 /databases/mysql80-server/files/patch-support-files_CMakeLists.txt | |
| parent | net-im/telegram-desktop: put better error explanation (diff) | |
databases/mysql80-{client, server}: Update to latest release 8.0.17
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
Diffstat (limited to 'databases/mysql80-server/files/patch-support-files_CMakeLists.txt')
| -rw-r--r-- | databases/mysql80-server/files/patch-support-files_CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/databases/mysql80-server/files/patch-support-files_CMakeLists.txt b/databases/mysql80-server/files/patch-support-files_CMakeLists.txt index 1d1999212ed5..f9a908f7364a 100644 --- a/databases/mysql80-server/files/patch-support-files_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-support-files_CMakeLists.txt @@ -1,12 +1,13 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- support-files/CMakeLists.txt.orig 2019-06-25 10:23:30 UTC +++ support-files/CMakeLists.txt -@@ -69,7 +69,9 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() +@@ -24,8 +24,10 @@ IF(NOT UNIX) + RETURN() + ENDIF() +IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) + INSTALL(FILES mysql.m4 + DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +ENDIF() - - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) + + SET(localstatedir "${MYSQL_DATADIR}") + |