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

This commit is contained in:
Panu Matilainen 2011-12-01 09:25:05 +02:00
parent 52396413d2
commit fc034ad970
2 changed files with 22 additions and 1 deletions

16
rpm-4.9.x-elfattr.patch Normal file
View File

@ -0,0 +1,16 @@
commit 87d9e3c4adac92ff544440dd1239a4ae4fe05bb4
Author: Panu Matilainen <pmatilai@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

View File

@ -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@redhat.com> - 4.9.1.2-6
- fix classification of ELF binaries with setuid/setgid bit (#758251)
* Fri Nov 25 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.2-5
- adjust font detection rules for libmagic change (#757105)