From 8153763b1f65e18c50b575fa6ab3b9911f423733 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 4 Jul 2013 10:25:50 +0300 Subject: [PATCH] - switch from -fstack-protector to -fstack-protector-strong (#978763) --- redhat-rpm-config-9.1.0-stackprotector-strong.patch | 12 ++++++++++++ redhat-rpm-config.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 redhat-rpm-config-9.1.0-stackprotector-strong.patch diff --git a/redhat-rpm-config-9.1.0-stackprotector-strong.patch b/redhat-rpm-config-9.1.0-stackprotector-strong.patch new file mode 100644 index 0000000..0e1820a --- /dev/null +++ b/redhat-rpm-config-9.1.0-stackprotector-strong.patch @@ -0,0 +1,12 @@ +diff -up redhat-rpm-config-9.1.0/macros.stackprotector-strong redhat-rpm-config-9.1.0/macros +--- redhat-rpm-config-9.1.0/macros.stackprotector-strong 2013-07-04 10:21:30.078245504 +0300 ++++ redhat-rpm-config-9.1.0/macros 2013-07-04 10:21:44.509357128 +0300 +@@ -178,7 +178,7 @@ package or when debugging this package.\ + %_hardened_cflags %{?_hardened_build:%{_hardening_cflags}} + %_hardened_ldflags %{?_hardened_build:%{_hardening_ldflags}} + +-%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags} ++%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches %{_hardened_cflags} + %__global_ldflags -Wl,-z,relro %{_hardened_ldflags} + + # Use these macros to differentiate between RH and other KMP implementation(s). diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 2129b1b..af45423 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 46%{?dist} +Release: 47%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -56,6 +56,8 @@ Patch20: redhat-rpm-config-9.1.0-aarch64.patch Patch21: redhat-rpm-config-9.1.0-fcflags.patch # https://bugzilla.redhat.com/show_bug.cgi?id=669638 Patch22: redhat-rpm-config-9.1.0-ncpus-max.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=978763 +Patch23: redhat-rpm-config-9.1.0-stackprotector-strong.patch BuildArch: noarch Requires: coreutils Requires: perl-srpm-macros @@ -92,6 +94,7 @@ Red Hat specific rpm configuration files. %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %build @@ -113,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Thu Jul 04 2013 Panu Matilainen - 9.1.0-47 +- switch from -fstack-protector to -fstack-protector-strong (#978763) + * Thu Jun 27 2013 Panu Matilainen - - 9.1.0-46 - make cpu limit for building configurable through _smp_ncpus_max macro