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, 13 insertions, 13 deletions

diff --git a/meta/recipes-devtools/rpm/rpm/rpmatch.patch b/meta/recipes-devtools/rpm/rpm/rpmatch.patch
index 8ea349003a..20d13aa08c 100644
--- a/meta/recipes-devtools/rpm/rpm/rpmatch.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpmatch.patch
@@ -8,26 +8,26 @@ Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
-Index: rpm-5.4.0/configure.ac
+Index: rpm-5.4.14/configure.ac
 ===================================================================
---- rpm-5.4.0.orig/configure.ac 2012-05-31 15:40:05.985990822 -0700
-+++ rpm-5.4.0/configure.ac      2012-05-31 15:41:15.601995311 -0700
-@@ -800,7 +800,7 @@
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -943,7 +943,7 @@ AC_CHECK_FUNCS([dnl
      ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl
      getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl
      lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl
--    posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl
-+    posix_fadvise posix_fallocate putenv realpath regcomp rpmatch __secure_getenv dnl
+-    posix_fadvise posix_fallocate putenv realpath regcomp secure_getenv __secure_getenv dnl
++    posix_fadvise posix_fallocate putenv realpath regcomp rpmatch secure_getenv __secure_getenv dnl
      setattrlist setenv setlocale setmode setxattr dnl
      sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl
      sigprocmask sigsuspend sigaction dnl
-Index: rpm-5.4.0/system.h
+Index: rpm-5.4.14/system.h
 ===================================================================
---- rpm-5.4.0.orig/system.h     2012-05-31 15:40:05.997991504 -0700
-+++ rpm-5.4.0/system.h  2012-05-31 15:42:04.941997731 -0700
-@@ -410,6 +410,14 @@
- #endif /* defined(__GNUC__) */
- #endif /* HAVE_MCHECK_H */
+--- rpm-5.4.14.orig/system.h
++++ rpm-5.4.14/system.h
+@@ -353,6 +353,14 @@ extern int _tolower(int) __THROW   /*@*/;
+ #include <libgen.h>
+ #endif
  
 +#ifndef HAVE_RPMATCH
 +#define rpmatch(line) \
@@ -37,6 +37,6 @@ Index: rpm-5.4.0/system.h
 +         -1 )
 +#endif
 +
- /* Retrofit glibc __progname */
+ /* -- Retrofit glibc __progname */
  #if defined __GLIBC__ && __GLIBC__ >= 2
  #if __GLIBC_MINOR__ >= 1