From: Boris Ranto <branto@redhat.com>
Date: Thu, 4 Oct 2018 11:05:14 +0000 (+0200)
Subject: rpm: Use hardened LDFLAGS
X-Git-Tag: v12.2.11~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a6530d5606dc289c56e2741df87e6de23812294;p=ceph.git

rpm: Use hardened LDFLAGS

Currently, we do pass the hardened CFLAGS and CPPFLAGS when building the
code. However, we do not pass the hardened flags to the linker. This
means that the binaries are linked without the options like -Wl,-z,now.
As a result, we do not fully harden the binaries that we build.

This commit fixes this by passing the RPM_LD_FLAGS to the linker so the
builds are linked with the properly hardened flags.

Fixes: http://tracker.ceph.com/issues/36316

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit ea6d7d2c9878b08528d120aa35e2fd9e18b3ba0f)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index d708aea337a..fa34ade2dd1 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -806,6 +806,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 export CPPFLAGS="$java_inc"
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_LD_FLAGS"
 
 env | sort