[rpm] - fix classification of ELF binaries with setuid/setgid bit (#758251)

[Panu Matilainen]

commit fc034ad970e586a2e2c95441d487eba8fb92aa7c
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Dec 1 09:25:05 2011 +0200

    - fix classification of ELF binaries with setuid/setgid bit (#758251)

 rpm-4.9.x-elfattr.patch |   16 ++++++++++++++++
 rpm.spec                |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/rpm-4.9.x-elfattr.patch b/rpm-4.9.x-elfattr.patch
new file mode 100644
index 0000000..7d6ed4f
--- /dev/null
+++ b/rpm-4.9.x-elfattr.patch
@@ -0,0 +1,16 @@
+commit 87d9e3c4adac92ff544440dd1239a4ae4fe05bb4
+Author: Panu Matilainen <pmatilai at redhat.com>
+Date:   Mon Nov 28 14:00:45 2011 +0200
+
+    Fix classification of ELF binaries with setuid/setgid bit, oops...
+
+diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr
+index bc6ce83..595b33e 100644
+--- a/fileattrs/elf.attr
++++ b/fileattrs/elf.attr
+@@ -1,4 +1,4 @@
+ %__elf_provides		%{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
+ %__elf_requires		%{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
+-%__elf_magic		^(sticky )?ELF (32|64)-bit.*$
++%__elf_magic		^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*$
+ %__elf_flags		exeonly
diff --git a/rpm.spec b/rpm.spec
index 658aca6..8ebdea1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}5%{?dist}
+Release: %{?snapver:0.%{snapver}.}6%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -43,6 +43,7 @@ Patch5: rpm-4.9.0-armhfp.patch
 
 # Patches already in upstream
 Patch100: rpm-4.9.x-fontattr.patch
+Patch101: rpm-4.9.x-elfattr.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -217,6 +218,7 @@ packages on a system.
 %patch4 -p1 -b .use-gpg2
 
 %patch100 -p1 -b .fontattr
+%patch101 -p1 -b .elfattr
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -442,6 +444,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Thu Dec 01 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.1.2-6
+- fix classification of ELF binaries with setuid/setgid bit (#758251)
+
 * Fri Nov 25 2011 Panu Matilainen <pmatilai at redhat.com> - 4.9.1.2-5
 - adjust font detection rules for libmagic change (#757105)