rpm: Upgrade to 5.4.14

Update various patches.  A few corrections to the patch descriptions,
otherwise simple quilt refresh or conflict resolution.

Remove rpm-solvedb.patch and rpm-respect-arch.patch.  These are both related
to the old solvedb package dependency solver.  This is no longer used since
we moved to smartpm.

rpm-stub-out-git_strerror was a backport and is no longer needed.

RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer.  A small
patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based
on what is available at configure time.

(From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 18 insertions, 18 deletions

diff --git a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
index 64746ce224..8870adb9e7 100644
--- a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
+++ b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
@@ -4,10 +4,10 @@ Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
-Index: rpm-5.4.9/rpmio/rpmio.h
+Index: rpm-5.4.14/rpmio/rpmio.h
 ===================================================================
---- rpm-5.4.9.orig/rpmio/rpmio.h        2010-09-29 07:54:30.000000000 -0700
-+++ rpm-5.4.9/rpmio/rpmio.h     2012-06-12 07:29:19.610745014 -0700
+--- rpm-5.4.14.orig/rpmio/rpmio.h
++++ rpm-5.4.14/rpmio/rpmio.h
 @@ -23,7 +23,8 @@
   */
  /*@{*/
@@ -18,11 +18,11 @@ Index: rpm-5.4.9/rpmio/rpmio.h
  #define USE_COOKIE_SEEK_POINTER 1
  typedef _IO_off64_t    _libio_off_t;
  typedef _libio_off_t * _libio_pos_t;
-Index: rpm-5.4.9/system.h
+Index: rpm-5.4.14/system.h
 ===================================================================
---- rpm-5.4.9.orig/system.h     2012-04-26 10:46:49.000000000 -0700
-+++ rpm-5.4.9/system.h  2012-06-12 07:30:08.242747422 -0700
-@@ -410,7 +410,7 @@
+--- rpm-5.4.14.orig/system.h
++++ rpm-5.4.14/system.h
+@@ -481,7 +481,7 @@ extern void muntrace (void)
  #endif /* defined(__LCLINT__) */
  
  /* Memory allocation via macro defs to get meaningful locations from mtrace() */
@@ -31,11 +31,11 @@ Index: rpm-5.4.9/system.h
  #define        xmalloc(_size)          (malloc(_size) ? : vmefail(_size))
  #define        xcalloc(_nmemb, _size)  (calloc((_nmemb), (_size)) ? : vmefail(_size))
  #define        xrealloc(_ptr, _size)   (realloc((_ptr), (_size)) ? : vmefail(_size))
-Index: rpm-5.4.9/lib/librpm.vers
+Index: rpm-5.4.14/lib/librpm.vers
 ===================================================================
---- rpm-5.4.9.orig/lib/librpm.vers      2011-04-10 15:55:23.000000000 -0700
-+++ rpm-5.4.9/lib/librpm.vers   2012-06-12 07:29:19.610745014 -0700
-@@ -405,6 +405,10 @@
+--- rpm-5.4.14.orig/lib/librpm.vers
++++ rpm-5.4.14/lib/librpm.vers
+@@ -405,6 +405,10 @@ LIBRPM_0
      specedit;
      strict_erasures;
      XrpmtsiInit;
@@ -46,14 +46,14 @@ Index: rpm-5.4.9/lib/librpm.vers
    local:
      *;
  };
-Index: rpm-5.4.9/rpmio/librpmio.vers
+Index: rpm-5.4.14/rpmio/librpmio.vers
 ===================================================================
---- rpm-5.4.9.orig/rpmio/librpmio.vers  2012-05-07 07:38:23.000000000 -0700
-+++ rpm-5.4.9/rpmio/librpmio.vers       2012-06-12 07:29:19.626745024 -0700
-@@ -994,6 +994,10 @@
-     mongo_simple_int_command;
-     mongo_simple_str_command;
-     mongo_update;
+--- rpm-5.4.14.orig/rpmio/librpmio.vers
++++ rpm-5.4.14/rpmio/librpmio.vers
+@@ -1056,6 +1056,10 @@ LIBRPMIO_0
+     mongo_write_concern_set_mode;
+     mongo_write_concern_set_w;
+     mongo_write_concern_set_wtimeout;
 +    xmalloc;
 +    xrealloc;
 +    xcalloc;