RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 14-May-2014 23:19:44
Branch: rpm-5_4 Handle: 2014051421194101
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/lib verify.c
Log:
- verify: fix: broken logic for %ghost avoidance (Mark Hatle).
Summary:
Revision Changes Path
1.3501.2.395+1 -0 rpm/CHANGES
2.201.4.11 +1 -2 rpm/lib/verify.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.394 -r1.3501.2.395 CHANGES
--- rpm/CHANGES 13 May 2014 02:08:49 -0000 1.3501.2.394
+++ rpm/CHANGES 14 May 2014 21:19:41 -0000 1.3501.2.395
@@ -1,4 +1,5 @@
5.4.14 -> 5.4.15:
+ - jbj: verify: fix: broken logic for %ghost avoidance (Mark Hatle).
- jbj: gc: prefer/use non-repudiable ecdsa signature.
- jbj: ltc: ensure bit counts are correct.
- jbj: ssl: ensure bit counts are correct.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/verify.c
============================================================================
$ cvs diff -u -r2.201.4.10 -r2.201.4.11 verify.c
--- rpm/lib/verify.c 6 Jun 2012 20:50:41 -0000 2.201.4.10
+++ rpm/lib/verify.c 14 May 2014 21:19:42 -0000 2.201.4.11
@@ -588,8 +588,7 @@
continue;
/* 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. */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
