[httpd/f13/master] link everything using -z relro and -z now

[jorton]

commit 4ab54eb8bde0586a6a49eaa767a717a1d1a18f3e
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Oct 27 11:30:47 2010 +0100

    link everything using -z relro and -z now

 httpd.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index 6c26dfe..07fb388 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -153,9 +153,8 @@ autoheader && autoconf || exit 1
 %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
 	support/apxs.in
 
-CFLAGS=$RPM_OPT_FLAGS
-SH_LDFLAGS="-Wl,-z,relro"
-export CFLAGS SH_LDFLAGS
+export CFLAGS=$RPM_OPT_FLAGS
+export LDFLAGS="-Wl,-z,relro,-z,now"
 
 # Hard-code path to links to avoid unnecessary builddep
 export LYNX_PATH=/usr/bin/links
@@ -487,6 +486,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Sep 10 2010 Joe Orton <jorton at redhat.com> - 2.2.16-2
+- link everything using -z relro and -z now
+
 * Fri Sep 17 2010 Joe Orton <jorton at redhat.com> - 2.2.16-1.1
 - add fix for PR 45444 (#634905)