forked from pool/mariadb
Antonio Teixeira
e2a9ec5e59
We had the issue where our custom [client] section to skip TLS verification on Unix sockets as not considered, causing the upgrade to fail. OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=323
20 lines
781 B
Diff
20 lines
781 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
|
|
@@ -263,7 +263,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()
|
|
|
|
OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_RETURN()/DBUG_PRINT()" ON)
|