diff options
| author | lofi <lofi@FreeBSD.org> | 2005-11-10 14:41:53 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2005-11-10 14:41:53 +0800 |
| commit | baa629ff222f8d28e67e6168dfecf3479e99f72b (patch) | |
| tree | 850baffac11e8103285a6632c92214d9ea11e9dd | |
| parent | 0d044298fc3259e0d6fcbfadc21df9f21990ceec (diff) | |
| download | freebsd-ports-gnome-baa629ff222f8d28e67e6168dfecf3479e99f72b.tar.gz freebsd-ports-gnome-baa629ff222f8d28e67e6168dfecf3479e99f72b.tar.zst freebsd-ports-gnome-baa629ff222f8d28e67e6168dfecf3479e99f72b.zip | |
Fix KDE Bug 99089 (inline PGP signed messages not working in kmail).
Stumbled over by: Peter Losher
| -rw-r--r-- | deskutils/kdepim3/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/kdepim3/files/patch-kmail_kresolver.cpp | 14 | ||||
| -rw-r--r-- | deskutils/kdepim4/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/kdepim4/files/patch-kmail_kresolver.cpp | 14 | ||||
| -rw-r--r-- | deskutils/kdepim44/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/kdepim44/files/patch-kmail_kresolver.cpp | 14 |
6 files changed, 45 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; 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; |