Correct key handling.

(Portage version: 2.0.54)

5 files changed, 74 insertions, 14 deletions

diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog
index 29d2af403f51..bf9b29a6393a 100644
--- a/kde-base/libkpgp/ChangeLog
+++ b/kde-base/libkpgp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkpgp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.28 2006/03/28 01:12:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.29 2006/04/22 10:59:45 carlo Exp $
+
+*libkpgp-3.5.0-r1 (22 Apr 2006)
+
+  22 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/libkpgp-3.5.0-fixes.diff, +libkpgp-3.5.0-r1.ebuild:
+  Correct key handling.
 
   28 Mar 2006; Aron Griffis <agriffis@gentoo.org> libkpgp-3.5.0.ebuild:
   Mark 3.5.0 ~ia64
diff --git a/kde-base/libkpgp/Manifest b/kde-base/libkpgp/Manifest
index 67bb933db87d..7d5e10560fcd 100644
--- a/kde-base/libkpgp/Manifest
+++ b/kde-base/libkpgp/Manifest
@@ -1,18 +1,9 @@
-MD5 f32a07809253cbc5cf46e93ce4cc4ead ChangeLog 3566
-RMD160 d30250f17af7e0e092223ae8b579efc24d931696 ChangeLog 3566
-SHA256 02ac40f9c5a81c848dc9a3c71795f2c10c3818d850a123485b1d48a11ec06d42 ChangeLog 3566
+MD5 6cd63be37535bc2688b58a95f8f7a7f4 ChangeLog 3734
 MD5 b03ca533896a4383a0c3c23c4bcf533e files/digest-libkpgp-3.4.1 208
-RMD160 70aa9d5e7dd5a6656e69b4acfac91d783053df6f files/digest-libkpgp-3.4.1 208
-SHA256 4ae416a2164284ac58466b12405f9da0424ca398f4c3fd358f12c3be36570084 files/digest-libkpgp-3.4.1 208
 MD5 0b5d543dd13db98ba9001990b2e77964 files/digest-libkpgp-3.5.0 67
-RMD160 73aaed576f1e6200d79acd771170b16dce103cc6 files/digest-libkpgp-3.5.0 67
-SHA256 4de1bac7db38497f0b1e4796a5bce40b3c2a3f55dd1e573b74bcdb93510d220b files/digest-libkpgp-3.5.0 67
+MD5 0b5d543dd13db98ba9001990b2e77964 files/digest-libkpgp-3.5.0-r1 67
+MD5 6104e5b0fccd5613ed238defd0b9a0b2 files/libkpgp-3.5.0-fixes.diff 2012
 MD5 99b858589798f9821ec350e029e10507 libkpgp-3.4.1.ebuild 415
-RMD160 ee1d6603b7d630115707dcd0faad8e7f05e53039 libkpgp-3.4.1.ebuild 415
-SHA256 eeefee4135fba58e30bf5a0d663429d298f5c94b0853d5c49b55f88fc7bbd75e libkpgp-3.4.1.ebuild 415
+MD5 de563338f74c00fe24c800bcb7e5b342 libkpgp-3.5.0-r1.ebuild 468
 MD5 c2233684b9d902f5f37778a8d6c4d0e1 libkpgp-3.5.0.ebuild 421
-RMD160 c5950e961226ac77010d5def85b65f230c84b403 libkpgp-3.5.0.ebuild 421
-SHA256 df367b467366dc268ead2cf080216e331b3c9963fc3e7b361c0a44f3a2323fe5 libkpgp-3.5.0.ebuild 421
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1 b/kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1
new file mode 100644
index 000000000000..8cfd9db2e7e4
--- /dev/null
+++ b/kde-base/libkpgp/files/digest-libkpgp-3.5.0-r1
@@ -0,0 +1 @@
+MD5 e19a2a40e422ecd483884ce6e9ac8925 kdepim-3.5.0.tar.bz2 12865623
diff --git a/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff b/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff
new file mode 100644
index 000000000000..85d5008f4c41
--- /dev/null
+++ b/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff
@@ -0,0 +1,47 @@
+--- kdepim/libkpgp/kpgpbase2.cpp	2005/07/26 18:54:59	438982
++++ kdepim/libkpgp/kpgpbase2.cpp	2006/04/15 12:39:26	530112
+@@ -863,9 +863,9 @@
+           validity = KPGP_VALIDITY_FULL;
+       else if( !strncmp( str.data() + index+21, "marginal", 8 ) )
+         validity = KPGP_VALIDITY_MARGINAL;
+-      else if( !strncmp( str.data() + index+21, "never", 8 ) )
++      else if( !strncmp( str.data() + index+21, "never", 5 ) )
+         validity = KPGP_VALIDITY_NEVER;
+-      else if( !strncmp( str.data() + index+21, "undefined", 8 ) )
++      else if( !strncmp( str.data() + index+21, "undefined", 9 ) )
+         validity = KPGP_VALIDITY_UNDEFINED;
+ 
+       // determine the user ID
+--- kdepim/libkpgp/kpgpbase6.cpp	2005/07/26 18:54:59	438982
++++ kdepim/libkpgp/kpgpbase6.cpp	2006/04/15 12:39:26	530112
+@@ -634,8 +634,8 @@
+         }
+       }
+       // store the global key capabilities
+-      canSign |= sign;
+-      canEncr |= encr;
++      canSign = canSign || sign;
++      canEncr = canEncr || encr;
+     }
+     else if( !strncmp( output.data() + offset, "Unknown type", 12 ) )
+     { // line contains key data of unknown type (ignored)
+--- kdepim/libkpgp/kpgpui.cpp	2005/07/26 18:54:59	438982
++++ kdepim/libkpgp/kpgpui.cpp	2006/04/15 12:39:26	530112
+@@ -985,7 +985,7 @@
+     kdDebug(5100) << "Selected keys: " << newKeyIdList.toStringList().join(", ") << endl;
+     mKeyIds = newKeyIdList;
+     if( !keysToBeChecked.isEmpty() ) {
+-      keysAllowed &= checkKeys( keysToBeChecked );
++      keysAllowed = keysAllowed && checkKeys( keysToBeChecked );
+     }
+     enableButtonOK( keysAllowed );
+ 
+@@ -1016,7 +1016,7 @@
+     pProgressDlg->setLabel( i18n("Checking key 0x%1...")
+                             .arg( getKeyId( *it ) ) );
+     kapp->processEvents();
+-    keysAllowed &= ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
++    keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
+     pProgressDlg->progressBar()->advance( 1 );
+     kapp->processEvents();
+   }
diff --git a/kde-base/libkpgp/libkpgp-3.5.0-r1.ebuild b/kde-base/libkpgp/libkpgp-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..82a354a5b748
--- /dev/null
+++ b/kde-base/libkpgp/libkpgp-3.5.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-3.5.0-r1.ebuild,v 1.1 2006/04/22 10:59:45 carlo Exp $
+
+KMNAME=kdepim
+MAXKDEVER=3.5.2
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE pgp abstraction library"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND=""
+
+PATCHES="${FILESDIR}/libkpgp-3.5.0-fixes.diff"
\ No newline at end of file