From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 22 Sep 2012 16:43:15 +0000 (+0200)
Subject: - fix test that effectively disabled any type of file verification
X-Git-Tag: auto/th/rpm-5.4.10-5
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7f7a3f24d8f0c9b730ccb97e0038514af07f0cb5;p=packages%2Frpm.git

- fix test that effectively disabled any type of file verification
- release 5
---

diff --git a/rpm-verify-ghosts-broken-logic.patch b/rpm-verify-ghosts-broken-logic.patch
new file mode 100644
index 0000000..07b6ab7
--- /dev/null
+++ b/rpm-verify-ghosts-broken-logic.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10/lib/verify.c.orig	2012-09-22 18:33:59.791810053 +0200
++++ rpm-5.4.10/lib/verify.c	2012-09-22 18:33:34.921810920 +0200
+@@ -594,7 +594,7 @@
+ 
+ 	/* 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. */
diff --git a/rpm.spec b/rpm.spec
index cff8c02..3e0ee20 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -48,7 +48,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	4
+Release:	5
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -132,6 +132,7 @@ Patch44:	%{name}-missing-patch-file-fails-build.patch
 Patch45:	%{name}-remove-misleading-missing-patch-message.patch
 Patch46:	%{name}-file-magic-can-be-mixed-case.patch
 Patch47:	%{name}-query-file-always-noisy.patch
+Patch48:	%{name}-verify-ghosts-broken-logic.patch
 
 # Patches imported from Mandriva
 
@@ -805,6 +806,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
 
 %patch1000 -p1
 %patch1001 -p1