diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:27 +0000 |
commit | 007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch) | |
tree | 32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch | |
parent | a27ca6da59e6939a5bbab641236f7f792c03694f (diff) | |
download | poky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch b/meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch new file mode 100644 index 0000000000..124606c0d1 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Make security switches manual settings | ||
2 | |||
3 | RPM checks for the availability of the stack protector switch and | ||
4 | transactional-memory support. If supported it unconditionally | ||
5 | enables the compiler options which can cause errors if the support has | ||
6 | not been built into the compiler. | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
11 | |||
12 | Index: rpm-5.4.15/configure.ac | ||
13 | =================================================================== | ||
14 | --- rpm-5.4.15.orig/configure.ac | ||
15 | +++ rpm-5.4.15/configure.ac | ||
16 | @@ -425,7 +425,7 @@ dnl # rpm_CFLAGS_ADD([-fstack-arrays],[ | ||
17 | dnl # build RPM instrumented for extra optimization/security (GCC only) | ||
18 | dnl # --- other optimizations | ||
19 | rpm_CFLAGS_ADD([-fexceptions], [RPM_CFLAGS]) | ||
20 | - rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS]) | ||
21 | +dnl rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS]) | ||
22 | dnl # rpm_CFLAGS_ADD([-fstack-protector-all],[RPM_CFLAGS]) | ||
23 | |||
24 | if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then | ||