[SCM] kgpg packaging branch, master, updated. debian/4.8.4-2-4-ge063714

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kgpg.git;a=commitdiff;h=fd784e1

The following commit has been merged in the master branch:
commit fd784e1bb7fd6ecbbffe5e5ebba5fc257fe44baf
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 30 14:12:20 2012 +0200

    fix the comparison of keys (#679635)
    
    backport upstream commit 2d252cf08c51866a6acebe705db11b29941691bf
---
 debian/changelog                                   |    3 +
 debian/patches/series                              |    1 +
 ...fix-key-comparison-returning-wrong-values.patch |   43 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6874322..bf77d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ kgpg (4:4.8.4-3) UNRELEASED; urgency=low
   * Backport upstream commit a3b0cb755ff08721a3b9e2c25d4aaf655fb40804 to fix
     a crash when setting a new default key; patch
     upstream_fix-NULL-deref-when-new-setting-default-key.patch.
+  * Backport upstream commit 2d252cf08c51866a6acebe705db11b29941691bf to fix
+    the comparison of keys; patch
+    upstream_fix-key-comparison-returning-wrong-values.patch. (Closes: #679635)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Jun 2012 14:01:10 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 47210f2..33f57e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream_fix-NULL-deref-when-new-setting-default-key.patch
+upstream_fix-key-comparison-returning-wrong-values.patch
diff --git a/debian/patches/upstream_fix-key-comparison-returning-wrong-values.patch b/debian/patches/upstream_fix-key-comparison-returning-wrong-values.patch
new file mode 100644
index 0000000..9049900
--- /dev/null
+++ b/debian/patches/upstream_fix-key-comparison-returning-wrong-values.patch
@@ -0,0 +1,43 @@
+From 2d252cf08c51866a6acebe705db11b29941691bf Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <kde at opensource.sf-tec.de>
+Date: Mon, 11 Jun 2012 19:29:12 +0200
+Subject: [PATCH 2/3] fix key comparison returning wrong values
+
+This fixes a regression introduced in 4.8.2 with commit
+2a100ae8d203107d17e438f67f65d26a4949cccc when trying to fix bug 292405.
+
+BUGS:298465,301618
+CCBUG:292405
+---
+ core/KGpgKeyNode.cpp |   12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/core/KGpgKeyNode.cpp b/core/KGpgKeyNode.cpp
+index 78a12c5..ea04698 100644
+--- a/core/KGpgKeyNode.cpp
++++ b/core/KGpgKeyNode.cpp
+@@ -334,14 +334,16 @@ bool
+ KGpgKeyNode::compareId(const QString &other) const
+ {
+ 	if (other.length() == m_key->fullId().length())
+-		return other.compare(m_key->fullId(), Qt::CaseInsensitive);
++		return (other.compare(m_key->fullId(), Qt::CaseInsensitive) == 0);
+ 
+ 	if (other.length() == m_key->fingerprint().length())
+-		return other.compare(m_key->fingerprint(), Qt::CaseInsensitive);
++		return (other.compare(m_key->fingerprint(), Qt::CaseInsensitive) == 0);
+ 
+-	return other.right(m_key->fullId().length()).compare(
+-			m_key->fullId().right(other.length()),
+-			Qt::CaseInsensitive);
++	const QString comId = m_key->fullId().isEmpty() ? m_key->fingerprint() : m_key->fullId();
++
++	return (other.right(comId.length()).compare(
++			comId.right(other.length()),
++			Qt::CaseInsensitive) == 0);
+ }
+ 
+ void
+-- 
+1.7.10
+

-- 
kgpg packaging