summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-05-26 22:15:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 11:05:31 +0100
commit47afe5bcfabff3acc6502f9ec502d18e652d033a (patch)
tree280ffd81a52db1fef925e3a0271945e85ec607a6 /meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
parentc60886f9f5ce046da9259a2b2a9b907351dfc259 (diff)
downloadpoky-47afe5bcfabff3acc6502f9ec502d18e652d033a.tar.gz
rpm: Fix rpm -V usage
[YOCTO #6309] It appears a logic issue has caused rpm -V to no longer verify the files on the filesystem match what was installed. (From OE-Core master rev: 117862cd0eebf6887c2ea6cc353432caee2653aa) (From OE-Core rev: 9f9bcad51381887819d58ffdde2e41307d342473) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch b/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
new file mode 100644
index 0000000000..fddac7a1c0
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-verify-files.patch
@@ -0,0 +1,22 @@
1lib/verify.c: Fix rpm -V file processing
2
3rpm -V should verify the md5sum and other values on individual files.
4A logic error in the query for GHOST files prevented this from working.
5
6[ Upstream-Status: Submitted ]
7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9
10Index: rpm-5.4.9/lib/verify.c
11===================================================================
12--- rpm-5.4.9.orig/lib/verify.c
13+++ rpm-5.4.9/lib/verify.c
14@@ -587,7 +587,7 @@ uint32_t fc = rpmfiFC(fi);
15
16 /* If not verifying %ghost, skip ghost files. */
17 /* XXX the broken!!! logic disables %ghost queries always. */
18- if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)))
19+ if (!(FF_ISSET(qva->qva_fflags, GHOST)) && FF_ISSET(fflags, GHOST))
20 continue;
21
22 /* Gather per-file data into a carrier. */