rpms
/
redhat-rpm-config
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

redhat-rpm-config-9.1.0-relro.patch: LDFLAGS, not CFLAGS.

This commit is contained in:
Adam Jackson 2011-07-07 13:17:24 -04:00
parent a51eb50bb4
commit 8e60e55b8a
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
redhat-rpm-config-9.1.0-relro.patch
View File

@ -1,12 +1,19 @@
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
--- redhat-rpm-config-9.1.0/macros.jx 2011-07-07 13:10:18.000000000 -0400
+++ redhat-rpm-config-9.1.0/macros 2011-07-07 13:12:00.299594529 -0400
@@ -31,6 +31,7 @@
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
%{_configure} --build=%{_build} --host=%{_host} \\\
--program-prefix=%{?_program_prefix} \\\
--disable-dependency-tracking \\\
@@ -184,6 +185,7 @@ unset DISPLAY\
%__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
%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
+%__global_ldflags -Wl,-z,relro
# Use these macros to differentiate between RH and other KMP implementation(s).
redhat_kernel_module_package 1

5
redhat-rpm-config.spec
View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 9.1.0
Release: 12%{?dist}
Release: 13%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@ -57,6 +57,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/*
%changelog
* Thu Jul 07 2011 Adam Jackson <ajax@redhat.com> 9.1.0-13
- redhat-rpm-config-9.1.0-relro.patch: LDFLAGS, not CFLAGS.
* Sat Jul 02 2011 Jon Masters <jcm@jonmasters.org> - 9.1.0-12
- redhat-rpm-config-9.1.0-arm.patch: Make armv7hl default on all v7 ARM