[rpm/f15/master: 4/4] Merge branch 'master' into f15

[Panu Matilainen]

commit ae27e7d914a2bff69cc7032e756a1eb713e8e5c8
Merge: 8a02be2 629d3ea
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Mar 22 09:08:43 2011 +0200

    Merge branch 'master' into f15
    
    * master: (3 commits)
      - fix classification of elf executables with sticky bit set (#689182)
      - also renumber manifest crash patch to reflect upstream status
      ...

 rpm-4.9.0-sticky-elf.patch |   16 ++++++++++++++++
 rpm.spec                   |   18 +++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
---
diff --cc rpm.spec
index d59a70e,f25172e..2f2aad1
--- a/rpm.spec
+++ b/rpm.spec
@@@ -38,10 -38,12 +38,14 @@@ Patch2: rpm-4.8.90-fedora-specspo.patc
  Patch3: rpm-4.8.0-no-man-dirs.patch
  # gnupg2 comes installed by default, avoid need to drag in gnupg too
  Patch4: rpm-4.8.1-use-gpg2.patch
 +# do not try to free and unallocated variable (#688091)
 +Patch5: rpm-4.9.0-manifest-fix.patch
  
  # Patches already in upstream
+ # Do not try to free and unallocated variable (#688091)
+ Patch100: rpm-4.9.0-manifest-fix.patch
+ # Recognize elf executables with sticky bit as elf
+ Patch101: rpm-4.9.0-sticky-elf.patch
  
  # These are not yet upstream
  Patch301: rpm-4.6.0-niagara.patch
@@@ -206,8 -208,10 +210,11 @@@ packages on a system
  %patch2 -p1 -b .fedora-specspo
  %patch3 -p1 -b .no-man-dirs
  %patch4 -p1 -b .use-gpg2
 +%patch5 -p1 -b .manifest-fix
  
+ %patch100 -p1 -b .manifest-fix
+ %patch101 -p1 -b .sticky-elf
+ 
  %patch301 -p1 -b .niagara
  %patch302 -p1 -b .geode