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>
This commit is contained in:
Mark Hatle 2014-05-26 22:15:15 -04:00 committed by Richard Purdie
parent c60886f9f5
commit 47afe5bcfa
2 changed files with 23 additions and 0 deletions

View File

@ -0,0 +1,22 @@
lib/verify.c: Fix rpm -V file processing
rpm -V should verify the md5sum and other values on individual files.
A logic error in the query for GHOST files prevented this from working.
[ Upstream-Status: Submitted ]
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Index: rpm-5.4.9/lib/verify.c
===================================================================
--- rpm-5.4.9.orig/lib/verify.c
+++ rpm-5.4.9/lib/verify.c
@@ -587,7 +587,7 @@ uint32_t fc = rpmfiFC(fi);
/* If not verifying %ghost, skip ghost files. */
/* XXX the broken!!! logic disables %ghost queries always. */
- if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)))
+ if (!(FF_ISSET(qva->qva_fflags, GHOST)) && FF_ISSET(fflags, GHOST))
continue;
/* Gather per-file data into a carrier. */

View File

@ -89,6 +89,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
file://debugedit-valid-file-to-fix-segment-fault.patch \
file://rpm-platform-file-fix.patch \
file://rpm-lsb-compatibility.patch \
file://rpm-verify-files.patch \
"
# Uncomment the following line to enable platform score debugging