forked from pool/mariadb
283f67041a
- Update to 10.6.4 * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-1064-release-notes https://mariadb.com/kb/en/library/mariadb-1064-changelog https://mariadb.com/kb/en/library/mariadb-1063-release-notes https://mariadb.com/kb/en/library/mariadb-1063-changelog https://mariadb.com/kb/en/library/mariadb-1062-release-notes https://mariadb.com/kb/en/library/mariadb-1062-changelog https://mariadb.com/kb/en/library/mariadb-1061-release-notes https://mariadb.com/kb/en/library/mariadb-1061-changelog https://mariadb.com/kb/en/library/mariadb-1060-release-notes https://mariadb.com/kb/en/library/mariadb-1060-changelog * fixes for the following security vulnerabilities: 10.6.4: CVE-2021-2372 CVE-2021-2389 - Removed support to tokudb as it has been removed from upstream - Refresh mariadb-10.2.4-fortify-and-O.patch - Add manpages to dev package - Add new systemd socket from upstream OBS-URL: https://build.opensuse.org/request/show/917536 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=276
20 lines
720 B
Diff
20 lines
720 B
Diff
PATCH-P0-FIX-HACK: Not enforcing specific flags
|
|
|
|
Useing some CFLAGS from distribution and some enforced can and leads to the
|
|
conflicts like FORTIFY and -O0. Removing hardcoded options.
|
|
|
|
Maintainer: Michal Hrusecky <mhrusecky@suse.cz>
|
|
|
|
Index: CMakeLists.txt
|
|
===================================================================
|
|
--- CMakeLists.txt.orig
|
|
+++ CMakeLists.txt
|
|
@@ -242,7 +242,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN A
|
|
MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
|
|
MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")
|
|
MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")
|
|
- MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
|
|
ENDIF()
|
|
|
|
INCLUDE(wsrep)
|