diff options
| -rw-r--r-- | kde-base/kmail/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kmail/files/kmail-4.11.2-gnupgattach.patch | 57 | ||||
| -rw-r--r-- | kde-base/kmail/kmail-4.11.2-r1.ebuild (renamed from kde-base/kmail/kmail-4.11.2.ebuild) | 4 |
3 files changed, 68 insertions, 2 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 1da4aed5feb8..570c2a8a73ba 100644 --- a/kde-base/kmail/ChangeLog +++ b/kde-base/kmail/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kmail # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.370 2013/10/10 05:26:50 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.371 2013/10/21 21:51:52 dilfridge Exp $ + +*kmail-4.11.2-r1 (21 Oct 2013) + + 21 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> -kmail-4.11.2.ebuild, + +kmail-4.11.2-r1.ebuild, +files/kmail-4.11.2-gnupgattach.patch: + Revbump to back-port bug fix for kde bug 286481, cannot open attachments in + encrypted messages *kmail-4.4.11.1-r1 (10 Oct 2013) diff --git a/kde-base/kmail/files/kmail-4.11.2-gnupgattach.patch b/kde-base/kmail/files/kmail-4.11.2-gnupgattach.patch new file mode 100644 index 000000000000..3dce746a0d35 --- /dev/null +++ b/kde-base/kmail/files/kmail-4.11.2-gnupgattach.patch @@ -0,0 +1,57 @@ +commit bbbdbc2180036040cac2b66492e6f0fd01c2b28c +Author: Sandro Knauß <mail@sandroknauss.de> +Date: Mon Oct 21 02:47:31 2013 +0200 + + Fix 286481 - Unable to open attachments in encrypted messages + + The node has to get a correct extra content and the filename must be + correctly point to the attachments inside the encrypted message. + + BUG: 286481 + BUG: 300937 + FIXED-IN: 4.11.3 + REVIEW: 113361 + +diff --git a/messageviewer/viewer/nodehelper.cpp b/messageviewer/viewer/nodehelper.cpp +index 311f655..8c8ff79 100644 +--- a/messageviewer/viewer/nodehelper.cpp ++++ b/messageviewer/viewer/nodehelper.cpp +@@ -223,7 +223,7 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node) + return existingFileName.toLocalFile(); + } + +- QString fname = createTempDir( node->index().toString() ); ++ QString fname = createTempDir( persistentIndex( node ) ); + if ( fname.isEmpty() ) + return QString(); + +@@ -237,7 +237,6 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node) + fname += '/' + fileName; + + //kDebug() << "Create temp file: " << fname; +- + QByteArray data = node->decodedContent(); + if ( node->contentType()->isText() && data.size() > 0 ) { + // convert CRLF to LF before writing text attachments to disk +@@ -260,7 +259,7 @@ KUrl NodeHelper::tempFileUrlFromNode( const KMime::Content *node ) + if (!node) + return KUrl(); + +- const QString index = node->index().toString(); ++ const QString index = persistentIndex( node ); + + foreach ( const QString &path, mAttachmentFilesDir->temporaryFiles() ) { + int right = path.lastIndexOf( '/' ); +diff --git a/messageviewer/viewer/objecttreeparser.cpp b/messageviewer/viewer/objecttreeparser.cpp +index cde17da..369ad95 100644 +--- a/messageviewer/viewer/objecttreeparser.cpp ++++ b/messageviewer/viewer/objecttreeparser.cpp +@@ -803,7 +803,7 @@ bool ObjectTreeParser::writeOpaqueOrMultipartSignedData( KMime::Content* data, + bIsOpaqueSigned = true; + + CryptoProtocolSaver cpws( this, cryptProto ); +- createAndParseTempNode( data, doCheck ? cleartext.data() : cleartextData->data(), ++ createAndParseTempNode( &sign, doCheck ? cleartext.data() : cleartextData->data(), + "opaque signed data" ); + + if ( htmlWriter() ) diff --git a/kde-base/kmail/kmail-4.11.2.ebuild b/kde-base/kmail/kmail-4.11.2-r1.ebuild index b5c78e2e2a18..d9275e1baf49 100644 --- a/kde-base/kmail/kmail-4.11.2.ebuild +++ b/kde-base/kmail/kmail-4.11.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.11.2.ebuild,v 1.1 2013/10/09 23:04:45 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.11.2-r1.ebuild,v 1.1 2013/10/21 21:51:52 dilfridge Exp $ EAPI=5 @@ -63,6 +63,8 @@ KMEXTRA=" KMLOADLIBS="kdepim-common-libs" +PATCHES=( "${FILESDIR}/${P}-gnupgattach.patch" ) + src_configure() { # Bug 308903 use ppc64 && append-flags -mminimal-toc |