Add -z relro

This commit is contained in:
Adam Jackson 2011-06-27 12:40:49 -04:00
parent 8e0316b094
commit 92e4921960
2 changed files with 18 additions and 1 deletions

View File

@ -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

View File

@ -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