!3 add stack protect

Merge pull request !3 from zhangtao2020/zt_2
This commit is contained in:
openeuler-ci-bot 2020-03-18 14:16:18 +08:00 committed by Gitee
commit 752f6079bb
2 changed files with 24 additions and 1 deletions

View File

@ -0,0 +1,20 @@
diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
index fecf2a2..f3e012f 100644
--- a/cmake/build_configurations/compiler_options.cmake
+++ b/cmake/build_configurations/compiler_options.cmake
@@ -43,6 +43,7 @@ IF(UNIX)
# Default GCC flags
IF(CMAKE_COMPILER_IS_GNUCC)
SET(COMMON_C_FLAGS "-fno-omit-frame-pointer")
+ SET(COMMON_C_FLAGS "-fstack-protector-strong")
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
@@ -57,6 +58,7 @@ IF(UNIX)
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(COMMON_CXX_FLAGS "-std=c++14 -fno-omit-frame-pointer")
+ SET(COMMON_CXX_FLAGS "-fstack-protector-strong")
# Disable inline optimizations for valgrind testing to avoid false positives
IF(WITH_VALGRIND)
STRING_PREPEND(COMMON_CXX_FLAGS "-fno-inline ")

View File

@ -6,12 +6,13 @@
Name: mysql Name: mysql
Version: 8.0.17 Version: 8.0.17
Release: 2 Release: 3
License: GPLv2 License: GPLv2
Summary: The world's most popular open source database Summary: The world's most popular open source database
URL: http://www.mysql.com/ URL: http://www.mysql.com/
Source0: https://cdn.mysql.com/archives/%{name}-8.0/%{name}-boost-%{version}.tar.gz Source0: https://cdn.mysql.com/archives/%{name}-8.0/%{name}-boost-%{version}.tar.gz
Patch0000: 0000-mysql-add-fstack-protector-strong.patch
BuildRequires: cmake openssl-devel ncurses-devel libtirpc-devel rpcgen BuildRequires: cmake openssl-devel ncurses-devel libtirpc-devel rpcgen
Requires: libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl Requires: libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl
@ -79,5 +80,7 @@ userdel -r %{name} &>/dev/null
%exclude /usr/lib/debug %exclude /usr/lib/debug
%changelog %changelog
* Wed Mar 1 2020 zhangtao<zhangtao221@huawei.com> 8.0.17-3
- add fstack-protector-strong
* Fri Feb 28 2020 catastrowings <jianghuhao1994@163.com> 8.0.17-2 * Fri Feb 28 2020 catastrowings <jianghuhao1994@163.com> 8.0.17-2
- openEuler package init. - openEuler package init.