From 92e492196070b7498c0e64d320055a126aa3e419 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 27 Jun 2011 12:40:49 -0400
Subject: [PATCH] Add -z relro

---
 redhat-rpm-config-9.1.0-relro.patch | 12 ++++++++++++
 redhat-rpm-config.spec              |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 redhat-rpm-config-9.1.0-relro.patch

diff --git a/redhat-rpm-config-9.1.0-relro.patch b/redhat-rpm-config-9.1.0-relro.patch
new file mode 100644
index 0000000..b6bcb8a
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-relro.patch
@@ -0,0 +1,12 @@
+diff -up redhat-rpm-config-9.1.0/macros.jx redhat-rpm-config-9.1.0/macros
+--- redhat-rpm-config-9.1.0/macros.jx	2011-06-27 12:30:32.000000000 -0400
++++ redhat-rpm-config-9.1.0/macros	2011-06-27 12:36:02.737309782 -0400
+@@ -183,7 +183,7 @@ unset DISPLAY\
+ %__find_provides        /usr/lib/rpm/redhat/find-provides
+ %__find_requires        /usr/lib/rpm/redhat/find-requires
+ 
+-%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
++%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wl,-z,relro
+ 
+ # Use these macros to differentiate between RH and other KMP implementation(s).
+ redhat_kernel_module_package	1
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 5dc118a..ca9d25b 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: 10%{?dist}
+Release: 11%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -18,6 +18,7 @@ Patch3: redhat-rpm-config-9.1.0-pkgconfig-private.patch
 # be pulled in at rpm build time, this is specific for srpm creation.
 Patch4: redhat-rpm-config-9.1.0-arches-macros.patch
 Patch5: redhat-rpm-config-9.1.0-arm.patch
+Patch6: redhat-rpm-config-9.1.0-relro.patch
 BuildArch: noarch
 Requires: mktemp
 Requires: rpm >= 4.6.0
@@ -35,6 +36,7 @@ Red Hat specific rpm configuration files.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 
@@ -55,6 +57,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Mon Jun 27 2011 Adam Jackson <ajax@redhat.com> 9.1.0-11
+- redhat-rpm-config-9.1.0-relro.patch: Add -Wl,-z,relro to __global_cflags
+
 * Tue Jun 21 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-10
 - revert last build since releng prefers exclusivearch here