From 67503ca4d78952a45a8651b89201203be9637495 Mon Sep 17 00:00:00 2001
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Thu, 10 Nov 2005 06:41:53 +0000
Subject: [PATCH] Fix KDE Bug 99089 (inline PGP signed messages not working in
 kmail).

Stumbled over by: Peter Losher
---
 deskutils/kdepim3/Makefile                         |  1 +
 deskutils/kdepim3/files/patch-kmail_kresolver.cpp  | 14 ++++++++++++++
 deskutils/kdepim4/Makefile                         |  1 +
 deskutils/kdepim4/files/patch-kmail_kresolver.cpp  | 14 ++++++++++++++
 deskutils/kdepim44/Makefile                        |  1 +
 deskutils/kdepim44/files/patch-kmail_kresolver.cpp | 14 ++++++++++++++
 6 files changed, 45 insertions(+)
 create mode 100644 deskutils/kdepim3/files/patch-kmail_kresolver.cpp
 create mode 100644 deskutils/kdepim4/files/patch-kmail_kresolver.cpp
 create mode 100644 deskutils/kdepim44/files/patch-kmail_kresolver.cpp

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;
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index c721487a01cf..43fdda4d9d1f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/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/kdepim4/files/patch-kmail_kresolver.cpp b/deskutils/kdepim4/files/patch-kmail_kresolver.cpp
new file mode 100644
index 000000000000..643803eeda02
--- /dev/null
+++ b/deskutils/kdepim4/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;
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index c721487a01cf..43fdda4d9d1f 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/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/kdepim44/files/patch-kmail_kresolver.cpp b/deskutils/kdepim44/files/patch-kmail_kresolver.cpp
new file mode 100644
index 000000000000..643803eeda02
--- /dev/null
+++ b/deskutils/kdepim44/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;