diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:18:52 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:10:35 +0100 |
commit | b2381b63b94604fdc0e1a7591c854dc1df3ca8f4 (patch) | |
tree | 27dcac6f2750215e7395868fdd84aedadebc4e0b /meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch | |
parent | 99822cd4a01342565f803678baba49d74192b7d1 (diff) | |
download | poky-b2381b63b94604fdc0e1a7591c854dc1df3ca8f4.tar.gz |
rpm: Upgrade RPM to 5.4.8 (db to 5.3.15)
RPM 5.4.8 requires db 5.3.x, so both are upgraded together.
(From OE-Core rev: c5898ef3fc3820ff9c44bc5b1b16e5def64aa877)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch b/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch deleted file mode 100644 index 87a92eb9a1..0000000000 --- a/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | From: Qing He <qing.he@intel.com> | ||
4 | Subject: [PATCH] rpm 5.4.0: Fix pointer mishandling | ||
5 | |||
6 | In fpLookupSubdir, data returned by hash should be of type | ||
7 | "struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid | ||
8 | segfault. | ||
9 | |||
10 | Signed-off-by: Qing He <qing.he@intel.com> | ||
11 | |||
12 | diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c | ||
13 | index 0e76148..82b8f45 100644 | ||
14 | --- a/rpmdb/fprint.c | ||
15 | +++ b/rpmdb/fprint.c | ||
16 | @@ -333,7 +333,7 @@ restart: | ||
17 | *te = '\0'; | ||
18 | |||
19 | while (te < se) { | ||
20 | - struct rpmffi_s * recs; | ||
21 | + struct rpmffi_s ** recs; | ||
22 | int numRecs; | ||
23 | int i; | ||
24 | |||
25 | @@ -346,8 +346,8 @@ restart: | ||
26 | const char * link; | ||
27 | int fx; | ||
28 | |||
29 | - fx = recs[i].fileno; | ||
30 | - fi = recs[i].p->fi; | ||
31 | + fx = recs[i]->fileno; | ||
32 | + fi = recs[i]->p->fi; | ||
33 | flink = fi->flinks[fx]; | ||
34 | if (!(flink && *flink != '\0')) | ||
35 | continue; | ||