summaryrefslogtreecommitdiff
path: root/deskutils/kdepim3
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2005-11-10 06:41:53 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2005-11-10 06:41:53 +0000
commit67503ca4d78952a45a8651b89201203be9637495 (patch)
tree27a266010c1e8da8c7b05502bb3e3fcd6366aab3 /deskutils/kdepim3
parentUpdate to 0.22.3. (diff)
Fix KDE Bug 99089 (inline PGP signed messages not working in kmail).
Stumbled over by: Peter Losher
Notes
Notes: svn path=/head/; revision=147806
Diffstat (limited to 'deskutils/kdepim3')
-rw-r--r--deskutils/kdepim3/Makefile1
-rw-r--r--deskutils/kdepim3/files/patch-kmail_kresolver.cpp14
2 files changed, 15 insertions, 0 deletions
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index c721487a01cf..43fdda4d9d1f 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdepim3/files/patch-kmail_kresolver.cpp b/deskutils/kdepim3/files/patch-kmail_kresolver.cpp
new file mode 100644
index 000000000000..643803eeda02
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-kmail_kresolver.cpp
@@ -0,0 +1,14 @@
+--- kmail/keyresolver.cpp.orig Thu Nov 10 05:39:42 2005
++++ kmail/keyresolver.cpp Thu Nov 10 05:48:08 2005
+@@ -1023,8 +1023,10 @@
+ CryptoMessageFormat commonFormat = AutoFormat;
+
+ for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
++ if ( !(mCryptoMessageFormats & concreteCryptoMessageFormats[i]) )
++ continue; // skip
+ if ( signingKeysFor( concreteCryptoMessageFormats[i] ).empty() )
+- continue; // skip;
++ continue; // skip
+ if ( count.numOf( concreteCryptoMessageFormats[i] ) == count.numTotal() ) {
+ commonFormat = concreteCryptoMessageFormats[i];
+ break;