aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2023-12-05 21:39:27 +0200
committerJani Välimaa <wally@mageia.org>2023-12-05 21:39:27 +0200
commitce8ea0fd5850c613b918b161159c5ccd18a43d8d (patch)
treebb5e4294be5e6844a1430d5ef60b20722be4f5ab
parentd0a550a50f4691967960099d278f1203e666081d (diff)
downloadrpm-setup-ce8ea0fd5850c613b918b161159c5ccd18a43d8d.tar
rpm-setup-ce8ea0fd5850c613b918b161159c5ccd18a43d8d.tar.gz
rpm-setup-ce8ea0fd5850c613b918b161159c5ccd18a43d8d.tar.bz2
rpm-setup-ce8ea0fd5850c613b918b161159c5ccd18a43d8d.tar.xz
rpm-setup-ce8ea0fd5850c613b918b161159c5ccd18a43d8d.zip
macros: use -fstack-protector-strong instead of '-fstack-protector --param=ssp-buffer-size=4' in %_ssp_cflags
Recommended in https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html
-rw-r--r--NEWS1
-rw-r--r--macros.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 45bffe3..78a5c25 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
- rpmrc: add -mbranch-protection=standard to aarch64 default flags
- rpmrc: drop arches we don't really support
- rpmrc: drop arch_compat also available in /usr/lib/rpm/rpmrc
+- macros: use -fstack-protector-strong instead of '-fstack-protector --param=ssp-buffer-size=4' in %_ssp_cflags
- macros: use -Wl,-z,now with -Wl,-z,relro unless _disable_ld_now is defined
- mangle script shebangs
diff --git a/macros.in b/macros.in
index 18178c0..0ee6fb3 100644
--- a/macros.in
+++ b/macros.in
@@ -251,7 +251,7 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
# cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
%Werror_cflags -Wformat -Werror=format-security
-%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
+%_ssp_cflags -fstack-protector-strong %{?_serverbuild_flags: %_serverbuild_flags}
%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags}%{?_legacy_common_support: -fcommon}
%__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags}