[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6260/8267] rpm: Do not require that ELF binaries are executable to be identifiable

[Emmanuele Bassi <ebassi src gnome org>]

commit acca495fae8b8cb71e47382af12ea0f0b5baa408
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Fri Jun 9 21:34:32 2017 +0200

    rpm: Do not require that ELF binaries are executable to be identifiable
    
    There is nothing that requires, e.g., a DSO to be executable, but it
    is still an ELF binary and should be identified as such.
    
    (From OE-Core rev: 74d040f456269992a13850a626279b3b8e954847)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...ire-that-ELF-binaries-are-executable-to-b.patch |   32 ++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_git.bb               |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch 
b/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
new file mode 100644
index 0000000..c910a47
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
@@ -0,0 +1,32 @@
+From d65d6e8760afbd7f70b22a1f3297a037bc475fea Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <pkj axis com>
+Date: Mon, 15 May 2017 10:21:08 +0200
+Subject: [PATCH 11/13] Do not require that ELF binaries are executable to be
+ identifiable
+
+There is nothing that requires, e.g., a DSO to be executable, but it
+is still an ELF binary and should be identified as such.
+
+Upstream probably expects all ELF binaries to be marked as executable,
+but rather than imposing such a limitation for OE, allow any file to
+be identified as an ELF binary regardless of whether it is executable
+or not.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
+---
+ fileattrs/elf.attr | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr
+index 595b33e09..bac52649d 100644
+--- a/fileattrs/elf.attr
++++ b/fileattrs/elf.attr
+@@ -1,4 +1,3 @@
+ %__elf_provides               %{_rpmconfigdir}/elfdeps --provides 
%{?__filter_GLIBC_PRIVATE:--filter-private}
+ %__elf_requires               %{_rpmconfigdir}/elfdeps --requires 
%{?__filter_GLIBC_PRIVATE:--filter-private}
+ %__elf_magic          ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*$
+-%__elf_flags          exeonly
+-- 
+2.12.0
+
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index 7665d54..1588037 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -35,6 +35,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm \
            file://0001-Fix-build-with-musl-C-library.patch \
            file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \
            file://0001-Add-PYTHON_ABI-when-searching-for-python-libraries.patch \
+           file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \
            "
 
 PV = "4.13.90+git${SRCPV}"