!40 add Stack protection

From: @jvmboy
Reviewed-by: @kuenking111
Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot 2021-12-06 12:21:46 +00:00 committed by Gitee
commit 569d17623e

View File

@ -171,7 +171,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 12 %global buildver 12
%global rpmrelease 0 %global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk %if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -1256,8 +1256,8 @@ export CFLAGS="$CFLAGS -mieee"
# We use ourcppflags because the OpenJDK build seems to # We use ourcppflags because the OpenJDK build seems to
# pass EXTRA_CFLAGS to the HotSpot C++ compiler... # pass EXTRA_CFLAGS to the HotSpot C++ compiler...
# Explicitly set the C++ standard as the default has changed on GCC >= 6 # Explicitly set the C++ standard as the default has changed on GCC >= 6
EXTRA_CFLAGS="%ourcppflags" EXTRA_CFLAGS="%ourcppflags -fstack-protector-all"
EXTRA_CPP_FLAGS="%ourcppflags" EXTRA_CPP_FLAGS="%ourcppflags -fstack-protector-all"
%ifarch %{power64} ppc %ifarch %{power64} ppc
# fix rpmlint warnings # fix rpmlint warnings
@ -1732,6 +1732,9 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Mon Dec 6 2021 noah <hedongbo@huawei.com> - 1:17.0.1.12-1-rolling
- add Stack protection
* Fri Nov 12 2021 noah <hedongbo@huawei.com> - 1:17.0.1.12-0-rolling * Fri Nov 12 2021 noah <hedongbo@huawei.com> - 1:17.0.1.12-0-rolling
- Update to jdk-17.0.1+12 - Update to jdk-17.0.1+12