summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-10-21 21:52:03 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-10-21 21:52:03 +0000
commite2d12578d497f7f047c2ad6aa60b9f5f0724905c (patch)
treeac4d75d66decfa550d70487a7ff5c644925bdf83 /kde-base
parentRemove mesa security mask as i965 the driver is masked by package.use.mask no... (diff)
downloadhistorical-e2d12578d497f7f047c2ad6aa60b9f5f0724905c.tar.gz
historical-e2d12578d497f7f047c2ad6aa60b9f5f0724905c.tar.bz2
historical-e2d12578d497f7f047c2ad6aa60b9f5f0724905c.zip
Revbump to back-port bug fix for kde bug 286481, cannot open attachments in encrypted messages
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kmail/ChangeLog9
-rw-r--r--kde-base/kmail/Manifest33
-rw-r--r--kde-base/kmail/files/kmail-4.11.2-gnupgattach.patch57
-rw-r--r--kde-base/kmail/kmail-4.11.2-r1.ebuild (renamed from kde-base/kmail/kmail-4.11.2.ebuild)4
4 files changed, 86 insertions, 17 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/Manifest b/kde-base/kmail/Manifest
index 847ce36f85ec..ab24bbce8991 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -5,29 +5,32 @@ AUX 4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch 1560 SHA
AUX 4.4/0004-kmail-Make-spell-checking-work-again.patch 1138 SHA256 a7b37c0dc8656ded4311780b76d5b801bc0ad3d8d45d46c7488485b2dcf92333 SHA512 4cb5a179a2b64a6c649b17a4bcfbc97a87957d4dcff1d5caa3328139cde5cb9dc4760a8e4b1c3b477c9610093e495dbaf80e2ea2ed0ed25d0ba4a10ab218d724 WHIRLPOOL 380abbbd9d43577cddf0cb6f85320485c930a0d39a9ce0115926f2c011d7009eb858175f8fea347c79ff3cdaaec905905c8158db0f72fb1b8723713074b125ac
AUX 4.4/0004-libkdepim-Make-spell-checking-work-again.patch 1946 SHA256 57ca15b378faab075b8efd76b0379defcef1e8c110b60f65f3fb9272feacc0cc SHA512 ebb33447d06c76dce434ab6847674a1f790ab6300e0617cf8e88289c6af3ab8d96f3e0c62d7e9d01539fd30cc4dff301b9c8a77d1eefa2fc6b72198804dceb4f WHIRLPOOL 4c6a3bc00f976fd456c0940134ca389ad58cd4cb28c30a04d235e96c2a4b3ab6cc4dd25a4ff23558b3278f40f02b4c2ebef6837d244926aceaba4c137ede32ca
AUX 4.4/0005-Fix-bug-276086-crash-on-exit.patch 768 SHA256 f062bbc2e095cadfc53a420bcfe7f87569e7ba0506395285227625401286ea46 SHA512 3b39db7e037e757ddf8f6900f6196a99e0d74fc1f8b8dcf9a7661fbc85f86c6b52afdbcf570f771bbcdf6167b64b16403b9cb522f3e4cec3df10f9018a6b4be9 WHIRLPOOL 761ac1b4e511d68fe639788ce4a23096fcab6d80600e333c4ede8672d97ed380d0a1ccb00cf5628677fcb1cc87f0390213a02372254c68f907d671660b0c3b94
+AUX kmail-4.11.2-gnupgattach.patch 2284 SHA256 d80c4c4c1c4232c93b86da59ae25c9c71502ac09558d8d41c3db6e1b876d6a11 SHA512 8c696564ee8cfb6bdf4a583e7ae81d1b817e5b6b6f21df1c7855615ece7be097ff8ed3d5fc19243e46212dcad80abc9ae964227b67a4f37b8243521a5980776d WHIRLPOOL c3252d441c360e9f12f98d4c9770c58e9703a206b68fc5eef636d06a98c543e5666857d807bc06d5f0db231ad4838176d9c428a6689dbdf1e9a690458ea5115d
AUX kmail-4.4.9-nodbus.patch 3922 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0ec6bf989cb7674461ae114e68 SHA512 e883195c70559b9b161432f6593529a58e1b8b3d3e97d49a33f61a63a7992844e8658c0bf0f38f2f31b6b1e6d1e6f4b4611cf979dbbe98effa24db868402bbdf WHIRLPOOL d8d85987172602036ab4edae3f8aebe601ab7b37cd10eaf0b67faf758ee7f4ca84aebf1be977318f36464f17f765d59b4f284608fb315734be114769f16ffd5e
DIST kdepim-4.10.5.tar.xz 14442688 SHA256 016f05cf28ed546199d4aec0683bb4022beb52cc1799162085337fb7b3fd4163 SHA512 792de0f5023fd25daab1cc0dbb6fd9b51e9bf4bba6b3d34c34199b503b8c0889accf6d02d9e6fbcc0ec38d434e3a8a6dd7a9c2a0a5eaa3126d11e138de125c55 WHIRLPOOL 2513a1200683f4aa3315d0f068e278b19b642591c37cd28fe07d78ffea98bb2a6b891add6fa1abba7e9492832b7851f41db2b88111d656fc4a15bdaa956aae7d
DIST kdepim-4.11.2.tar.xz 14161772 SHA256 7098cae6dd2f181d3cb75a850860a8bdac8820e1e30371db73e454810234403f SHA512 ac2748b91bb7653f06450ba5191aaee636b759e5a478c811e78be1690b9a666aedfbea6737a09df7c857060d0a282fcee797427cf8b9f2dccbf17130a7a91254 WHIRLPOOL 6b3f522b806ba4481852b6e9322445c949ef99b744d990aebb0ffb67790b7a806a4dbc24a77b3c100409a3412f77be9b724df4bce1d1aa3542ca88887c768f1d
DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
EBUILD kmail-4.10.5.ebuild 2372 SHA256 a319e9a2e9a66fd0fb3abfbe5f906ace7c6468b464e618114834252655e976e8 SHA512 f33eb211c1a55b1c79e4eef24620096f6503838932ccd58698f2824ec0ee547080099dd68a2ee20eeffa13c74eb67dcb6cf80e75dde591f15a95619520bd17eb WHIRLPOOL 8b6c3b234b281766aa18c53037c14085f40ce7f97fbba9e4fcd842df5e100e81158002bc6fbc62dbab68dd90110360ea5241affbfae0feee8965ad175d139fe8
-EBUILD kmail-4.11.2.ebuild 2455 SHA256 baf80e1796f786155908dbc2bb561994da269d1dc29ca97c6eecc7db460e9342 SHA512 dd7b96e7408f5c7af223cfd28ca39999610ffb7f32a2997eaef7b1fc30bbea98224b6a93c18e79c90163cdb2213514f17c418f1f903a79cdfbd1ee094341f8d0 WHIRLPOOL 2e5db591d2ade9116b8ff23af8ba70c9578ed135e075890f24dd05011ecc00c7a7f3641f0d3c40fcf2d735cdcf7499d36f8dfce8d23966ab0ac0c123c8317cfe
+EBUILD kmail-4.11.2-r1.ebuild 2509 SHA256 798f40194c567eed3a42f27c59112e560b49314c385d817ddd320d8fae7d61e1 SHA512 17c5c347ee58544b4ff5ddc29552b9622d9b68fa3f403ed940b544dc7b08091cbb204e51fd9d3455aed105caee860714d1e695678903d3d80716b3b20f504245 WHIRLPOOL 2a285459328efeabc21a4abb49a934afe222127ebbad2e8f1efb77c05aecae0a233bd40f567b3f15cad746ed003759a91ff5b0c5bf050a85b7781847a533e9a7
EBUILD kmail-4.4.11.1-r1.ebuild 1830 SHA256 284a0531e463f7796f5d842cf293c7f9287cd1eeb9217e448a4164f100276ed9 SHA512 3aae45b573288490468922c3051103a356d6b5e5bf2f45d2498aaf8bdf93600fa8ec1ba5b05005d4162ffdbff7343de7a923ed76f91dd3bb223b14d6aa4b81d6 WHIRLPOOL adc5fa7d9935776d377c06a0f6456c628253a4d859cf49c2a11c67ac979a80f81906df1815da184681a303ee3febc825aa4464d6b143eb371816627bb5fe7cd5
-MISC ChangeLog 47946 SHA256 e3fdef3c2f440476e30ef9bc6f3d1f1f0d789930461329fe22df8f8d77f5ddaf SHA512 62d2488212f6390d856c92bfa7e1453f8d6a02feb67446ff9c7e2fcca8d852aeaa82dc7478aec05af1c325bec416b9b796808c834bae60a8f524cf86c0e03773 WHIRLPOOL 82c7455ab37839ebeea11928eb9b7189fd994125547f8e4cef7d7770dd554303aaabaa8938d69f2181e7a3a42ce1f038c1a12789eff2ca8741cc0888f6cfe00f
+MISC ChangeLog 48224 SHA256 9b2c443868605158c3439fc3e2089c2757b64fa015a3677fdede953a852c98de SHA512 d98f219fa3e1bb60040a0cbce0366a74b680aa1723333d2fdd8e6174337c42d6dec9e8c3b80cb5a9f92a8cf138372cd3ae5f747b651980174fb68698a228418a WHIRLPOOL a2779710da8e08f21a44677c258696bcdb92918954e4a6fa1abac990657cec75330a534183ae9de502bc0e7674bab4d474da3c550e1802eb622719fc1fe9d373
MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSVl0OAAoJEPiazRVxLXTF/J8P/i0kGpkPjXIraCWEOWsJuky+
-OF8+6Pb6s51vmbwTLYsTl+y9YEn8JTFTx32QXwCL8z3+w7jBc+JxHPBRMLVV/lCb
-u2pDgjdJX6VBN7ct7UXdpZACjgtU3bc8bhnw9+nWJpOMv8wdec6HnnG28Kqvh+pm
-/ppEmDa5RfzXpYcyWv9SvYoEtsnHQqkTVl3pY0puzmuo1qK/aQ5G8PK7viXw5SSD
-h3YrZ1fKjHqFHL+RLXrZOAGvSjcSUEHu3sp+9ZOIqbgG7zDQRq232QMNM3BKbIYB
-FQh6tWKj5d36kpN1QQLj1M8ph5MClJWF/0CGoW2ec43p7WLh+XDCGAo1zqp0Ydui
-oAG+LAhbeQVLdcBsh5qmVb+mvx5uYPjzbjcEO7/q1y5jhFJbeFosZgj/3Vd8DkdP
-BfHO+QhvoXdbqKhJK/LkUDxZ7Em4Xpowo3kRwAAgVXXuqyVB3xS6xzwrycrJ1jgV
-VQq1B6v5M73wTVj/WyUZI4nSwSkBUb04ca47LIbw4bgvkGXwK6tR+UuOwaOwS3B1
-tbCRhvyA52iQ7fpG/kztDiDRhSiLx+PwDHYarw2oYD85mdCtM+eAH3qthysda13L
-sLslOBKLwV72KIHh8Jf0ofheCxz6HDkZ0A7jWbMc3cVpcpZbyxSJkNO6q1BM0WMG
-sQHi3K7Dlh5x1j4fVJGF
-=TKjD
+iQJ8BAEBCABmBQJSZaIOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc9jgP/Rz088/sjqhbRgfHegWZa2zp
+/curmnVfSIxadmUBAUc6D/kC9veaVRJFfjnlOkruaB2t4NS+Nvldw5p6825zS2rS
+rPFhLxF5Cbxb40UIavxQhTkF+z9z15Qnn2ROvEJHuTsr/PpZzJvmmWt45vA+cJ/C
+3qdveyaDDk3yd8tZGWkTT/bLww0P4UteeGHcV6uP+WXGQ1BbCY0y5zRZziIaJxF0
+Bi7xXf4wDqVI/FKOmhULRcMtYtGcG4tnu7VJDly2XwlfpfJlSwqKEgzsjDCju/bT
+HY5oVZgqbAiAkruvATKP2RUbtZcuLd2viUFfhwTRfw4ZwSluRmijfv/OpIJnqHzz
+99qWH52zkq2PNdFtLkzokgSFo7DPSXPnLaUX80+RAFG1lLxXWqukCVBviItJ399K
+YrhJRHbk081CYSlFVatJa/W9oJwNINIBDLu+at66blD9t8URO7Mso63SECIn45WZ
+6tdL8ya2j3BhjNg504LFzWsycguCnVMMW4ciAQVf/+WwK7f0zQwo/YzPH6UkBKQj
+zWMwFOb5CAMRfUtwAYzlTf1CrUaV2341Yk72mCWSvyUG9HoHLygVgg8cV2/lmXXa
+7uv95kEJ+voD9FOY6kRKe7SeDFe5Tag/0qzyp8LdlBGyDpZiNenPaydFH2IubmQY
+Vw4LZaX0tFwVeA1xBBHc
+=O+fK
-----END PGP SIGNATURE-----
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