789b0094ed
Build dependecies Bison and Libarchive added, others corrected
Disabling Mroonga engine for i686 architecture, as it is not supported by MariaDB
Removed patches: (fixed by upstream)
Patch5: %{pkgnamepatch}-file-contents.patch
Patch14: %{pkgnamepatch}-example-config-files.patch
Patch31: %{pkgnamepatch}-string-overflow.patch
Patch32: %{pkgnamepatch}-basedir.patch
Patch41: %{pkgnamepatch}-galera-new-cluster-help.patch
Skipped tests list updated
Bigger READMEs update (made by upstream)
Resolves: rhbz#1414387
CVE-2017-3313
Resolves partly: rhbz#1443408
CVE-2017-3308 CVE-2017-3309 CVE-2017-3453 CVE-2017-3456 CVE-2017-3464
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
--- mariadb-10.1.11.orig/scripts/CMakeLists.txt 2016-01-28 13:12:51.000000000 +0100
|
|
+++ mariadb-10.1.11/scripts/CMakeLists.txt 2016-02-03 12:46:26.306109293 +0100
|
|
@@ -320,6 +320,35 @@ ELSE()
|
|
COMPONENT ${${file}_COMPONENT}
|
|
)
|
|
ENDFOREACH()
|
|
+
|
|
+ # files for systemd
|
|
+ SET(SYSTEMD_SCRIPTS
|
|
+ mysql.tmpfiles.d
|
|
+ mysql.service
|
|
+ mysql@.service
|
|
+ mysql-prepare-db-dir
|
|
+ mysql-wait-ready
|
|
+ mysql-wait-stop
|
|
+ mysql-check-socket
|
|
+ mysql-check-upgrade
|
|
+ mysql-scripts-common
|
|
+ mysql_config_multilib
|
|
+ clustercheck
|
|
+ mysql.init
|
|
+ my.cnf
|
|
+ )
|
|
+ FOREACH(file ${SYSTEMD_SCRIPTS})
|
|
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
|
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
|
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in)
|
|
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.in
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
|
+ ELSE()
|
|
+ MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file}.in in "
|
|
+ "${CMAKE_CURRENT_SOURCE_DIR}" )
|
|
+ ENDIF()
|
|
+ ENDFOREACH()
|
|
ENDIF()
|
|
|
|
# Install libgcc as mylibgcc.a
|
|
|