1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00

Fix KDE Bug 99089 (inline PGP signed messages not working in kmail).

Stumbled over by: Peter Losher
This commit is contained in:
Michael Nottebrock 2005-11-10 06:41:53 +00:00
parent 874fab9f3a
commit 67503ca4d7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=147806
6 changed files with 45 additions and 0 deletions

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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;