[rpm] - newer git snapshot to keep patch-count down - fixes CVE-2012-0060, CVE-2012-0061 and CVE-2012-0815

[Panu Matilainen]

commit 302bffb0becd0ed2cd45005073e563c559ba2678
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Apr 5 12:12:57 2012 +0300

    - newer git snapshot to keep patch-count down
    - fixes CVE-2012-0060, CVE-2012-0061 and CVE-2012-0815
    - fix obsoletes in installing set getting matched on provides (#810077)

 .gitignore                         |    1 +
 rpm-4.9.90-canonarch.patch         |   24 ------------
 rpm-4.9.90-header-datalength.patch |   70 ------------------------------------
 rpm-4.9.90-int-libdb.patch         |   67 ----------------------------------
 rpm-4.9.90-keyid-size.patch        |   37 -------------------
 rpm-4.9.90-rpmdeps-args.patch      |   44 ----------------------
 rpm-4.9.90-rpmte-fileinfo-2.patch  |   34 -----------------
 rpm-4.9.90-rpmte-fileinfo.patch    |   28 --------------
 rpm.spec                           |   22 +++--------
 sources                            |    2 +-
 10 files changed, 8 insertions(+), 321 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39783d0..799c105 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /rpm-4.9.90.git11505.tar.bz2
+/rpm-4.9.90.git11519.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index c98316d..fadfae0 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -12,7 +12,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.9.90
-%define snapver git11505
+%define snapver git11519
 %define srcver %{rpmver}%{?snapver:.%{snapver}}
 
 %define bdbname libdb
@@ -46,13 +46,6 @@ Patch5: rpm-4.9.90-armhfp.patch
 Patch6: rpm-4.9.0-armhfp-logic.patch
 
 # Patches already in upstream
-Patch200: rpm-4.9.90-rpmte-fileinfo.patch
-Patch201: rpm-4.9.90-rpmte-fileinfo-2.patch
-Patch202: rpm-4.9.90-keyid-size.patch
-Patch203: rpm-4.9.90-header-datalength.patch
-Patch204: rpm-4.9.90-rpmdeps-args.patch
-Patch205: rpm-4.9.90-canonarch.patch
-Patch206: rpm-4.9.90-int-libdb.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -222,14 +215,6 @@ packages on a system.
 %patch3 -p1 -b .no-man-dirs
 %patch4 -p1 -b .use-gpg2
 
-%patch200 -p1 -b .rpmte-fileinfo
-%patch201 -p1 -b .rpmte-fileinfo-2
-%patch202 -p1 -b .keyid-size
-%patch203 -p1 -b .header-datalength
-%patch204 -p1 -b .rpmdeps-args
-%patch205 -p1 -b .canonarch
-%patch206 -p1 -b .int-libdb
-
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 %patch304 -p1 -b .ldflags
@@ -455,6 +440,11 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Thu Apr 05 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.90-0.git11519.1
+- newer git snapshot to keep patch-count down
+- fixes CVE-2012-0060, CVE-2012-0061 and CVE-2012-0815
+- fix obsoletes in installing set getting matched on provides (#810077)
+
 * Wed Apr 04 2012 Jindrich Novy <jnovy at redhat.com> - 4.9.90-0.git11505.12
 - rebuild against new libdb
 
diff --git a/sources b/sources
index 3db9f2d..e97334f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9206167147441cda84a56c338de9ebaa  rpm-4.9.90.git11505.tar.bz2
+7e59625daeda485a9aef80c175712d1a  rpm-4.9.90.git11519.tar.bz2