diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2019-07-11 18:14:35 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2019-07-11 18:14:35 +0000 |
| commit | 335e464ef0ead1d02cf86739cb23a269ff9210bd (patch) | |
| tree | 2ab65ceb43ad8850752f08ae67c47a44eef1985e /databases/percona57-client | |
| parent | 7251b342ad129c99d7f77087b459ea1e405d3cce (diff) | |
| download | ports-335e464ef0ead1d02cf86739cb23a269ff9210bd.tar.gz ports-335e464ef0ead1d02cf86739cb23a269ff9210bd.zip | |
databases/percona57-{server,client}: upgrade 5.7.21-20 -> 5.7.26-29
- Fixes several CVEs, see
https://vuxml.FreeBSD.org/freebsd/d3d02d3a-2242-11e9-b95c-b499baebfeaf.html
for the list
PR: 236570
Submitted by: Igor Zabelin <igorz@yandex.ru>
Approved by: feld (maintainer timeout)
MFH: 2019Q3
Notes
Notes:
svn path=/head/; revision=506424
Diffstat (limited to 'databases/percona57-client')
| -rw-r--r-- | databases/percona57-client/files/patch-cmake_plugin.cmake | 46 | ||||
| -rw-r--r-- | databases/percona57-client/files/patch-mysys_mf__iocache2.c | 10 |
2 files changed, 33 insertions, 23 deletions
diff --git a/databases/percona57-client/files/patch-cmake_plugin.cmake b/databases/percona57-client/files/patch-cmake_plugin.cmake index a2905e6ca9d8..a52ef25c7b24 100644 --- a/databases/percona57-client/files/patch-cmake_plugin.cmake +++ b/databases/percona57-client/files/patch-cmake_plugin.cmake @@ -1,25 +1,25 @@ --- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC +++ cmake/plugin.cmake -@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) -+ IF(CMAKE_BUILD_TYPE MATCHES "Debug") -+ INSTALL_DEBUG_TARGET(${target} -+ DESTINATION ${INSTALL_PLUGINDIR}/debug -+ COMPONENT ${INSTALL_COMPONENT}) -+ # Add installed files to list for RPMs -+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ ENDIF() - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) +@@ -278,13 +278,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) diff --git a/databases/percona57-client/files/patch-mysys_mf__iocache2.c b/databases/percona57-client/files/patch-mysys_mf__iocache2.c new file mode 100644 index 000000000000..e418e454e939 --- /dev/null +++ b/databases/percona57-client/files/patch-mysys_mf__iocache2.c @@ -0,0 +1,10 @@ +--- mysys/mf_iocache2.c.orig 2019-02-18 09:11:31.000000000 +0300 ++++ mysys/mf_iocache2.c +@@ -24,6 +24,7 @@ + #include <m_string.h> + #include <stdarg.h> + #include <m_ctype.h> ++#include "mysql/psi/mysql_file.h" + + /* + Copy contents of an IO_CACHE to a file. |