From 4478daebe4c7481d04ffa1b35dc11c9af945f0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 30 Aug 2011 13:59:31 +0200
Subject: [PATCH] Hardened build, rebuilt with full relro

---
 postfix.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/postfix.spec b/postfix.spec
index 67d5b79..5ddbe35 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -7,6 +7,9 @@
 %bcond_without ipv6
 %bcond_without pflogsumm
 
+# hardened build
+%global _hardened_build 1
+
 # Postfix requires one exlusive uid/gid and a 2nd exclusive gid for its own
 # use.  Let me know if the second gid collides with another package.
 # Be careful: Redhat's 'mail' user & group isn't unique!
@@ -29,7 +32,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -110,7 +113,7 @@ server traffic volumes, rejected and bounced email, and server
 warnings, errors and panics.
 
 qshape prints Postfix queue domain and age distribution.
- 
+
 %prep
 %setup -q
 # Apply obligatory patches
@@ -177,7 +180,7 @@ CCARGS="${CCARGS} -fsigned-char"
 CCARGS="${CCARGS} -DDEF_CONFIG_DIR=\\\"%{postfix_config_dir}\\\""
 CCARGS="${CCARGS} $(getconf LFS_CFLAGS)"
 
-AUXLIBS="${AUXLIBS} -pie -Wl,-z,relro"
+AUXLIBS="${AUXLIBS} -pie -Wl,-z,relro,-z,now"
 
 make -f Makefile.init makefiles CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
   DEBUG="" OPT="$RPM_OPT_FLAGS -Wno-comment"
@@ -475,6 +478,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 30 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.8.4-3
+- Hardened build, rebuilt with full relro
+
 * Tue Aug 30 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.8.4-2
 - Rebuilt with libdb-5.1
   Resolves: rhbz#734084