| 1 |
dilfridge 13/10/29 08:47:43 |
| 2 |
|
| 3 |
Added: kdepim-common-libs-4.11.2-gnupgattach.patch |
| 4 |
Log: |
| 5 |
Revbump to back-port bug fix for kde bug 286481, now really |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kdepim-common-libs-4.11.2-gnupgattach.patch |
| 16 |
=================================================================== |
| 17 |
commit bbbdbc2180036040cac2b66492e6f0fd01c2b28c |
| 18 |
Author: Sandro Knauß <mail@××××××××××××.de> |
| 19 |
Date: Mon Oct 21 02:47:31 2013 +0200 |
| 20 |
|
| 21 |
Fix 286481 - Unable to open attachments in encrypted messages |
| 22 |
|
| 23 |
The node has to get a correct extra content and the filename must be |
| 24 |
correctly point to the attachments inside the encrypted message. |
| 25 |
|
| 26 |
BUG: 286481 |
| 27 |
BUG: 300937 |
| 28 |
FIXED-IN: 4.11.3 |
| 29 |
REVIEW: 113361 |
| 30 |
|
| 31 |
diff --git a/messageviewer/viewer/nodehelper.cpp b/messageviewer/viewer/nodehelper.cpp |
| 32 |
index 311f655..8c8ff79 100644 |
| 33 |
--- a/messageviewer/viewer/nodehelper.cpp |
| 34 |
+++ b/messageviewer/viewer/nodehelper.cpp |
| 35 |
@@ -223,7 +223,7 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node) |
| 36 |
return existingFileName.toLocalFile(); |
| 37 |
} |
| 38 |
|
| 39 |
- QString fname = createTempDir( node->index().toString() ); |
| 40 |
+ QString fname = createTempDir( persistentIndex( node ) ); |
| 41 |
if ( fname.isEmpty() ) |
| 42 |
return QString(); |
| 43 |
|
| 44 |
@@ -237,7 +237,6 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node) |
| 45 |
fname += '/' + fileName; |
| 46 |
|
| 47 |
//kDebug() << "Create temp file: " << fname; |
| 48 |
- |
| 49 |
QByteArray data = node->decodedContent(); |
| 50 |
if ( node->contentType()->isText() && data.size() > 0 ) { |
| 51 |
// convert CRLF to LF before writing text attachments to disk |
| 52 |
@@ -260,7 +259,7 @@ KUrl NodeHelper::tempFileUrlFromNode( const KMime::Content *node ) |
| 53 |
if (!node) |
| 54 |
return KUrl(); |
| 55 |
|
| 56 |
- const QString index = node->index().toString(); |
| 57 |
+ const QString index = persistentIndex( node ); |
| 58 |
|
| 59 |
foreach ( const QString &path, mAttachmentFilesDir->temporaryFiles() ) { |
| 60 |
int right = path.lastIndexOf( '/' ); |
| 61 |
diff --git a/messageviewer/viewer/objecttreeparser.cpp b/messageviewer/viewer/objecttreeparser.cpp |
| 62 |
index cde17da..369ad95 100644 |
| 63 |
--- a/messageviewer/viewer/objecttreeparser.cpp |
| 64 |
+++ b/messageviewer/viewer/objecttreeparser.cpp |
| 65 |
@@ -803,7 +803,7 @@ bool ObjectTreeParser::writeOpaqueOrMultipartSignedData( KMime::Content* data, |
| 66 |
bIsOpaqueSigned = true; |
| 67 |
|
| 68 |
CryptoProtocolSaver cpws( this, cryptProto ); |
| 69 |
- createAndParseTempNode( data, doCheck ? cleartext.data() : cleartextData->data(), |
| 70 |
+ createAndParseTempNode( &sign, doCheck ? cleartext.data() : cleartextData->data(), |
| 71 |
"opaque signed data" ); |
| 72 |
|
| 73 |
if ( htmlWriter() ) |
Archives