summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-02 19:57:44 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commitfe483ca37c33ebfe4c3e391244c47969e1560aeb (patch)
tree4b703d42ad5b4c22f9075463c013e562ab649345
parent107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff)
downloadpoky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.tar.gz
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>
-rw-r--r--meta/recipes-devtools/rpm/rpm/dbconvert.patch24
-rw-r--r--meta/recipes-devtools/rpm/rpm/debugedit-segv.patch19
-rw-r--r--meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch14
-rw-r--r--meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/header-include-fix.patch16
-rw-r--r--meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch6
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-autogen.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch14
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch6
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch162
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch18
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch14
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch12
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch30
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch10
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch12
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch10
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-lua.patch18
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-macros.patch19
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch9
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch9
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch30
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch11
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch12
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform.patch39
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform2.patch22
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-py-init.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch6
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch10
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch67
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch20
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-showrc.patch9
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch31
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch60
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch7
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch10
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch15
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpmatch.patch26
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch14
-rw-r--r--meta/recipes-devtools/rpm/rpm/uclibc-support.patch36
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb (renamed from meta/recipes-devtools/rpm/rpm_5.4.9.bb)21
47 files changed, 498 insertions, 442 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/dbconvert.patch b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
index 27dba8c960..78de7d99d2 100644
--- a/meta/recipes-devtools/rpm/rpm/dbconvert.patch
+++ b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
@@ -3,20 +3,20 @@ Upstream-Status: Not applicable
3Hack to prevent unneeded demo app from building on older libc 3Hack to prevent unneeded demo app from building on older libc
4where it will break the build 4where it will break the build
5 5
6Index: rpm-5.4.9/tools/Makefile.am 6Index: rpm-5.4.14/tools/Makefile.am
7=================================================================== 7===================================================================
8--- rpm-5.4.9.orig/tools/Makefile.am 8--- rpm-5.4.14.orig/tools/Makefile.am
9+++ rpm-5.4.9/tools/Makefile.am 9+++ rpm-5.4.14/tools/Makefile.am
10@@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS) 10@@ -29,7 +29,7 @@ EXTRA_PROGRAMS = nix-copy-closure nix-en
11 xiu-instantiate xiu-store
12 noinst_PROGRAMS =
11 13
12 EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh 14-EXTRA_PROGRAMS += augtool cudftool dbconvert debugedit \
13 15+EXTRA_PROGRAMS += augtool cudftool debugedit \
14-EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \ 16 nix-build nix-channel nix-collect-garbage \
15+EXTRA_PROGRAMS = augtool cudftool debugedit \ 17 nix-log2xml nix-prefetch-url nix-pull nix-push \
16 nix-build nix-channel nix-collect-garbage nix-copy-closure \ 18 xiu-echo xiu-hash \
17 nix-env nix-hash nix-install-package nix-instantiate \ 19@@ -64,7 +64,7 @@ pkgbin_PROGRAMS = \
18 nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
19@@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \
20 rpmcache rpmdigest rpmrepo rpmspecdump \ 20 rpmcache rpmdigest rpmrepo rpmspecdump \
21 rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ 21 rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
22 if WITH_DB 22 if WITH_DB
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch b/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
index 74efe6570c..beef5edd9d 100644
--- a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
+++ b/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch
@@ -15,11 +15,11 @@ Upstream-Status: Pending
15 15
16Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 16Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
17 17
18Index: rpm-5.4.9/tools/debugedit.c 18Index: rpm-5.4.14/tools/debugedit.c
19=================================================================== 19===================================================================
20--- rpm-5.4.9.orig/tools/debugedit.c 20--- rpm-5.4.14.orig/tools/debugedit.c
21+++ rpm-5.4.9/tools/debugedit.c 21+++ rpm-5.4.14/tools/debugedit.c
22@@ -1432,21 +1432,24 @@ handle_build_id (DSO *dso, Elf_Data *bui 22@@ -1445,21 +1445,24 @@ handle_build_id (DSO *dso, Elf_Data *bui
23 auto inline void process (const void *data, size_t size) 23 auto inline void process (const void *data, size_t size)
24 { 24 {
25 memchunk chunk = { .data = (void *) data, .size = size }; 25 memchunk chunk = { .data = (void *) data, .size = size };
@@ -34,16 +34,15 @@ Index: rpm-5.4.9/tools/debugedit.c
34 GElf_Shdr shdr; 34 GElf_Shdr shdr;
35- } u; 35- } u;
36- Elf_Data x = { .d_version = EV_CURRENT, .d_buf = &u }; 36- Elf_Data x = { .d_version = EV_CURRENT, .d_buf = &u };
37- 37+ } u1, u2;
38+ Elf_Data src = { .d_version = EV_CURRENT, .d_buf = &u1 };
39+ Elf_Data dest = { .d_version = EV_CURRENT, .d_buf = &u2 };
40
38- x.d_type = ELF_T_EHDR; 41- x.d_type = ELF_T_EHDR;
39- x.d_size = sizeof u.ehdr; 42- x.d_size = sizeof u.ehdr;
40- u.ehdr = dso->ehdr; 43- u.ehdr = dso->ehdr;
41- u.ehdr.e_phoff = u.ehdr.e_shoff = 0; 44- u.ehdr.e_phoff = u.ehdr.e_shoff = 0;
42- if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL) 45- if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL)
43+ } u1, u2;
44+ Elf_Data src = { .d_version = EV_CURRENT, .d_buf = &u1 };
45+ Elf_Data dest = { .d_version = EV_CURRENT, .d_buf = &u2 };
46+
47+ src.d_type = ELF_T_EHDR; 46+ src.d_type = ELF_T_EHDR;
48+ src.d_size = sizeof u1.ehdr; 47+ src.d_size = sizeof u1.ehdr;
49+ dest.d_size = sizeof u2.ehdr; 48+ dest.d_size = sizeof u2.ehdr;
@@ -53,7 +52,7 @@ Index: rpm-5.4.9/tools/debugedit.c
53 { 52 {
54 bad: 53 bad:
55 fprintf (stderr, "Failed to compute header checksum: %s\n", 54 fprintf (stderr, "Failed to compute header checksum: %s\n",
56@@ -1454,29 +1457,31 @@ handle_build_id (DSO *dso, Elf_Data *bui 55@@ -1467,29 +1470,31 @@ handle_build_id (DSO *dso, Elf_Data *bui
57 exit (1); 56 exit (1);
58 } 57 }
59 58
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch b/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
index 2696cd3168..f7c31006b4 100644
--- a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
+++ b/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch
@@ -20,10 +20,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
20 tools/debugedit.c | 25 +++++++++++++++++++++++++ 20 tools/debugedit.c | 25 +++++++++++++++++++++++++
21 1 file changed, 25 insertions(+) 21 1 file changed, 25 insertions(+)
22 22
23diff --git a/tools/debugedit.c b/tools/debugedit.c 23Index: rpm-5.4.14/tools/debugedit.c
24--- a/tools/debugedit.c 24===================================================================
25+++ b/tools/debugedit.c 25--- rpm-5.4.14.orig/tools/debugedit.c
26@@ -1512,6 +1512,28 @@ handle_build_id (DSO *dso, Elf_Data *build_id, 26+++ rpm-5.4.14/tools/debugedit.c
27@@ -1525,6 +1525,28 @@ handle_build_id (DSO *dso, Elf_Data *bui
27 } 28 }
28 } 29 }
29 30
@@ -52,7 +53,7 @@ diff --git a/tools/debugedit.c b/tools/debugedit.c
52 int 53 int
53 main (int argc, char *argv[]) 54 main (int argc, char *argv[])
54 { 55 {
55@@ -1608,6 +1630,9 @@ main (int argc, char *argv[]) 56@@ -1621,6 +1643,9 @@ main (int argc, char *argv[])
56 exit (1); 57 exit (1);
57 } 58 }
58 59
@@ -62,6 +63,3 @@ diff --git a/tools/debugedit.c b/tools/debugedit.c
62 dso = fdopen_dso (fd, file); 63 dso = fdopen_dso (fd, file);
63 if (dso == NULL) 64 if (dso == NULL)
64 exit (1); 65 exit (1);
65--
661.8.1.2
67
diff --git a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch b/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
index 0474c65a89..976af486fb 100644
--- a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
+++ b/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
@@ -6,11 +6,11 @@ Therefore we change the compile only check to compile and link check
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Index: rpm-5.4.0/configure.ac 9Index: rpm-5.4.14/configure.ac
10=================================================================== 10===================================================================
11--- rpm-5.4.0.orig/configure.ac 2012-06-01 11:41:19.741480143 -0700 11--- rpm-5.4.14.orig/configure.ac
12+++ rpm-5.4.0/configure.ac 2012-06-01 11:41:51.773481676 -0700 12+++ rpm-5.4.14/configure.ac
13@@ -193,7 +193,7 @@ 13@@ -201,7 +201,7 @@ dnl # GNU GCC (usually "gcc")
14 my_save_cflags="$CFLAGS" 14 my_save_cflags="$CFLAGS"
15 CFLAGS=$c 15 CFLAGS=$c
16 AC_MSG_CHECKING([whether GCC supports $c]) 16 AC_MSG_CHECKING([whether GCC supports $c])
diff --git a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
index 6aa072d7c8..5ffb187ff3 100644
--- a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
@@ -1,9 +1,9 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h 3Index: rpm-5.4.14/rpmdb/rpmdb.h
4index 0e1bdd7..8b522bb 100644 4===================================================================
5--- a/rpmdb/rpmdb.h 5--- rpm-5.4.14.orig/rpmdb/rpmdb.h
6+++ b/rpmdb/rpmdb.h 6+++ rpm-5.4.14/rpmdb/rpmdb.h
7@@ -9,6 +9,7 @@ 7@@ -9,6 +9,7 @@
8 8
9 #include <assert.h> 9 #include <assert.h>
@@ -12,10 +12,10 @@ index 0e1bdd7..8b522bb 100644
12 12
13 #include <rpmtypes.h> 13 #include <rpmtypes.h>
14 #include <rpmtag.h> /* XXX Header typedef */ 14 #include <rpmtag.h> /* XXX Header typedef */
15diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h 15Index: rpm-5.4.14/rpmdb/rpmtag.h
16index 8af6480..2166b4c 100644 16===================================================================
17--- a/rpmdb/rpmtag.h 17--- rpm-5.4.14.orig/rpmdb/rpmtag.h
18+++ b/rpmdb/rpmtag.h 18+++ rpm-5.4.14/rpmdb/rpmtag.h
19@@ -7,6 +7,7 @@ 19@@ -7,6 +7,7 @@
20 20
21 #include <rpmiotypes.h> 21 #include <rpmiotypes.h>
diff --git a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
index 12f85b7fc9..8fab9eb42f 100644
--- a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
+++ b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
@@ -18,9 +18,11 @@ Upstream-Status: Pending
18 18
19Signed-off-by: Morgan Little <morgan.little@windriver.com> 19Signed-off-by: Morgan Little <morgan.little@windriver.com>
20 20
21--- a/lua/Makefile.am.orig 21Index: rpm-5.4.14/lua/Makefile.am
22+++ b/lua/Makefile.am 22===================================================================
23@@ -320,7 +320,7 @@ 23--- rpm-5.4.14.orig/lua/Makefile.am
24+++ rpm-5.4.14/lua/Makefile.am
25@@ -326,7 +326,7 @@ clean-local:
24 # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. 26 # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install.
25 # XXX CVS has lua/luac sub-directories in the Attic that collide with the 27 # XXX CVS has lua/luac sub-directories in the Attic that collide with the
26 # XXX lua/luac executable names when using cvs update. 28 # XXX lua/luac executable names when using cvs update.
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
index c1fab3e1a0..a538a60bb9 100644
--- a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
+++ b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
@@ -8,10 +8,10 @@ Upstream-Status: Pending
8 8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10 10
11Index: rpm-5.4.9/python/rpmmodule.c 11Index: rpm-5.4.14/python/rpmmodule.c
12=================================================================== 12===================================================================
13--- rpm-5.4.9.orig/python/rpmmodule.c 13--- rpm-5.4.14.orig/python/rpmmodule.c
14+++ rpm-5.4.9/python/rpmmodule.c 14+++ rpm-5.4.14/python/rpmmodule.c
15@@ -494,12 +494,16 @@ void init_rpm(void) 15@@ -494,12 +494,16 @@ void init_rpm(void)
16 REGISTER_ENUM(RPMSENSE_EQUAL); 16 REGISTER_ENUM(RPMSENSE_EQUAL);
17 REGISTER_ENUM(RPMSENSE_NOTEQUAL); 17 REGISTER_ENUM(RPMSENSE_NOTEQUAL);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
index 5129833381..8771235d30 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
@@ -2,14 +2,14 @@ Remove the sanity checking from the rpm autogen.sh. This is required because
2we may have slightly different, but yet compatible versions. If we do end 2we may have slightly different, but yet compatible versions. If we do end
3up breaking things, we'll deal with it at that time. 3up breaking things, we'll deal with it at that time.
4 4
5Upstream-Status: Pending 5Upstream-Status: Inappropriate [configuration]
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
9Index: rpm-5.4.8/syck/autogen.sh 9Index: rpm-5.4.14/syck/autogen.sh
10=================================================================== 10===================================================================
11--- rpm-5.4.8.orig/syck/autogen.sh 11--- rpm-5.4.14.orig/syck/autogen.sh
12+++ rpm-5.4.8/syck/autogen.sh 12+++ rpm-5.4.14/syck/autogen.sh
13@@ -34,12 +34,6 @@ libtoolize () { 13@@ -34,12 +34,6 @@ libtoolize () {
14 eval $_libtoolize $_libtoolize_args 14 eval $_libtoolize $_libtoolize_args
15 } 15 }
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
index 3aac1164d6..41ab498a0f 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
@@ -18,11 +18,11 @@ Upstream-Status: Pending
18 18
19Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 19Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
20 20
21Index: rpm-5.4.0/lib/rpmrc.c 21Index: rpm-5.4.14/lib/rpmrc.c
22=================================================================== 22===================================================================
23--- rpm-5.4.0.orig/lib/rpmrc.c 2011-08-10 17:04:35.798814821 -0500 23--- rpm-5.4.14.orig/lib/rpmrc.c
24+++ rpm-5.4.0/lib/rpmrc.c 2011-08-10 17:33:51.505871895 -0500 24+++ rpm-5.4.14/lib/rpmrc.c
25@@ -916,8 +916,8 @@ 25@@ -925,8 +925,8 @@ static void getMachineInfo(int type, /*@
26 26
27 static void rpmRebuildTargetVars(const char ** target, const char ** canontarget) 27 static void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
28 { 28 {
@@ -33,7 +33,7 @@ Index: rpm-5.4.0/lib/rpmrc.c
33 int x; 33 int x;
34 34
35 /* Rebuild the compat table to recalculate the current target arch. */ 35 /* Rebuild the compat table to recalculate the current target arch. */
36@@ -927,23 +927,60 @@ 36@@ -936,23 +936,60 @@ static void rpmRebuildTargetVars(const c
37 rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS); 37 rpmSetTables(RPM_MACHTABLE_BUILDARCH, RPM_MACHTABLE_BUILDOS);
38 38
39 if (target && *target) { 39 if (target && *target) {
@@ -104,7 +104,7 @@ Index: rpm-5.4.0/lib/rpmrc.c
104 } 104 }
105 } else { 105 } else {
106 const char *a = NULL; 106 const char *a = NULL;
107@@ -988,8 +1025,16 @@ 107@@ -995,8 +1032,16 @@ static void rpmRebuildTargetVars(const c
108 addMacro(NULL, "_target", NULL, ct, RMIL_RPMRC); 108 addMacro(NULL, "_target", NULL, ct, RMIL_RPMRC);
109 delMacro(NULL, "_target_cpu"); 109 delMacro(NULL, "_target_cpu");
110 addMacro(NULL, "_target_cpu", NULL, ca, RMIL_RPMRC); 110 addMacro(NULL, "_target_cpu", NULL, ca, RMIL_RPMRC);
@@ -121,7 +121,7 @@ Index: rpm-5.4.0/lib/rpmrc.c
121 121
122 if (canontarget) 122 if (canontarget)
123 *canontarget = ct; 123 *canontarget = ct;
124@@ -997,8 +1041,12 @@ 124@@ -1004,8 +1049,12 @@ static void rpmRebuildTargetVars(const c
125 ct = _free(ct); 125 ct = _free(ct);
126 ca = _free(ca); 126 ca = _free(ca);
127 /*@-usereleased@*/ 127 /*@-usereleased@*/
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch b/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
index d9b4e33fdd..c869376538 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch
@@ -4,10 +4,10 @@ Change cache size to reduce the usage of disk space from 62MB to 26MB.
4 4
5Signed-off-by: Mei Lei <lei.mei@intel.com> 5Signed-off-by: Mei Lei <lei.mei@intel.com>
6 6
7Index: rpm-5.4.8/rpmdb/DB_CONFIG.in 7Index: rpm-5.4.14/rpmdb/DB_CONFIG.in
8=================================================================== 8===================================================================
9--- rpm-5.4.8.orig/rpmdb/DB_CONFIG.in 9--- rpm-5.4.14.orig/rpmdb/DB_CONFIG.in
10+++ rpm-5.4.8/rpmdb/DB_CONFIG.in 10+++ rpm-5.4.14/rpmdb/DB_CONFIG.in
11@@ -29,7 +29,7 @@ set_thread_count 64 11@@ -29,7 +29,7 @@ set_thread_count 64
12 12
13 # ================ Memory Pool 13 # ================ Memory Pool
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch b/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch
new file mode 100644
index 0000000000..edb6ea2f47
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch
@@ -0,0 +1,162 @@
1Support both db5 and db6.
2
3Upstream-status: Inappropriate [configuration]
4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6
7Index: rpm/configure.ac
8===================================================================
9--- rpm.orig/configure.ac
10+++ rpm/configure.ac
11@@ -547,8 +547,6 @@ else
12 MYPATH=$PATH
13 fi
14
15-DBXY=db60
16-
17 AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
18 AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
19 AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
20@@ -560,22 +558,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/
21 AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
22 AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
23 AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
24-AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, $MYPATH)
25-AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, %{_bindir}/${DBXY}_checkpoint, $MYPATH)
26-AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH)
27-AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
28-AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $MYPATH)
29-AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
30-AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, %{_bindir}/${DBXY}_log_verify, $MYPATH)
31-AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, $MYPATH)
32-AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, $MYPATH)
33-AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH)
34-AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
35-AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen, %{_bindir}/${DBXY}_sql_codegen, $MYPATH)
36-AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
37-AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
38-AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, $MYPATH)
39-AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
40 AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
41 AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
42 AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
43@@ -1604,13 +1586,18 @@ RPM_CHECK_LIB(
44
45 dnl # Berkeley-DB & SQLite
46 DBLIBSRCS=""
47+DBXY=db
48+
49 # XXX won't handle --includedir override
50-CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
51+CPPFLAGS_save="${CPPFLAGS}"
52+CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-6.0"
53+with_db_save="${with_db}"
54 RPM_CHECK_LIB(
55 [Berkeley-DB], [db],
56 [db-6.0], [db_create], [db.h],
57- [yes,external], [db3],
58+ [yes,external], [db6],
59 [ DBLIBSRCS="$DBLIBSRCS db3.c"
60+ DBXY=db60
61 AM_CONDITIONAL(WITH_DB, [ true ])
62 AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
63 if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
64@@ -1619,10 +1606,32 @@ RPM_CHECK_LIB(
65 WITH_DB_SUBDIR=""
66 fi
67 ],
68- [ AM_CONDITIONAL(WITH_DB, [ false ])
69- AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ])
70+ [ # Reset a few variables to fresh
71+ with_db="${with_db_save}"
72+ CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-5.3"
73+ RPM_CHECK_LIB(
74+ [Berkeley-DB], [db],
75+ [db-5.3], [db_create], [db.h],
76+ [yes,external], [db53],
77+ [ DBLIBSRCS="$DBLIBSRCS db3.c"
78+ DBXY=db53
79+ AM_CONDITIONAL(WITH_DB, [ true ])
80+ AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
81+ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
82+ AC_DEFINE(HAVE_DB_H, 1, [Have <db.h> header])
83+ else
84+ WITH_DB_SUBDIR=""
85+ fi
86+ ],
87+ [ AM_CONDITIONAL(WITH_DB, [ false ])
88+ AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ])
89+ ])
90 ])
91
92+if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
93+ CPPFLAGS="${CPPFLAGS_save}"
94+fi
95+
96 dnl # Sqlite external
97 RPM_CHECK_LIB(
98 [SQLite], [sqlite],
99@@ -1633,10 +1642,11 @@ RPM_CHECK_LIB(
100
101 dnl # Sqlite 3.7.0.1 from db-5.1.19
102 dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
103+if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then
104 RPM_CHECK_LIB(
105 [Berkeley-DB (+SQLite3)], [dbsql],
106 [db_sql-6.0], [sqlite3_open], [dbsql.h],
107- [yes,external], [db3/sql],
108+ [yes,external], [db6/sql],
109 [
110 AM_CONDITIONAL(WITH_DBSQL, [ true ])
111 AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library])
112@@ -1650,12 +1660,50 @@ RPM_CHECK_LIB(
113 ], [
114 AM_CONDITIONAL(WITH_DBSQL, [ false ])
115 ])
116+elif test ".$ac_cv_lib_db_5_3_db_create" = .yes; then
117+RPM_CHECK_LIB(
118+ [Berkeley-DB (+SQLite3)], [dbsql],
119+ [db_sql-5.3], [sqlite3_open], [dbsql.h],
120+ [yes,external], [db53/sql],
121+ [
122+ AM_CONDITIONAL(WITH_DBSQL, [ true ])
123+ AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library])
124+ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
125+ WITH_DB_CPPFLAGS="${WITH_DB_CPPFLAGS} -I\$(top_srcdir)/db/sql/generated"
126+ WITH_DB_LIBS="${WITH_DBSQL_LIBS}"
127+ DBLIBSRCS="$DBLIBSRCS sqlite.c"
128+ else
129+ WITH_DBSQL_SUBDIR=""
130+ fi
131+ ], [
132+ AM_CONDITIONAL(WITH_DBSQL, [ false ])
133+ ])
134+else
135+AM_CONDITIONAL(WITH_DBSQL, [ false ])
136+fi
137
138 DBLIBOBJS=`echo $DBLIBSRCS | sed -e "s/\.c/\.lo/g"`
139
140 AC_SUBST(DBLIBSRCS)
141 AC_SUBST(DBLIBOBJS)
142
143+AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive, $MYPATH)
144+AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint, %{_bindir}/${DBXY}_checkpoint, $MYPATH)
145+AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock, $MYPATH)
146+AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
147+AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup, %{_bindir}/${DBXY}_hotbackup, $MYPATH)
148+AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
149+AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify, %{_bindir}/${DBXY}_log_verify, $MYPATH)
150+AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog, $MYPATH)
151+AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover, $MYPATH)
152+AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate, %{_bindir}/${DBXY}_replicate, $MYPATH)
153+AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
154+AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen, %{_bindir}/${DBXY}_sql_codegen, $MYPATH)
155+AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
156+AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
157+AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade, $MYPATH)
158+AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
159+
160 AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support]))
161 AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG]))
162
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch b/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
index 59022f4e63..16b8e30a1d 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch
@@ -18,11 +18,11 @@ Upstream-Status: Inappropriate (workaround)
18 18
19Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 19Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
20 20
21Index: rpm-5.4.9/rpmdb/rpmdb.c 21Index: rpm-5.4.14/rpmdb/rpmdb.c
22=================================================================== 22===================================================================
23--- rpm-5.4.9.orig/rpmdb/rpmdb.c 23--- rpm-5.4.14.orig/rpmdb/rpmdb.c
24+++ rpm-5.4.9/rpmdb/rpmdb.c 24+++ rpm-5.4.14/rpmdb/rpmdb.c
25@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC * 25@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC *
26 vp->flags |= DB_DBT_USERMEM; 26 vp->flags |= DB_DBT_USERMEM;
27 rc = dbiGet(dbi, dbcursor, kp, vp, flags); 27 rc = dbiGet(dbi, dbcursor, kp, vp, flags);
28 if (rc == DB_BUFFER_SMALL) { 28 if (rc == DB_BUFFER_SMALL) {
@@ -36,7 +36,7 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c
36 if (uh == NULL || uh == (void *)-1) 36 if (uh == NULL || uh == (void *)-1)
37 fprintf(stderr, 37 fprintf(stderr,
38 "==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n", 38 "==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n",
39@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC * 39@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC *
40 if (munmap(uh, uhlen) != 0) 40 if (munmap(uh, uhlen) != 0)
41 fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n", 41 fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n",
42 uh, (unsigned)uhlen, errno, strerror(errno)); 42 uh, (unsigned)uhlen, errno, strerror(errno));
@@ -62,11 +62,11 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c
62 } 62 }
63 } 63 }
64 } else 64 } else
65Index: rpm-5.4.9/rpmdb/db3.c 65Index: rpm-5.4.14/rpmdb/db3.c
66=================================================================== 66===================================================================
67--- rpm-5.4.9.orig/rpmdb/db3.c 67--- rpm-5.4.14.orig/rpmdb/db3.c
68+++ rpm-5.4.9/rpmdb/db3.c 68+++ rpm-5.4.14/rpmdb/db3.c
69@@ -1452,7 +1452,7 @@ assert(db != NULL); 69@@ -1509,7 +1509,7 @@ assert(db != NULL);
70 #endif 70 #endif
71 } 71 }
72 72
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch
index 25ebbdcbed..2eb6e0f26b 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch
@@ -1,9 +1,9 @@
1Debug the platform score generation... 1Debug the platform score generation...
2 2
3Index: rpm-5.4.9/lib/rpmrc.c 3Index: rpm-5.4.14/lib/rpmrc.c
4=================================================================== 4===================================================================
5--- rpm-5.4.9.orig/lib/rpmrc.c 5--- rpm-5.4.14.orig/lib/rpmrc.c
6+++ rpm-5.4.9/lib/rpmrc.c 6+++ rpm-5.4.14/lib/rpmrc.c
7@@ -465,6 +465,8 @@ static rpmRC rpmPlatform(const char * pl 7@@ -465,6 +465,8 @@ static rpmRC rpmPlatform(const char * pl
8 8
9 rc = (rpmRC) rpmiobSlurp(platform, &iob); 9 rc = (rpmRC) rpmiobSlurp(platform, &iob);
@@ -38,18 +38,18 @@ Index: rpm-5.4.9/lib/rpmrc.c
38 } 38 }
39 39
40+ fprintf(stderr, "D: rpmPlatform mireAppend STRCMP %s -- ", p); 40+ fprintf(stderr, "D: rpmPlatform mireAppend STRCMP %s -- ", p);
41 #if !defined(RPM_VENDOR_OE) /* Skip the explicit-platform */
41 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ 42 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
42 /* do not use vendor and GNU attribution */ 43 /* do not use vendor and GNU attribution */
43 p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); 44@@ -519,6 +528,7 @@ static rpmRC rpmPlatform(const char * pl
44@@ -518,6 +527,7 @@ static rpmRC rpmPlatform(const char * pl
45 (cvog && *cvog->gnu ? "-" : NULL), 45 (cvog && *cvog->gnu ? "-" : NULL),
46 (cvog ? cvog->gnu : NULL), NULL); 46 (cvog ? cvog->gnu : NULL), NULL);
47 #endif 47 #endif
48+ fprintf(stderr, "%s\n", p); 48+ fprintf(stderr, "%s\n", p);
49 xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); 49 xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre);
50 p = _free(p); 50 p = _free(p);
51 51 #endif
52@@ -686,9 +696,12 @@ int rpmPlatformScore(const char * platfo 52@@ -688,9 +698,12 @@ int rpmPlatformScore(const char * platfo
53 53
54 if ((mire = (miRE) mi_re) != NULL) 54 if ((mire = (miRE) mi_re) != NULL)
55 for (i = 0; i < mi_nre; i++) { 55 for (i = 0; i < mi_nre; i++) {
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
index 1f948cd65a..b1db6fff72 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
@@ -11,11 +11,11 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13 13
14diff --git a/lib/rpmfc.c b/lib/rpmfc.c 14Index: rpm-5.4.14/lib/rpmfc.c
15index 0c3befd..9306999 100644 15===================================================================
16--- a/lib/rpmfc.c 16--- rpm-5.4.14.orig/lib/rpmfc.c
17+++ b/lib/rpmfc.c 17+++ rpm-5.4.14/lib/rpmfc.c
18@@ -1692,7 +1692,6 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp) 18@@ -1734,7 +1734,6 @@ rpmRC rpmfcGenerateDepends(void * _spec,
19 /* ... then generate dependencies using %{__find_requires} et al. */ 19 /* ... then generate dependencies using %{__find_requires} et al. */
20 rc = rpmfcGenerateDependsHelper(spec, pkg, fi); 20 rc = rpmfcGenerateDependsHelper(spec, pkg, fi);
21 printDeps(pkg->header); 21 printDeps(pkg->header);
@@ -23,7 +23,7 @@ index 0c3befd..9306999 100644
23 } 23 }
24 24
25 /* Generate scriptlet Dependencies. */ 25 /* Generate scriptlet Dependencies. */
26@@ -1720,8 +1719,8 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp) 26@@ -1762,8 +1761,8 @@ rpmRC rpmfcGenerateDepends(void * _spec,
27 av[ac] = NULL; 27 av[ac] = NULL;
28 28
29 fc = rpmfcNew(); 29 fc = rpmfcNew();
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch b/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
new file mode 100644
index 0000000000..fa1ff43d6c
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch
@@ -0,0 +1,30 @@
1Occasionally the cp -p fails with a non-zero return code. This will cause
2the system abort the build.
3
4Upstream-status: Pending
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8Index: rpm/rpmdb/Makefile.am
9===================================================================
10--- rpm.orig/rpmdb/Makefile.am
11+++ rpm/rpmdb/Makefile.am
12@@ -234,11 +234,14 @@ lcov-report:
13 #lcov-upload: lcov
14 # rsync -rvz -e ssh --delete lcov/* ???
15
16+$(builddir)/logio_recover_template: $(srcdir)/logio_recover_template
17+ @if test ".$(builddir)" != ".$(srcdir)"; then \
18+ cp -fp $(srcdir)/logio_recover_template \
19+ $(builddir)/logio_recover_template ; \
20+ fi
21+
22 logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template
23-$(logio_BUILT): logio.awk logio.src logio_recover_template
24- @test -e $(builddir)/logio_recover_template || \
25- cp -p $(srcdir)/logio_recover_template \
26- $(builddir)/logio_recover_template
27+$(logio_BUILT): logio.awk logio.src $(builddir)/logio_recover_template
28 @rm -f $(logio_BUILT)
29 @$(AWK) -f $(srcdir)/logio.awk \
30 -v header_file=logio_auto.h \
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
index 8c2a04a3d5..5deb2323ef 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch
@@ -10,11 +10,11 @@ RP 2014/6/10
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12 12
13Index: rpm-5.4.9/lib/fsm.c 13Index: rpm-5.4.14/lib/fsm.c
14=================================================================== 14===================================================================
15--- rpm-5.4.9.orig/lib/fsm.c 2014-06-10 10:54:08.601049402 +0000 15--- rpm-5.4.14.orig/lib/fsm.c
16+++ rpm-5.4.9/lib/fsm.c 2014-06-10 10:55:45.633046077 +0000 16+++ rpm-5.4.14/lib/fsm.c
17@@ -495,6 +495,11 @@ 17@@ -495,6 +495,11 @@ static int saveHardLink(/*@special@*/ /*
18 } 18 }
19 19
20 if (fsm->goal == IOSM_PKGBUILD) --fsm->li->linksLeft; 20 if (fsm->goal == IOSM_PKGBUILD) --fsm->li->linksLeft;
@@ -26,7 +26,7 @@ Index: rpm-5.4.9/lib/fsm.c
26 fsm->li->filex[fsm->li->linksLeft] = fsm->ix; 26 fsm->li->filex[fsm->li->linksLeft] = fsm->ix;
27 /*@-observertrans -dependenttrans@*/ 27 /*@-observertrans -dependenttrans@*/
28 fsm->li->nsuffix[fsm->li->linksLeft] = fsm->nsuffix; 28 fsm->li->nsuffix[fsm->li->linksLeft] = fsm->nsuffix;
29@@ -1876,8 +1881,13 @@ 29@@ -1878,8 +1883,13 @@ if (!(fsmGetFi(fsm)->mapflags & IOSM_PAY
30 fsm->postpone = iosmFileActionSkipped(fsm->action); 30 fsm->postpone = iosmFileActionSkipped(fsm->action);
31 if (fsm->goal == IOSM_PKGINSTALL || fsm->goal == IOSM_PKGBUILD) { 31 if (fsm->goal == IOSM_PKGINSTALL || fsm->goal == IOSM_PKGBUILD) {
32 /*@-evalorder@*/ /* FIX: saveHardLink can modify fsm */ 32 /*@-evalorder@*/ /* FIX: saveHardLink can modify fsm */
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
index b5ff2637c2..042e412ede 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
@@ -6,11 +6,13 @@ Upstream-Status: Pending
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
9--- rpm-5.4.0/lib/Makefile.am.orig 9Index: rpm-5.4.14/lib/Makefile.am
10+++ rpm-5.4.0/lib/Makefile.am 10===================================================================
11@@ -90,6 +90,9 @@ 11--- rpm-5.4.14.orig/lib/Makefile.am
12 libsql_la_SOURCES = libsql.c 12+++ rpm-5.4.14/lib/Makefile.am
13 libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON) 13@@ -120,6 +120,9 @@ librpm.la: $(librpm_la_OBJECTS) $(librpm
14 #libsql_la_SOURCES = libsql.c
15 #libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON)
14 16
15+# pkglib libraries needs to have usrlib libraries already installed! 17+# pkglib libraries needs to have usrlib libraries already installed!
16+install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES 18+install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
index 4f484c426d..3153f7a386 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
@@ -1,11 +1,11 @@
1 1
2Upstream-Status: Inappropriate [configuration] 2Upstream-Status: Inappropriate [configuration]
3 3
4diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in 4Index: rpm-5.4.14/rpmdb/DB_CONFIG.in
5index 8b94c94..e0b4689 100644 5===================================================================
6--- a/rpmdb/DB_CONFIG.in 6--- rpm-5.4.14.orig/rpmdb/DB_CONFIG.in
7+++ b/rpmdb/DB_CONFIG.in 7+++ rpm-5.4.14/rpmdb/DB_CONFIG.in
8@@ -4,6 +4,7 @@ 8@@ -4,6 +4,7 @@ set_data_dir .
9 set_create_dir . 9 set_create_dir .
10 set_lg_dir ./log 10 set_lg_dir ./log
11 set_tmp_dir ./tmp 11 set_tmp_dir ./tmp
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch b/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
index 7101e5cbda..790a662170 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch
@@ -9,11 +9,11 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
12Index: rpm-5.4.9/lib/depends.c 12Index: rpm-5.4.14/lib/depends.c
13=================================================================== 13===================================================================
14--- rpm-5.4.9.orig/lib/depends.c 14--- rpm-5.4.14.orig/lib/depends.c
15+++ rpm-5.4.9/lib/depends.c 15+++ rpm-5.4.14/lib/depends.c
16@@ -594,7 +594,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea 16@@ -595,7 +595,7 @@ int rpmtsAddInstallElement(rpmts ts, Hea
17 platform = rpmExpand(arch, "-unknown-", os, NULL); 17 platform = rpmExpand(arch, "-unknown-", os, NULL);
18 18
19 rc = rpmPlatformScore(platform, platpat, nplatpat); 19 rc = rpmPlatformScore(platform, platpat, nplatpat);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
index 348a9198dd..a9930d6705 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
@@ -4,10 +4,11 @@ Upstream-Status: Pending
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
7diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac 7Index: rpm-5.4.14/configure.ac
8--- rpm-5.4.9.orig/configure.ac 2012-05-16 12:16:36.589813548 -0500 8===================================================================
9+++ rpm-5.4.9/configure.ac 2012-05-16 12:26:01.070813518 -0500 9--- rpm-5.4.14.orig/configure.ac
10@@ -120,6 +120,9 @@ 10+++ rpm-5.4.14/configure.ac
11@@ -121,6 +121,9 @@ AC_PROG_YACC
11 12
12 AC_PATH_PROG(AS, as, as) 13 AC_PATH_PROG(AS, as, as)
13 14
@@ -17,10 +18,11 @@ diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
17 dnl # GCC specifics 18 dnl # GCC specifics
18 AC_PROG_GCC_TRADITIONAL 19 AC_PROG_GCC_TRADITIONAL
19 AC_ARG_ENABLE(build-pic, 20 AC_ARG_ENABLE(build-pic,
20diff -ur rpm-5.4.9.orig/lua/Makefile.am rpm-5.4.9/lua/Makefile.am 21Index: rpm-5.4.14/lua/Makefile.am
21--- rpm-5.4.9.orig/lua/Makefile.am 2012-04-07 19:15:25.000000000 -0500 22===================================================================
22+++ rpm-5.4.9/lua/Makefile.am 2012-05-16 12:26:19.556856688 -0500 23--- rpm-5.4.14.orig/lua/Makefile.am
23@@ -40,7 +40,7 @@ 24+++ rpm-5.4.14/lua/Makefile.am
25@@ -41,7 +41,7 @@ rpmluac_LDADD = liblua.la
24 26
25 # --- bin2c doesn't need anything but a compiler 27 # --- bin2c doesn't need anything but a compiler
26 bin2c$(EXEEXT): bin2c.c 28 bin2c$(EXEEXT): bin2c.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
index c1516a422a..c7ab2d2bb7 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
@@ -7,10 +7,11 @@ Upstream-Status: Inappropriate [configuration]
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
10diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in 10Index: rpm-5.4.14/macros/macros.in
11--- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500 11===================================================================
12+++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500 12--- rpm-5.4.14.orig/macros/macros.in
13@@ -985,7 +985,7 @@ 13+++ rpm-5.4.14/macros/macros.in
14@@ -1022,7 +1022,7 @@ $_arbitrary_tags_tests Foo:Bar
14 15
15 #============================================================================== 16 #==============================================================================
16 # ---- rpmbuild macros. 17 # ---- rpmbuild macros.
@@ -19,7 +20,7 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
19 20
20 #------------------------------------------------------------------------ 21 #------------------------------------------------------------------------
21 # cmake(...) configuration 22 # cmake(...) configuration
22@@ -997,15 +997,15 @@ 23@@ -1038,15 +1038,15 @@ $_arbitrary_tags_tests Foo:Bar
23 24
24 #------------------------------------------------------------------------ 25 #------------------------------------------------------------------------
25 # perl(...) configuration 26 # perl(...) configuration
@@ -38,7 +39,7 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
38 39
39 #------------------------------------------------------------------------ 40 #------------------------------------------------------------------------
40 # java(...) configuration. 41 # java(...) configuration.
41@@ -1013,11 +1013,11 @@ 42@@ -1054,11 +1054,11 @@ $_arbitrary_tags_tests Foo:Bar
42 43
43 #------------------------------------------------------------------------ 44 #------------------------------------------------------------------------
44 # libtool(...) configuration. 45 # libtool(...) configuration.
@@ -52,12 +53,12 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
52 53
53 #------------------------------------------------------------------------ 54 #------------------------------------------------------------------------
54 # mono(...) configuration. 55 # mono(...) configuration.
55@@ -1029,7 +1029,7 @@ 56@@ -1070,7 +1070,7 @@ $_arbitrary_tags_tests Foo:Bar
56 57
57 #------------------------------------------------------------------------ 58 #------------------------------------------------------------------------
58 # tcl(...) configuration. 59 # tcl(...) configuration.
59-#%%{load:%{_usrlibrpm}/macros.d/tcl} 60-#%%{load:%{_usrlibrpm}/macros.d/tcl}
60+%{load:%{_usrlibrpm}/macros.d/tcl} 61+%{load:%{_usrlibrpm}/macros.d/tcl}
61 62
62 # \endverbatim 63 #------------------------------------------------------------------------
63 #*/ 64 # typelib(...) configuration.
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
index c4b4c03de8..ab6ed2c3a4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
@@ -4,10 +4,11 @@ Upstream-Status: Pending
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
7diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c 7Index: rpm-5.4.14/lib/order.c
8--- rpm-5.4.0.orig/lib/order.c 2010-12-13 17:36:39.000000000 -0600 8===================================================================
9+++ rpm-5.4.0/lib/order.c 2011-08-10 11:11:43.194686332 -0500 9--- rpm-5.4.14.orig/lib/order.c
10@@ -2170,7 +2170,7 @@ 10+++ rpm-5.4.14/lib/order.c
11@@ -2175,7 +2175,7 @@ rescan:
11 const char * dp; 12 const char * dp;
12 rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) 13 rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
13 ? RPMLOG_WARNING : RPMLOG_ERR; 14 ? RPMLOG_WARNING : RPMLOG_ERR;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
index 442afbc43b..58182296cf 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
@@ -9,9 +9,11 @@ Upstream-Status: Inappropriate [disable feature]
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
12--- rpm-5.4.8/configure.ac.orig 2012-04-24 09:10:01.856749153 -0500 12Index: rpm-5.4.14/configure.ac
13+++ rpm-5.4.8/configure.ac 2012-04-24 09:10:35.198731504 -0500 13===================================================================
14@@ -1149,30 +1149,10 @@ 14--- rpm-5.4.14.orig/configure.ac
15+++ rpm-5.4.14/configure.ac
16@@ -1186,30 +1186,10 @@ AC_SUBST(WITH_PERL_SUBDIR)
15 AC_SUBST(WITH_PERL_SUBPACKAGE) 17 AC_SUBST(WITH_PERL_SUBPACKAGE)
16 AC_SUBST(WITH_PERL_LIBS) 18 AC_SUBST(WITH_PERL_LIBS)
17 19
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
index db424b8493..691aba9ea3 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
@@ -8,10 +8,11 @@ Upstream-Status: Inappropriate [disable feature]
8 8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10 10
11diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac 11Index: rpm-5.4.14/configure.ac
12--- rpm-5.4.9.orig/configure.ac 2012-05-17 16:37:20.594790192 -0500 12===================================================================
13+++ rpm-5.4.9/configure.ac 2012-05-17 16:39:23.126933596 -0500 13--- rpm-5.4.14.orig/configure.ac
14@@ -1909,7 +1909,7 @@ 14+++ rpm-5.4.14/configure.ac
15@@ -1951,7 +1951,7 @@ grep -v 'define HAVE_UNISTD_H' confdefs.
15 esac 16 esac
16 RPM_CHECK_LIB( 17 RPM_CHECK_LIB(
17 [OSSP uuid], [uuid], 18 [OSSP uuid], [uuid],
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
index 7e090a3442..c15e12405d 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
@@ -6,11 +6,11 @@ Upstream-Status: Inappropriate [not author]
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
9Index: rpm-5.4.8/rpmdb/hdrfmt.c 9Index: rpm-5.4.14/rpmdb/hdrfmt.c
10=================================================================== 10===================================================================
11--- rpm-5.4.8.orig/rpmdb/hdrfmt.c 11--- rpm-5.4.14.orig/rpmdb/hdrfmt.c
12+++ rpm-5.4.8/rpmdb/hdrfmt.c 12+++ rpm-5.4.14/rpmdb/hdrfmt.c
13@@ -2403,8 +2403,10 @@ static int pkgoriginTag(Header h, HE_t 13@@ -2409,8 +2409,10 @@ static int pkgoriginTag(Header h, HE_t h
14 int rc = 1; 14 int rc = 1;
15 15
16 he->tag = RPMTAG_PACKAGEORIGIN; 16 he->tag = RPMTAG_PACKAGEORIGIN;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch b/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
index fc6b218300..9cd02a0f92 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch
@@ -19,10 +19,11 @@ RP 2014/6/10
19 19
20Upstream-Status: Pending 20Upstream-Status: Pending
21 21
22diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c 22Index: rpm-5.4.14/build/files.c
23--- rpm-5.4.10/build/files.c 2013-03-17 13:17:38.233358389 +0100 23===================================================================
24+++ rpm-5.4.10-collision/build/files.c 2013-03-17 13:07:37.468483625 +0100 24--- rpm-5.4.14.orig/build/files.c
25@@ -1323,6 +1323,26 @@ 25+++ rpm-5.4.14/build/files.c
26@@ -1328,6 +1328,26 @@ static rpmuint32_t getDigestAlgo(Header
26 return dalgo; 27 return dalgo;
27 } 28 }
28 29
@@ -49,7 +50,7 @@ diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
49 /** 50 /**
50 * Add file entries to header. 51 * Add file entries to header.
51 * @todo Should directories have %doc/%config attributes? (#14531) 52 * @todo Should directories have %doc/%config attributes? (#14531)
52@@ -1370,6 +1390,7 @@ 53@@ -1374,6 +1394,7 @@ memset(buf, 0, sizeof(buf)); /* XXX valg
53 54
54 for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) { 55 for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) {
55 const char *s; 56 const char *s;
@@ -57,7 +58,7 @@ diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
57 58
58 /* Merge duplicate entries. */ 59 /* Merge duplicate entries. */
59 while (i < (fl->fileListRecsUsed - 1) && 60 while (i < (fl->fileListRecsUsed - 1) &&
60@@ -1437,6 +1458,13 @@ 61@@ -1436,6 +1457,13 @@ memset(buf, 0, sizeof(buf)); /* XXX valg
61 /* Leave room for both dirname and basename NUL's */ 62 /* Leave room for both dirname and basename NUL's */
62 dpathlen += (strlen(flp->diskURL) + 2); 63 dpathlen += (strlen(flp->diskURL) + 2);
63 64
@@ -71,20 +72,19 @@ diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
71 /* 72 /*
72 * Make the header, the OLDFILENAMES will get converted to a 73 * Make the header, the OLDFILENAMES will get converted to a
73 * compressed file list write before we write the actual package to 74 * compressed file list write before we write the actual package to
74@@ -1519,7 +1547,11 @@ 75@@ -1518,7 +1546,11 @@ memset(buf, 0, sizeof(buf)); /* XXX valg
75 76
76 /* XXX Hash instead of 64b->32b truncate to prevent aliasing. */ 77 /* XXX Hash instead of 64b->32b truncate to prevent aliasing. */
77 { ino_t _ino = flp->fl_ino; 78 { ino_t _ino = flp->fl_ino;
78- ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
79+ /* don't use hash here, as hash collisions which happen on large packages 79+ /* don't use hash here, as hash collisions which happen on large packages
80+ cause bus errors in rpmbuild 80+ cause bus errors in rpmbuild
81+ ui32 = hashFunctionString(0, &_ino, sizeof(_ino)); 81 ui32 = hashFunctionString(0, &_ino, sizeof(_ino));
82+ */ 82+ */
83+ ui32 = fileid + 1; 83+ ui32 = fileid + 1;
84 } 84 }
85 he->tag = RPMTAG_FILEINODES; 85 he->tag = RPMTAG_FILEINODES;
86 he->t = RPM_UINT32_TYPE; 86 he->t = RPM_UINT32_TYPE;
87@@ -1752,39 +1780,6 @@ 87@@ -1751,39 +1783,6 @@ if (_rpmbuildFlags & 4) {
88 IOSM_MAP_TYPE | IOSM_MAP_MODE | IOSM_MAP_UID | IOSM_MAP_GID; 88 IOSM_MAP_TYPE | IOSM_MAP_MODE | IOSM_MAP_UID | IOSM_MAP_GID;
89 if (isSrc) 89 if (isSrc)
90 fi->fmapflags[i] |= IOSM_FOLLOW_SYMLINKS; 90 fi->fmapflags[i] |= IOSM_FOLLOW_SYMLINKS;
@@ -124,9 +124,11 @@ diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
124 } 124 }
125 125
126 ui32 = fl->totalFileSize; 126 ui32 = fl->totalFileSize;
127--- rpm-5.4.10/lib/fsm.c~ 127Index: rpm-5.4.14/lib/fsm.c
128+++ rpm-5.4.10/lib/fsm.c 128===================================================================
129@@ -898,6 +898,7 @@ int fsmMapAttrs(IOSM_t fsm) 129--- rpm-5.4.14.orig/lib/fsm.c
130+++ rpm-5.4.14/lib/fsm.c
131@@ -904,6 +904,7 @@ int fsmMapAttrs(IOSM_t fsm)
130 132
131 if (fi && i >= 0 && i < (int) fi->fc) { 133 if (fi && i >= 0 && i < (int) fi->fc) {
132 mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms); 134 mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms);
@@ -134,7 +136,7 @@ diff -ur rpm-5.4.10/build/files.c rpm-5.4.10-collision/build/files.c
134 mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms); 136 mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms);
135 dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0); 137 dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0);
136 rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0); 138 rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0);
137@@ -937,6 +938,7 @@ int fsmMapAttrs(IOSM_t fsm) 139@@ -943,6 +944,7 @@ int fsmMapAttrs(IOSM_t fsm)
138 if ((S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) 140 if ((S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode))
139 && st->st_nlink == 0) 141 && st->st_nlink == 0)
140 st->st_nlink = 1; 142 st->st_nlink = 1;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
index f192545abb..5d182ad9fe 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
@@ -9,10 +9,11 @@ Upstream-Status: Inappropriate [configuration]
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
12diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh 12Index: rpm-5.4.14/scripts/pkgconfigdeps.sh
13--- rpm-5.4.9.orig/scripts/pkgconfigdeps.sh 2009-02-13 08:13:37.000000000 -0600 13===================================================================
14+++ rpm-5.4.9/scripts/pkgconfigdeps.sh 2012-06-07 17:35:42.730003847 -0500 14--- rpm-5.4.14.orig/scripts/pkgconfigdeps.sh
15@@ -18,8 +18,8 @@ 15+++ rpm-5.4.14/scripts/pkgconfigdeps.sh
16@@ -18,8 +18,8 @@ case $1 in
16 *.pc) 17 *.pc)
17 # Query the dependencies of the package. 18 # Query the dependencies of the package.
18 DIR=`dirname ${filename}` 19 DIR=`dirname ${filename}`
@@ -23,7 +24,7 @@ diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps
23 $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do 24 $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
24 [ -n "$n" ] || continue 25 [ -n "$n" ] || continue
25 # We have a dependency. Make a note that we need the pkgconfig 26 # We have a dependency. Make a note that we need the pkgconfig
26@@ -42,8 +42,8 @@ 27@@ -42,8 +42,8 @@ case $1 in
27 [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" 28 [ -n "$oneshot" ] && echo "$oneshot"; oneshot=""
28 # Query the dependencies of the package. 29 # Query the dependencies of the package.
29 DIR=`dirname ${filename}` 30 DIR=`dirname ${filename}`
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
index 1432b16244..f26a6e79da 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
@@ -4,11 +4,11 @@ information about the platform (cpu/vendor/os). Fixes #3864.
4 4
5Upstream-Status: Inappropriate [embedded specific] 5Upstream-Status: Inappropriate [embedded specific]
6 6
7diff --git a/lib/rpmrc.c b/lib/rpmrc.c 7Index: rpm-5.4.14/lib/rpmrc.c
8index e676601..9140bbe 100644 8===================================================================
9--- a/lib/rpmrc.c 9--- rpm-5.4.14.orig/lib/rpmrc.c
10+++ b/lib/rpmrc.c 10+++ rpm-5.4.14/lib/rpmrc.c
11@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform) 11@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * pl
12 #endif 12 #endif
13 } 13 }
14 14
@@ -16,7 +16,7 @@ index e676601..9140bbe 100644
16 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ 16 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
17 /* do not use vendor and GNU attribution */ 17 /* do not use vendor and GNU attribution */
18 p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); 18 p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
19@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform) 19@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * pl
20 #endif 20 #endif
21 xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); 21 xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre);
22 p = _free(p); 22 p = _free(p);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
index 172510cb9e..11fd039036 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
@@ -6,10 +6,11 @@ This ensures that RPM knows the compatible set of package types at all times.
6 6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 8
9diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c 9Index: rpm-5.4.14/lib/depends.c
10--- rpm-5.4.0.orig/lib/depends.c 2011-02-15 20:40:13.002849708 -0600 10===================================================================
11+++ rpm-5.4.0/lib/depends.c 2011-02-15 20:47:05.838981632 -0600 11--- rpm-5.4.14.orig/lib/depends.c
12@@ -248,7 +248,7 @@ 12+++ rpm-5.4.14/lib/depends.c
13@@ -250,7 +250,7 @@ static int rpmtsAddUpgrades(rpmts ts, rp
13 he->p.ptr = _free(he->p.ptr); 14 he->p.ptr = _free(he->p.ptr);
14 } 15 }
15 16
@@ -18,7 +19,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
18 /* 19 /*
19 * If we're capable of installing multiple colors 20 * If we're capable of installing multiple colors
20 * but at least one of the packages are white (0), we 21 * but at least one of the packages are white (0), we
21@@ -505,7 +505,7 @@ 22@@ -507,7 +507,7 @@ assert(lastx >= 0 && lastx < ts->orderCo
22 return 0; 23 return 0;
23 } 24 }
24 25
@@ -27,7 +28,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
27 /* Is "compat" compatible w/ arch? */ 28 /* Is "compat" compatible w/ arch? */
28 int _isCompatibleArch(const char * arch, const char * compat) 29 int _isCompatibleArch(const char * arch, const char * compat)
29 { 30 {
30@@ -649,7 +649,7 @@ 31@@ -663,7 +663,7 @@ assert(he->p.str != NULL);
31 32
32 if (arch == NULL || (parch = rpmteA(p)) == NULL) 33 if (arch == NULL || (parch = rpmteA(p)) == NULL)
33 continue; 34 continue;
@@ -36,7 +37,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
36 /* XXX hackery for alias matching. */ 37 /* XXX hackery for alias matching. */
37 if (!_isCompatibleArch(arch, parch)) 38 if (!_isCompatibleArch(arch, parch))
38 continue; 39 continue;
39@@ -815,6 +815,12 @@ 40@@ -829,6 +829,12 @@ int rpmtsAddEraseElement(rpmts ts, Heade
40 return rc; 41 return rc;
41 } 42 }
42 43
@@ -49,7 +50,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
49 /*@only@*/ /*@null@*/ /*@unchecked@*/ 50 /*@only@*/ /*@null@*/ /*@unchecked@*/
50 static char *sysinfo_path = NULL; 51 static char *sysinfo_path = NULL;
51 52
52@@ -1296,7 +1302,7 @@ 53@@ -1311,7 +1317,7 @@ retry:
53 sysinfo_path = rpmExpand("%{?_rpmds_sysinfo_path}", NULL); 54 sysinfo_path = rpmExpand("%{?_rpmds_sysinfo_path}", NULL);
54 if (!(sysinfo_path != NULL && *sysinfo_path == '/')) { 55 if (!(sysinfo_path != NULL && *sysinfo_path == '/')) {
55 sysinfo_path = _free(sysinfo_path); 56 sysinfo_path = _free(sysinfo_path);
@@ -58,10 +59,11 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
58 } 59 }
59 } 60 }
60 61
61diff -ur rpm-5.4.0.orig/lib/rpmds.c rpm-5.4.0/lib/rpmds.c 62Index: rpm-5.4.14/lib/rpmds.c
62--- rpm-5.4.0.orig/lib/rpmds.c 2011-02-15 20:40:13.004855352 -0600 63===================================================================
63+++ rpm-5.4.0/lib/rpmds.c 2011-02-15 20:41:55.598846670 -0600 64--- rpm-5.4.14.orig/lib/rpmds.c
64@@ -1737,7 +1737,7 @@ 65+++ rpm-5.4.14/lib/rpmds.c
66@@ -1759,7 +1759,7 @@ int rpmdsSysinfo(rpmPRCO PRCO, const cha
65 /*@-observertrans @*/ 67 /*@-observertrans @*/
66 _sysinfo_path = _free(_sysinfo_path); 68 _sysinfo_path = _free(_sysinfo_path);
67 /*@=observertrans @*/ 69 /*@=observertrans @*/
@@ -70,9 +72,10 @@ diff -ur rpm-5.4.0.orig/lib/rpmds.c rpm-5.4.0/lib/rpmds.c
70 } 72 }
71 } 73 }
72 /*@=modobserver@*/ 74 /*@=modobserver@*/
73diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c 75Index: rpm-5.4.14/lib/rpmrc.c
74--- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600 76===================================================================
75+++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600 77--- rpm-5.4.14.orig/lib/rpmrc.c
78+++ rpm-5.4.14/lib/rpmrc.c
76@@ -38,7 +38,13 @@ 79@@ -38,7 +38,13 @@
77 static const char * configTarget = NULL; 80 static const char * configTarget = NULL;
78 81
@@ -88,7 +91,7 @@ diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
88 91
89 /*@only@*/ /*@relnull@*/ /*@unchecked@*/ 92 /*@only@*/ /*@relnull@*/ /*@unchecked@*/
90 void * platpat = NULL; 93 void * platpat = NULL;
91@@ -685,16 +691,17 @@ 94@@ -694,16 +700,17 @@ static void defaultMachine(/*@out@*/ con
92 int rc; 95 int rc;
93 96
94 while (!gotDefaults) { 97 while (!gotDefaults) {
@@ -113,7 +116,7 @@ diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
113 /* utsname fields on some platforms (like HP-UX) are very small 116 /* utsname fields on some platforms (like HP-UX) are very small
114 (just about 8 characters). This is too small for OpenPKG, so cheat! */ 117 (just about 8 characters). This is too small for OpenPKG, so cheat! */
115 rc = uname(&un_real); 118 rc = uname(&un_real);
116@@ -771,9 +778,7 @@ 119@@ -780,9 +787,7 @@ static void defaultMachine(/*@out@*/ con
117 if (cp != NULL && cp != _platform) 120 if (cp != NULL && cp != _platform)
118 cp = _free(cp); 121 cp = _free(cp);
119 #endif 122 #endif
@@ -123,7 +126,7 @@ diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
123 126
124 if (configTarget && !parseCVOG(configTarget, &cvog) && cvog != NULL) { 127 if (configTarget && !parseCVOG(configTarget, &cvog) && cvog != NULL) {
125 gotDefaults = 1; 128 gotDefaults = 1;
126@@ -1096,6 +1101,8 @@ 129@@ -1101,6 +1106,8 @@ int rpmReadConfigFiles(/*@unused@*/ cons
127 130
128 #ifdef PREMACROFILES 131 #ifdef PREMACROFILES
129 if (rpmReadRC(PREMACROFILES)) return -1; 132 if (rpmReadRC(PREMACROFILES)) return -1;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
index 79124bb6c4..fed54e5f11 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
@@ -13,10 +13,10 @@ ensures reasonable defaults are always available.
13 13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15 15
16Index: rpm-5.4.9/lib/rpmrc.c 16Index: rpm-5.4.14/lib/rpmrc.c
17=================================================================== 17===================================================================
18--- rpm-5.4.9.orig/lib/rpmrc.c 18--- rpm-5.4.14.orig/lib/rpmrc.c
19+++ rpm-5.4.9/lib/rpmrc.c 19+++ rpm-5.4.14/lib/rpmrc.c
20@@ -328,10 +328,15 @@ static void setDefaults(void) 20@@ -328,10 +328,15 @@ static void setDefaults(void)
21 /*@modifies rpmGlobalMacroContext, internalState @*/ 21 /*@modifies rpmGlobalMacroContext, internalState @*/
22 { 22 {
@@ -57,11 +57,11 @@ Index: rpm-5.4.9/lib/rpmrc.c
57 } 57 }
58 58
59 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ 59 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
60Index: rpm-5.4.9/macros/macros.in 60Index: rpm-5.4.14/macros/macros.in
61=================================================================== 61===================================================================
62--- rpm-5.4.9.orig/macros/macros.in 62--- rpm-5.4.14.orig/macros/macros.in
63+++ rpm-5.4.9/macros/macros.in 63+++ rpm-5.4.14/macros/macros.in
64@@ -875,9 +875,9 @@ $_arbitrary_tags_tests Foo:Bar 64@@ -900,9 +900,9 @@ $_arbitrary_tags_tests Foo:Bar
65 %_os @RPMCANONOS@ 65 %_os @RPMCANONOS@
66 %_gnu @RPMCANONGNU@ 66 %_gnu @RPMCANONGNU@
67 67
@@ -74,7 +74,7 @@ Index: rpm-5.4.9/macros/macros.in
74 74
75 #============================================================================== 75 #==============================================================================
76 # ---- configure macros. 76 # ---- configure macros.
77@@ -920,9 +920,10 @@ $_arbitrary_tags_tests Foo:Bar 77@@ -945,9 +945,10 @@ $_arbitrary_tags_tests Foo:Bar
78 %_build_os %{_host_os} 78 %_build_os %{_host_os}
79 %_host @host@ 79 %_host @host@
80 %_host_alias @host_alias@%{nil} 80 %_host_alias @host_alias@%{nil}
@@ -88,10 +88,10 @@ Index: rpm-5.4.9/macros/macros.in
88 %_target %{_host} 88 %_target %{_host}
89 %_target_alias %{_host_alias} 89 %_target_alias %{_host_alias}
90 %_target_cpu %{_host_cpu} 90 %_target_cpu %{_host_cpu}
91Index: rpm-5.4.9/python/rpmmodule.c 91Index: rpm-5.4.14/python/rpmmodule.c
92=================================================================== 92===================================================================
93--- rpm-5.4.9.orig/python/rpmmodule.c 93--- rpm-5.4.14.orig/python/rpmmodule.c
94+++ rpm-5.4.9/python/rpmmodule.c 94+++ rpm-5.4.14/python/rpmmodule.c
95@@ -65,8 +65,8 @@ static PyObject * archScore(PyObject * s 95@@ -65,8 +65,8 @@ static PyObject * archScore(PyObject * s
96 if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch)) 96 if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
97 return NULL; 97 return NULL;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch b/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch
index b65abc24a0..07d407d36a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13 13
14diff --git a/python/rpmmodule.c b/python/rpmmodule.c 14Index: rpm-5.4.14/python/rpmmodule.c
15index f7282bc..dde68ca 100644 15===================================================================
16--- a/python/rpmmodule.c 16--- rpm-5.4.14.orig/python/rpmmodule.c
17+++ b/python/rpmmodule.c 17+++ rpm-5.4.14/python/rpmmodule.c
18@@ -392,7 +392,8 @@ void init_rpm(void) 18@@ -392,7 +392,8 @@ void init_rpm(void)
19 if (Py_AtExit(rpm_exithook) == -1) 19 if (Py_AtExit(rpm_exithook) == -1)
20 return; 20 return;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
index 33ec8e21e1..0a5f5a4d72 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-reloc-macros.patch
@@ -8,10 +8,10 @@ Upstream-Status: Inapproriate (OpenEmbedded specific)
8 8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10 10
11Index: rpm-5.4.9/macros/macros.in 11Index: rpm-5.4.14/macros/macros.in
12=================================================================== 12===================================================================
13--- rpm-5.4.9.orig/macros/macros.in 13--- rpm-5.4.14.orig/macros/macros.in
14+++ rpm-5.4.9/macros/macros.in 14+++ rpm-5.4.14/macros/macros.in
15@@ -27,11 +27,12 @@ 15@@ -27,11 +27,12 @@
16 #============================================================================== 16 #==============================================================================
17 # ---- filesystem macros. 17 # ---- filesystem macros.
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch b/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
index 89ee41001d..769016b564 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
@@ -1,7 +1,7 @@
1diff --git a/syck/lib/syck.h b/syck/lib/syck.h 1Index: rpm-5.4.14/syck/lib/syck.h
2index 04be1d9..73830a6 100644 2===================================================================
3--- a/syck/lib/syck.h 3--- rpm-5.4.14.orig/syck/lib/syck.h
4+++ b/syck/lib/syck.h 4+++ rpm-5.4.14/syck/lib/syck.h
5@@ -621,9 +621,6 @@ long syck_seq_count( SyckNode *seq ) 5@@ -621,9 +621,6 @@ long syck_seq_count( SyckNode *seq )
6 */ 6 */
7 void syckerror( char *msg ) 7 void syckerror( char *msg )
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
index d272fe9cff..56a243d5f7 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
@@ -7,9 +7,11 @@ Upstream-Status: Pending
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
10--- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 10Index: rpm-5.4.14/lib/rpmts.c
11+++ rpm-5.4.0/lib/rpmts.c 2012-04-12 15:01:12.990184067 -0500 11===================================================================
12@@ -403,8 +403,8 @@ 12--- rpm-5.4.14.orig/lib/rpmts.c
13+++ rpm-5.4.14/lib/rpmts.c
14@@ -410,8 +410,8 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __
13 if (sdb == NULL) 15 if (sdb == NULL)
14 continue; 16 continue;
15 17
@@ -20,7 +22,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
20 mi = rpmmiInit(sdb, rpmtag, keyp, keylen); 22 mi = rpmmiInit(sdb, rpmtag, keyp, keylen);
21 while ((h = rpmmiNext(mi)) != NULL) { 23 while ((h = rpmmiNext(mi)) != NULL) {
22 size_t hnamelen; 24 size_t hnamelen;
23@@ -439,6 +439,15 @@ 25@@ -446,6 +446,15 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __
24 bhnamelen = hnamelen; 26 bhnamelen = hnamelen;
25 } 27 }
26 mi = rpmmiFree(mi); 28 mi = rpmmiFree(mi);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
deleted file mode 100644
index 9b63b37fea..0000000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1rpmts.c: respect to the arch priorities
2
3Let rpm respect to the priorities when choose alternatives rpm, the arch
4which comes first is preferred.
5
6Upstream-Status: Pending
7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9---
10 lib/rpmts.c | 14 ++++++++++++++
11 1 files changed, 14 insertions(+), 0 deletions(-)
12
13diff --git a/lib/rpmts.c b/lib/rpmts.c
14index 3fbbc9e..40ec08e 100644
15--- a/lib/rpmts.c
16+++ b/lib/rpmts.c
17@@ -353,6 +353,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void * data)
18 Header h = NULL;
19 size_t bhnamelen = 0;
20 time_t bhtime = 0;
21+ const char *bharch = NULL;
22 rpmTag rpmtag;
23 const char * keyp;
24 size_t keylen = 0;
25@@ -409,6 +410,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
26 while ((h = rpmmiNext(mi)) != NULL) {
27 size_t hnamelen;
28 time_t htime;
29+ const char *harch = NULL;
30
31 if (rpmtag == RPMTAG_PROVIDENAME && !rpmdsAnyMatchesDep(h, ds, 1))
32 continue;
33@@ -431,12 +433,23 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
34 if (htime <= bhtime)
35 continue;
36
37+ /* XXX Respect to the arch priorities */
38+ he->tag = RPMTAG_ARCH;
39+ xx = headerGet(h, he, 0);
40+ harch = ((xx && he->p.str) ? xstrdup(he->p.str) : NULL);
41+ he->p.ptr = _free(he->p.ptr);
42+ if (bharch && (strcmp(bharch, harch) != 0))
43+ continue;
44+
45 /* Save new "best" candidate. */
46 (void)headerFree(bh);
47 bh = NULL;
48 bh = headerLink(h);
49 bhtime = htime;
50 bhnamelen = hnamelen;
51+ bharch = _free(bharch);
52+ bharch = xstrdup(harch);
53+ harch = _free(harch);
54 }
55 mi = rpmmiFree(mi);
56
57@@ -449,6 +462,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
58 } while (1);
59
60 }
61+ bharch = _free(bharch);
62
63 /* Is there a suggested resolution? */
64 if (bh == NULL)
65--
661.7.1
67
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
index f4e42287da..f825372e82 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
@@ -12,11 +12,11 @@ Upstream-Status: Pending
12 12
13Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 13Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
14 14
15Index: rpm-5.4.9/lib/psm.c 15Index: rpm-5.4.14/lib/psm.c
16=================================================================== 16===================================================================
17--- rpm-5.4.9.orig/lib/psm.c 17--- rpm-5.4.14.orig/lib/psm.c
18+++ rpm-5.4.9/lib/psm.c 18+++ rpm-5.4.14/lib/psm.c
19@@ -801,6 +801,10 @@ static rpmRC runScript(rpmpsm psm, Heade 19@@ -806,6 +806,10 @@ static rpmRC runScript(rpmpsm psm, Heade
20 int xx; 20 int xx;
21 int i; 21 int i;
22 22
@@ -27,7 +27,7 @@ Index: rpm-5.4.9/lib/psm.c
27 if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX) 27 if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX)
28 ssp = psm->sstates + ix; 28 ssp = psm->sstates + ix;
29 if (ssp != NULL) 29 if (ssp != NULL)
30@@ -867,14 +871,29 @@ assert(he->p.str != NULL); 30@@ -872,14 +876,29 @@ assert(he->p.str != NULL);
31 (F_ISSET(psm, UNORDERED) ? "a" : "")); 31 (F_ISSET(psm, UNORDERED) ? "a" : ""));
32 32
33 if (Phe->p.argv == NULL) { 33 if (Phe->p.argv == NULL) {
@@ -63,7 +63,7 @@ Index: rpm-5.4.9/lib/psm.c
63 ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path) 63 ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path)
64 ? 1 : 0); 64 ? 1 : 0);
65 } 65 }
66@@ -925,7 +944,12 @@ assert(he->p.str != NULL); 66@@ -930,7 +949,12 @@ assert(he->p.str != NULL);
67 goto exit; 67 goto exit;
68 68
69 if (rpmIsDebug() && 69 if (rpmIsDebug() &&
@@ -77,7 +77,7 @@ Index: rpm-5.4.9/lib/psm.c
77 { 77 {
78 static const char set_x[] = "set -x\n"; 78 static const char set_x[] = "set -x\n";
79 nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); 79 nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
80@@ -1060,12 +1084,22 @@ assert(he->p.str != NULL); 80@@ -1065,12 +1089,22 @@ assert(he->p.str != NULL);
81 81
82 { const char * rootDir = rpmtsRootDir(ts); 82 { const char * rootDir = rpmtsRootDir(ts);
83 if (!rpmtsChrootDone(ts) && rootDir != NULL && 83 if (!rpmtsChrootDone(ts) && rootDir != NULL &&
@@ -100,7 +100,7 @@ Index: rpm-5.4.9/lib/psm.c
100 xx = Chdir("/"); 100 xx = Chdir("/");
101 rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"), 101 rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"),
102 psm->stepName, sln, NVRA, 102 psm->stepName, sln, NVRA,
103@@ -2977,6 +3011,13 @@ assert(psm->te != NULL); 103@@ -2985,6 +3019,13 @@ assert(psm->te != NULL);
104 case PSM_SCRIPT: /* Run current package scriptlets. */ 104 case PSM_SCRIPT: /* Run current package scriptlets. */
105 /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */ 105 /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */
106 { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL); 106 { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
@@ -114,7 +114,7 @@ Index: rpm-5.4.9/lib/psm.c
114 xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL); 114 xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL);
115 rc = runInstScript(psm); 115 rc = runInstScript(psm);
116 if (rc) 116 if (rc)
117@@ -2984,11 +3025,24 @@ assert(psm->te != NULL); 117@@ -2992,11 +3033,24 @@ assert(psm->te != NULL);
118 else 118 else
119 xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); 119 xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
120 rpmtsGetRdb(ts)->db_txn = NULL; 120 rpmtsGetRdb(ts)->db_txn = NULL;
@@ -139,7 +139,7 @@ Index: rpm-5.4.9/lib/psm.c
139 break; 139 break;
140 case PSM_IMMED_TRIGGERS: 140 case PSM_IMMED_TRIGGERS:
141 /* Run triggers in this package other package(s) set off. */ 141 /* Run triggers in this package other package(s) set off. */
142@@ -2998,7 +3052,18 @@ assert(psm->te != NULL); 142@@ -3006,7 +3060,18 @@ assert(psm->te != NULL);
143 F_SET(psm, GOTTRIGGERS); 143 F_SET(psm, GOTTRIGGERS);
144 } 144 }
145 if (psm->triggers != NULL) 145 if (psm->triggers != NULL)
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
index b38b34d9db..ec38b95f2e 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
@@ -4,10 +4,11 @@ Upstream-Status: Pending
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
7diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c 7Index: rpm-5.4.14/lib/rpmrc.c
8--- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600 8===================================================================
9+++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600 9--- rpm-5.4.14.orig/lib/rpmrc.c
10@@ -1216,11 +1223,15 @@ 10+++ rpm-5.4.14/lib/rpmrc.c
11@@ -1228,11 +1228,15 @@ int rpmShowRC(FILE * fp)
11 if (DNEVR != NULL) 12 if (DNEVR != NULL)
12 fprintf(fp, " %s\n", DNEVR+2); 13 fprintf(fp, " %s\n", DNEVR+2);
13 } 14 }
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch b/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
deleted file mode 100644
index d6f43a2c06..0000000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Increase the maximum number of solver databases!
2
3Previously the max was set to 5, up this to 20... this should be more
4then enough for now.. also add an RPM_ERROR message in case we exceed the
5new maximum.
6
7Upstream-Status: Pending
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c
12--- rpm-5.4.0.orig/rpmio/rpmbag.c 2010-10-17 21:43:55.000000000 -0500
13+++ rpm-5.4.0/rpmio/rpmbag.c 2011-02-18 18:46:00.246892502 -0600
14@@ -16,7 +16,7 @@
15 /*@unchecked@*/
16 int _rpmbag_debug = 0;
17
18-static size_t _maxnsdbp = 5;
19+static size_t _maxnsdbp = 20;
20
21 static void rpmbagFini(void * _bag)
22 /*@globals fileSystem @*/
23@@ -70,6 +70,8 @@
24 sdbp[i] = xcalloc(1, sizeof(*sdbp[i]));
25 sdbp[i]->dbmode = dbmode;
26 sdbp[i]->_db = _db;
27+ } else if (bag && bag->sdbp && bag->nsdbp >= _maxnsdbp) {
28+ rpmlog(RPMLOG_ERR, _("Attempted to open more then %d solver databases. Increase _maxnsdbp in rpmio/rpmbag.c\n"), _maxnsdbp);
29 }
30
31 return 0;
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch b/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
deleted file mode 100644
index cbeeb29f52..0000000000
--- a/meta/recipes-devtools/rpm/rpm/rpm-stub-out-git_strerror.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1git: fix: stud-out git_strerror when --without-git
2
3Patch taken from the cvs repo,http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html.
4
5Upstream-Status: Backport
6
7Signed-off-by: Morgan Little <morgan.little@windriver.com>
8
9Server: rpm5.org Name: Jeff Johnson
10Root: /v/rpm/cvs Email: j...@rpm5.org
11Module: rpm Date: 07-Jun-2012 16:17:02
12Branch: rpm-5_4 Handle: 2012060714165803
13
14Modified files: (Branch: rpm-5_4)
15 rpm CHANGES
16 rpm/rpmio rpmgit.c tgit.c
17
18Log:
19 - git: fix: stub-out git_strerror when --without-git.
20
21Summary:
22 Revision Changes Path
23 2.1.2.11 +3 -1 rpm/rpmio/rpmgit.c
24 1.1.2.7 +0 -1 rpm/rpmio/tgit.c
25____________________________________________________________________________
26Index: rpm/rpmio/rpmgit.c
27============================================================================
28--- rpm/rpmio/rpmgit.c
29+++ rpm/rpmio/rpmgit.c
30@@ -145,6 +145,9 @@
31 #endif /* defined(WITH_LIBGT2) */
32
33 /*==============================================================*/
34+#if !defined(WITH_LIBGIT2)
35+#define git_strerror(_rc) ""
36+#endif
37
38 static int Xchkgit(/*@unused@*/ rpmgit git, const char * msg,
39 int error, int printit,
40@@ -157,7 +157,6 @@
41 int rc = error;
42
43 if (printit && rc) {
44- /* XXX git_strerror? */
45 rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
46 func, fn, ln, msg, rc, git_strerror(rc));
47 }
48Index: rpm/rpmio/tgit.c
49============================================================================
50--- rpm/rpmio/tgit.c
51+++ rpm/rpmio/tgit.c
52@@ -34,7 +34,6 @@
53 int rc = error;
54
55 if (printit && rc) {
56- /* XXX git_strerror? */
57 rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
58 func, fn, ln, msg, rc, git_strerror(rc));
59 }
60
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
index e487b821b2..683275cb18 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch
@@ -13,9 +13,10 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com>
13 tagname.c | 16 ++++++++++++++++ 13 tagname.c | 16 ++++++++++++++++
14 1 file changed, 16 insertions(+) 14 1 file changed, 16 insertions(+)
15 15
16diff -urpN a/rpmdb/tagname.c b/rpmdb/tagname.c 16Index: rpm-5.4.14/rpmdb/tagname.c
17--- a/rpmdb/tagname.c 17===================================================================
18+++ b/rpmdb/tagname.c 18--- rpm-5.4.14.orig/rpmdb/tagname.c
19+++ rpm-5.4.14/rpmdb/tagname.c
19@@ -3,6 +3,19 @@ 20@@ -3,6 +3,19 @@
20 */ 21 */
21 22
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
index dd8d8bd5de..cb85bebfc0 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
@@ -3,17 +3,17 @@ Upstream-Status: Pending
3Author: Khem Raj <raj.khem@gmail.com> 3Author: Khem Raj <raj.khem@gmail.com>
4Date: 2011-03-03 4Date: 2011-03-03
5Description: 5Description:
6This patch fixes build issue found when compiling rpm-natibe on ubuntu 6This patch fixes build issue found when compiling rpm-native on ubuntu
711.04-alpha. Problem is that linker does not get correct set of dependent 711.04-alpha. Problem is that linker does not get correct set of dependent
8libraries when linking mtree binary which results in undefined symbols 8libraries when linking mtree binary which results in undefined symbols
9in librpmio.so. This patch adds correct flags to mtree_LDADD to account 9in librpmio.so. This patch adds correct flags to mtree_LDADD to account
10for rpmio deps 10for rpmio deps
11 11
12Index: rpm-5.4.0/tools/Makefile.am 12Index: rpm-5.4.14/tools/Makefile.am
13=================================================================== 13===================================================================
14--- rpm-5.4.0.orig/tools/Makefile.am 14--- rpm-5.4.14.orig/tools/Makefile.am
15+++ rpm-5.4.0/tools/Makefile.am 15+++ rpm-5.4.14/tools/Makefile.am
16@@ -169,7 +169,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON) 16@@ -186,7 +186,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON)
17 17
18 mtree_SOURCES = rpmmtree.c 18 mtree_SOURCES = rpmmtree.c
19 mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) 19 mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
index 600e2c280c..713f84ee27 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
@@ -12,8 +12,10 @@ Upstream-Status: Pending
12Signed-off-by: Morgan Little <morgan.little@windriver.com> 12Signed-off-by: Morgan Little <morgan.little@windriver.com>
13 13
14 14
15--- a/lua/local/luuid.c.orig 15Index: rpm-5.4.14/lua/local/luuid.c
16+++ b/lua/local/luuid.c 16===================================================================
17--- rpm-5.4.14.orig/lua/local/luuid.c
18+++ rpm-5.4.14/lua/local/luuid.c
17@@ -21,7 +21,7 @@ 19@@ -21,7 +21,7 @@
18 20
19 #ifdef LUA_USE_UUID 21 #ifdef LUA_USE_UUID
@@ -23,9 +25,10 @@ Signed-off-by: Morgan Little <morgan.little@windriver.com>
23 25
24 /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */ 26 /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */
25 static int luuid_generate(lua_State *L) 27 static int luuid_generate(lua_State *L)
26 28Index: rpm-5.4.14/rpmio/rpmuuid.c
27--- a/rpmio/rpmuuid.c.orig 29===================================================================
28+++ b/rpmio/rpmuuid.c 30--- rpm-5.4.14.orig/rpmio/rpmuuid.c
31+++ rpm-5.4.14/rpmio/rpmuuid.c
29@@ -16,7 +16,7 @@ 32@@ -16,7 +16,7 @@
30 #include "rpmlog.h" 33 #include "rpmlog.h"
31 #include "rpmuuid.h" 34 #include "rpmuuid.h"
@@ -34,4 +37,4 @@ Signed-off-by: Morgan Little <morgan.little@windriver.com>
34+#include <ossp/uuid.h> 37+#include <ossp/uuid.h>
35 #endif 38 #endif
36 #include "debug.h" 39 #include "debug.h"
37 40
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch b/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
index fddac7a1c0..3492da5b55 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
@@ -7,11 +7,11 @@ A logic error in the query for GHOST files prevented this from working.
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
10Index: rpm-5.4.9/lib/verify.c 10Index: rpm-5.4.14/lib/verify.c
11=================================================================== 11===================================================================
12--- rpm-5.4.9.orig/lib/verify.c 12--- rpm-5.4.14.orig/lib/verify.c
13+++ rpm-5.4.9/lib/verify.c 13+++ rpm-5.4.14/lib/verify.c
14@@ -587,7 +587,7 @@ uint32_t fc = rpmfiFC(fi); 14@@ -589,7 +589,7 @@ uint32_t fc = rpmfiFC(fi);
15 15
16 /* If not verifying %ghost, skip ghost files. */ 16 /* If not verifying %ghost, skip ghost files. */
17 /* XXX the broken!!! logic disables %ghost queries always. */ 17 /* XXX the broken!!! logic disables %ghost queries always. */
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
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 10
11Index: rpm-5.4.0/configure.ac 11Index: rpm-5.4.14/configure.ac
12=================================================================== 12===================================================================
13--- rpm-5.4.0.orig/configure.ac 2012-05-31 15:40:05.985990822 -0700 13--- rpm-5.4.14.orig/configure.ac
14+++ rpm-5.4.0/configure.ac 2012-05-31 15:41:15.601995311 -0700 14+++ rpm-5.4.14/configure.ac
15@@ -800,7 +800,7 @@ 15@@ -943,7 +943,7 @@ AC_CHECK_FUNCS([dnl
16 ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl 16 ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl
17 getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl 17 getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl
18 lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl 18 lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl
19- posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl 19- posix_fadvise posix_fallocate putenv realpath regcomp secure_getenv __secure_getenv dnl
20+ posix_fadvise posix_fallocate putenv realpath regcomp rpmatch __secure_getenv dnl 20+ posix_fadvise posix_fallocate putenv realpath regcomp rpmatch secure_getenv __secure_getenv dnl
21 setattrlist setenv setlocale setmode setxattr dnl 21 setattrlist setenv setlocale setmode setxattr dnl
22 sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl 22 sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl
23 sigprocmask sigsuspend sigaction dnl 23 sigprocmask sigsuspend sigaction dnl
24Index: rpm-5.4.0/system.h 24Index: rpm-5.4.14/system.h
25=================================================================== 25===================================================================
26--- rpm-5.4.0.orig/system.h 2012-05-31 15:40:05.997991504 -0700 26--- rpm-5.4.14.orig/system.h
27+++ rpm-5.4.0/system.h 2012-05-31 15:42:04.941997731 -0700 27+++ rpm-5.4.14/system.h
28@@ -410,6 +410,14 @@ 28@@ -353,6 +353,14 @@ extern int _tolower(int) __THROW /*@*/;
29 #endif /* defined(__GNUC__) */ 29 #include <libgen.h>
30 #endif /* HAVE_MCHECK_H */ 30 #endif
31 31
32+#ifndef HAVE_RPMATCH 32+#ifndef HAVE_RPMATCH
33+#define rpmatch(line) \ 33+#define rpmatch(line) \
@@ -37,6 +37,6 @@ Index: rpm-5.4.0/system.h
37+ -1 ) 37+ -1 )
38+#endif 38+#endif
39+ 39+
40 /* Retrofit glibc __progname */ 40 /* -- Retrofit glibc __progname */
41 #if defined __GLIBC__ && __GLIBC__ >= 2 41 #if defined __GLIBC__ && __GLIBC__ >= 2
42 #if __GLIBC_MINOR__ >= 1 42 #if __GLIBC_MINOR__ >= 1
diff --git a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch b/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch
index f29866b934..9bdd1d4908 100644
--- a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch
@@ -16,11 +16,11 @@ RP 2012/2/7
16 2 files changed, 152 insertions(+), 1 deletions(-) 16 2 files changed, 152 insertions(+), 1 deletions(-)
17 create mode 100644 tools/rpmdeps-oecore.c 17 create mode 100644 tools/rpmdeps-oecore.c
18 18
19Index: rpm-5.4.9/tools/Makefile.am 19Index: rpm-5.4.14/tools/Makefile.am
20=================================================================== 20===================================================================
21--- rpm-5.4.9.orig/tools/Makefile.am 21--- rpm-5.4.14.orig/tools/Makefile.am
22+++ rpm-5.4.9/tools/Makefile.am 22+++ rpm-5.4.14/tools/Makefile.am
23@@ -58,7 +58,7 @@ pkgbin_PROGRAMS = \ 23@@ -62,7 +62,7 @@ pkgbin_PROGRAMS = \
24 @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \ 24 @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \
25 @WITH_SEMANAGE_SEMODULE@ wget \ 25 @WITH_SEMANAGE_SEMODULE@ wget \
26 rpmcache rpmdigest rpmrepo rpmspecdump \ 26 rpmcache rpmdigest rpmrepo rpmspecdump \
@@ -29,7 +29,7 @@ Index: rpm-5.4.9/tools/Makefile.am
29 if WITH_DB 29 if WITH_DB
30 pkgbin_PROGRAMS += dbconvert 30 pkgbin_PROGRAMS += dbconvert
31 endif 31 endif
32@@ -168,6 +168,10 @@ rpmdeps_SOURCES = rpmdeps.c 32@@ -172,6 +172,10 @@ rpmdeps_SOURCES = rpmdeps.c
33 rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) 33 rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
34 rpmdeps_LDADD = $(RPM_LDADD_COMMON) 34 rpmdeps_LDADD = $(RPM_LDADD_COMMON)
35 35
@@ -40,10 +40,10 @@ Index: rpm-5.4.9/tools/Makefile.am
40 rpmdigest_SOURCES = rpmdigest.c 40 rpmdigest_SOURCES = rpmdigest.c
41 rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) 41 rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
42 rpmdigest_LDADD = $(RPMIO_LDADD_COMMON) 42 rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
43Index: rpm-5.4.9/tools/rpmdeps-oecore.c 43Index: rpm-5.4.14/tools/rpmdeps-oecore.c
44=================================================================== 44===================================================================
45--- /dev/null 45--- /dev/null
46+++ rpm-5.4.9/tools/rpmdeps-oecore.c 46+++ rpm-5.4.14/tools/rpmdeps-oecore.c
47@@ -0,0 +1,147 @@ 47@@ -0,0 +1,147 @@
48+#include "system.h" 48+#include "system.h"
49+const char *__progname; 49+const char *__progname;
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
4 4
5Signed-off-by: Khem Raj <raj.khem@gmail.com> 5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 6
7Index: rpm-5.4.9/rpmio/rpmio.h 7Index: rpm-5.4.14/rpmio/rpmio.h
8=================================================================== 8===================================================================
9--- rpm-5.4.9.orig/rpmio/rpmio.h 2010-09-29 07:54:30.000000000 -0700 9--- rpm-5.4.14.orig/rpmio/rpmio.h
10+++ rpm-5.4.9/rpmio/rpmio.h 2012-06-12 07:29:19.610745014 -0700 10+++ rpm-5.4.14/rpmio/rpmio.h
11@@ -23,7 +23,8 @@ 11@@ -23,7 +23,8 @@
12 */ 12 */
13 /*@{*/ 13 /*@{*/
@@ -18,11 +18,11 @@ Index: rpm-5.4.9/rpmio/rpmio.h
18 #define USE_COOKIE_SEEK_POINTER 1 18 #define USE_COOKIE_SEEK_POINTER 1
19 typedef _IO_off64_t _libio_off_t; 19 typedef _IO_off64_t _libio_off_t;
20 typedef _libio_off_t * _libio_pos_t; 20 typedef _libio_off_t * _libio_pos_t;
21Index: rpm-5.4.9/system.h 21Index: rpm-5.4.14/system.h
22=================================================================== 22===================================================================
23--- rpm-5.4.9.orig/system.h 2012-04-26 10:46:49.000000000 -0700 23--- rpm-5.4.14.orig/system.h
24+++ rpm-5.4.9/system.h 2012-06-12 07:30:08.242747422 -0700 24+++ rpm-5.4.14/system.h
25@@ -410,7 +410,7 @@ 25@@ -481,7 +481,7 @@ extern void muntrace (void)
26 #endif /* defined(__LCLINT__) */ 26 #endif /* defined(__LCLINT__) */
27 27
28 /* Memory allocation via macro defs to get meaningful locations from mtrace() */ 28 /* Memory allocation via macro defs to get meaningful locations from mtrace() */
@@ -31,11 +31,11 @@ Index: rpm-5.4.9/system.h
31 #define xmalloc(_size) (malloc(_size) ? : vmefail(_size)) 31 #define xmalloc(_size) (malloc(_size) ? : vmefail(_size))
32 #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size)) 32 #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size))
33 #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size)) 33 #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size))
34Index: rpm-5.4.9/lib/librpm.vers 34Index: rpm-5.4.14/lib/librpm.vers
35=================================================================== 35===================================================================
36--- rpm-5.4.9.orig/lib/librpm.vers 2011-04-10 15:55:23.000000000 -0700 36--- rpm-5.4.14.orig/lib/librpm.vers
37+++ rpm-5.4.9/lib/librpm.vers 2012-06-12 07:29:19.610745014 -0700 37+++ rpm-5.4.14/lib/librpm.vers
38@@ -405,6 +405,10 @@ 38@@ -405,6 +405,10 @@ LIBRPM_0
39 specedit; 39 specedit;
40 strict_erasures; 40 strict_erasures;
41 XrpmtsiInit; 41 XrpmtsiInit;
@@ -46,14 +46,14 @@ Index: rpm-5.4.9/lib/librpm.vers
46 local: 46 local:
47 *; 47 *;
48 }; 48 };
49Index: rpm-5.4.9/rpmio/librpmio.vers 49Index: rpm-5.4.14/rpmio/librpmio.vers
50=================================================================== 50===================================================================
51--- rpm-5.4.9.orig/rpmio/librpmio.vers 2012-05-07 07:38:23.000000000 -0700 51--- rpm-5.4.14.orig/rpmio/librpmio.vers
52+++ rpm-5.4.9/rpmio/librpmio.vers 2012-06-12 07:29:19.626745024 -0700 52+++ rpm-5.4.14/rpmio/librpmio.vers
53@@ -994,6 +994,10 @@ 53@@ -1056,6 +1056,10 @@ LIBRPMIO_0
54 mongo_simple_int_command; 54 mongo_write_concern_set_mode;
55 mongo_simple_str_command; 55 mongo_write_concern_set_w;
56 mongo_update; 56 mongo_write_concern_set_wtimeout;
57+ xmalloc; 57+ xmalloc;
58+ xrealloc; 58+ xrealloc;
59+ xcalloc; 59+ xcalloc;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 690d8b423a..e1c6abb3d8 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -42,12 +42,11 @@ HOMEPAGE = "http://rpm5.org/"
42LICENSE = "LGPLv2.1" 42LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" 45DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native"
46PR = "r63"
47 46
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 47# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 48# in order to extract the distribution SRPM into a format we can extract...
50SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;extract=rpm-5.4.9.tar.gz \ 49SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;extract=rpm-5.4.14.tar.gz \
51 file://rpm-log-auto-rm.patch \ 50 file://rpm-log-auto-rm.patch \
52 file://rpm-db-reduce.patch \ 51 file://rpm-db-reduce.patch \
53 file://perfile_rpmdeps.sh \ 52 file://perfile_rpmdeps.sh \
@@ -56,7 +55,6 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
56 file://header-include-fix.patch \ 55 file://header-include-fix.patch \
57 file://rpm-platform.patch \ 56 file://rpm-platform.patch \
58 file://rpm-showrc.patch \ 57 file://rpm-showrc.patch \
59 file://rpm-solvedb.patch \
60 file://rpm-tools-mtree-LDFLAGS.patch \ 58 file://rpm-tools-mtree-LDFLAGS.patch \
61 file://rpm-fileclass.patch \ 59 file://rpm-fileclass.patch \
62 file://rpm-canonarch.patch \ 60 file://rpm-canonarch.patch \
@@ -65,7 +63,6 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
65 file://pythondeps.sh \ 63 file://pythondeps.sh \
66 file://rpmdeps-oecore.patch \ 64 file://rpmdeps-oecore.patch \
67 file://rpm-resolvedep.patch \ 65 file://rpm-resolvedep.patch \
68 file://rpm-respect-arch.patch \
69 file://rpm-no-perl-urpm.patch \ 66 file://rpm-no-perl-urpm.patch \
70 file://rpm-macros.patch \ 67 file://rpm-macros.patch \
71 file://rpm-lua.patch \ 68 file://rpm-lua.patch \
@@ -78,7 +75,6 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
78 file://dbconvert.patch \ 75 file://dbconvert.patch \
79 file://rpm-uuid-include.patch \ 76 file://rpm-uuid-include.patch \
80 file://makefile-am-exec-hook.patch \ 77 file://makefile-am-exec-hook.patch \
81 file://rpm-stub-out-git_strerror.patch \
82 file://rpm-db_buffer_small.patch \ 78 file://rpm-db_buffer_small.patch \
83 file://rpm-py-init.patch \ 79 file://rpm-py-init.patch \
84 file://python-rpm-rpmsense.patch \ 80 file://python-rpm-rpmsense.patch \
@@ -93,6 +89,8 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
93 file://rpm-verify-files.patch \ 89 file://rpm-verify-files.patch \
94 file://rpm-hardlink-segfault-fix.patch \ 90 file://rpm-hardlink-segfault-fix.patch \
95 file://rpm-payload-use-hashed-inode.patch \ 91 file://rpm-payload-use-hashed-inode.patch \
92 file://rpm-fix-logio-cp.patch \
93 file://rpm-db5-or-db6.patch \
96 " 94 "
97 95
98# Uncomment the following line to enable platform score debugging 96# Uncomment the following line to enable platform score debugging
@@ -100,8 +98,8 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
100# to process certain package feeds. 98# to process certain package feeds.
101#SRC_URI += "file://rpm-debug-platform.patch" 99#SRC_URI += "file://rpm-debug-platform.patch"
102 100
103SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 101SRC_URI[md5sum] = "25093d399a0b5d1342d24900a91b347d"
104SRC_URI[sha256sum] = "bac7cc5bd9d0e8262fdc0099349924608da8f680f5cb243751f696552239dde8" 102SRC_URI[sha256sum] = "676e3ab41f72e3b504e04109cfb565a300742f56a7da084f202013b30eeae467"
105 103
106inherit autotools gettext 104inherit autotools gettext
107 105
@@ -143,7 +141,7 @@ PACKAGECONFIG[db] = "${WITH_DB},--without-db,db,"
143 141
144PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," 142PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3,"
145 143
146PACKAGECONFIG[beecrypt] = "--with-beecrypt,--without-beecrypt,beecrypt," 144PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--without-beecrypt,beecrypt,"
147PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," 145PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
148PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," 146PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
149PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," 147PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
@@ -201,7 +199,8 @@ EXTRA_OECONF += "--verbose \
201 --with-path-macros=${rpm_macros} \ 199 --with-path-macros=${rpm_macros} \
202 --with-path-lib=${libdir}/rpm \ 200 --with-path-lib=${libdir}/rpm \
203 --with-bugreport=http://bugzilla.yoctoproject.org \ 201 --with-bugreport=http://bugzilla.yoctoproject.org \
204 --program-prefix=" 202 --program-prefix= \
203 YACC=byacc"
205 204
206CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE" 205CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE"
207 206
@@ -391,6 +390,8 @@ do_configure() {
391 sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \ 390 sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \
392 -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure 391 -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure
393 392
393 ( cd ${S}/syck ; set +e ; rm -- -l* ; make distclean ) || :
394
394 export varprefix=${localstatedir} 395 export varprefix=${localstatedir}
395 oe_runconf 396 oe_runconf
396} 397}