From 9a8ced65aadea3d6d26cc15d775616c5afc218b5 Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jvcelak@redhat.com>
Date: Tue, 25 Oct 2011 18:17:26 +0200
Subject: [PATCH] hardened build: remove LDFLAGS, enable macro

---
 openldap.spec | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/openldap.spec b/openldap.spec
index 66e50f8..49c143d 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -1,7 +1,4 @@
-# TODO: add make test after build
-
-# TODO: hardening using RPM macros - instead of -Wl,-z,relro in LDFLAGS
-#%global _hardened_build 1
+%global _hardened_build 1
 
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
@@ -183,15 +180,10 @@ popd
 libtool='%{_bindir}/libtool'
 export tagname=CC
 
-%ifarch ia64
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
-%endif
-
 export CPPFLAGS="-I%_includedir/nss3 -I%_includedir/nspr4"
 export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -fPIC -D_REENTRANT -DLDAP_CONNECTIONLESS -D_GNU_SOURCE -DHAVE_TLS -DHAVE_MOZNSS -DSLAPD_LMHASH"
 export NSS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
 export LIBS=""
-export LDFLAGS="$LDFLAGS -Wl,-z,relro"
 
 build() {