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

redhat-config-*: Use + to append rather than %rename, to protect against

Browse Source 
multiple -specs= ending up in the command line. (#892837)
This commit is contained in:
Adam Jackson 2013-05-13 11:19:02 -04:00
parent 234364ec2f
commit 3cff8f9b97
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redhat-hardened-cc1
View File

@ -1,4 +1,2 @@
%rename cc1_options rh_cc1_options_old
*cc1_options: *cc1_options:
%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}} %(rh_cc1_options_old) + %{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}

8
redhat-hardened-ld
View File

@ -1,9 +1,5 @@
%rename self_spec rh_self_spec_old
*self_spec: *self_spec:
%{!shared:-pie} %(rh_self_spec_old) + %{!shared:-pie}
%rename link rh_link_old
*link: *link:
-z now %(rh_link_old) + -z now

6
redhat-rpm-config.spec
View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 9.1.0 Version: 9.1.0
Release: 43%{?dist} Release: 44%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
Group: Development/System Group: Development/System
@ -113,6 +113,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/* %{_sysconfdir}/rpm/*
%changelog %changelog
* Mon May 13 2013 Adam Jackson <ajax@redhat.com> 9.1.0-44
- redhat-config-*: Use + to append rather than %%rename, to protect against
multiple -specs= ending up in the command line. (#892837)
* Tue Apr 23 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-43 * Tue Apr 23 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-43
- Add optflags stack protector override for AArch64 (#909788) - Add optflags stack protector override for AArch64 (#909788)
- Also set FCFLAGS from %%configure (#914831) - Also set FCFLAGS from %%configure (#914831)