rpms/rpm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f15

Browse Source 
* master: (3 commits)
  - fix classification of elf executables with sticky bit set (#689182)
  - also renumber manifest crash patch to reflect upstream status
  ...
This commit is contained in:
Panu Matilainen 2011-03-22 09:08:43 +02:00
commit ae27e7d914
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpm-4.9.0-sticky-elf.patch Normal file
View File

@ -0,0 +1,16 @@
commit 6eba5dc468aa2d26ff80f9321e8d4d014279d506
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Tue Mar 22 08:36:35 2011 +0200
Fix classification of ELF binaries with sticky bit (RhBug:689182)
diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr
index fba180b..bc6ce83 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 ^ELF (32|64)-bit.*$
+%__elf_magic ^(sticky )?ELF (32|64)-bit.*$
%__elf_flags exeonly

18
rpm.spec
View File

@ -21,7 +21,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}2%{?dist} Release: %{?snapver:0.%{snapver}.}4%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.8.x/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/rpm-4.8.x/%{name}-%{srcver}.tar.bz2
@ -42,6 +42,10 @@ Patch4: rpm-4.8.1-use-gpg2.patch
Patch5: rpm-4.9.0-manifest-fix.patch Patch5: rpm-4.9.0-manifest-fix.patch
# Patches already in upstream # 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 # These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch Patch301: rpm-4.6.0-niagara.patch
@ -208,6 +212,9 @@ packages on a system.
%patch4 -p1 -b .use-gpg2 %patch4 -p1 -b .use-gpg2
%patch5 -p1 -b .manifest-fix %patch5 -p1 -b .manifest-fix
%patch100 -p1 -b .manifest-fix
%patch101 -p1 -b .sticky-elf
%patch301 -p1 -b .niagara %patch301 -p1 -b .niagara
%patch302 -p1 -b .geode %patch302 -p1 -b .geode
@ -325,7 +332,6 @@ exit 0
%{_bindir}/rpm2cpio %{_bindir}/rpm2cpio
%{_bindir}/rpmdb %{_bindir}/rpmdb
%{_bindir}/rpmkeys %{_bindir}/rpmkeys
%{_bindir}/rpmsign
%{_bindir}/rpmquery %{_bindir}/rpmquery
%{_bindir}/rpmverify %{_bindir}/rpmverify
@ -421,9 +427,15 @@ exit 0
%doc COPYING doc/librpm/html/* %doc COPYING doc/librpm/html/*
%changelog %changelog
* Wed Mar 16 2011 Jindirch Novy <jnovy@redhat.com> - 4.9.0-2 * Tue Mar 22 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-4
- fix classification of elf executables with sticky bit set (#689182)
* Wed Mar 16 2011 Jindirch Novy <jnovy@redhat.com> - 4.9.0-3
- fix crash in package manifest check (#688091) - fix crash in package manifest check (#688091)
* Fri Mar 04 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-2
- fix duplicate rpmsign binary in rpm main package dragging in build-libs
* Wed Mar 02 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-1 * Wed Mar 02 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-1
- update to 4.9.0 final - update to 4.9.0 final
- drop upstreamed patches - drop upstreamed patches