Revision bump adds upstream patch which prevents mail loss on spam filtering.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux i686

6 files changed, 75 insertions, 14 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index bbd6bf1ea15d..8127c5fb1b89 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.300 2012/08/17 11:04:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.301 2012/08/29 10:13:18 johu Exp $
+
+*kmail-4.9.0-r2 (29 Aug 2012)
+*kmail-4.8.5-r1 (29 Aug 2012)
+
+  29 Aug 2012; Johannes Huber <johu@gentoo.org>
+  +files/kmail-4.8.5-spamfilter-mail-loss.patch,
+  +files/kmail-4.9.0-spamfilter-mail-loss.patch, +kmail-4.8.5-r1.ebuild,
+  +kmail-4.9.0-r2.ebuild, -kmail-4.8.5.ebuild, -kmail-4.9.0-r1.ebuild:
+  Revision bump adds upstream patch which prevents mail loss on spam filtering.
 
   17 Aug 2012; Johannes Huber <johu@gentoo.org> -kmail-4.8.4-r1.ebuild:
   Remove KDE SC 4.8.4
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index a6da5310fd15..b704d30a6e3a 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -9,7 +9,9 @@ AUX kmail-4.4.9-nodbus.patch 3922 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0
 AUX kmail-4.7.4-gcc44.patch 492 SHA256 6407d434616d32194c2b58b357dd11d9b427b62d20dd31671da5b1e0881e51f6 SHA512 2a4319050ab9f7813d9a9d365df87f168043b22afd9ba1cfe72f69cd509367c3f7fef144c79a91d8c4322e40daed3cef8ecbab8b456c8e4938c6e39b2acfa149 WHIRLPOOL 1e10746bf795d4192fe9a38a4f26ecbb411c1a026a89721ebf426704ff0d9a8a0c284aa0ef0354c55bfb9756a810a88759fa2201fd37c8c89647f0cfe8b055c3
 AUX kmail-4.8.3-qt47-compat.patch 348 SHA256 d14af0b62c1b5b18841422b985269069d22bbc1cbc6740ceddca7a977794261f SHA512 eef7bc8100a2c40270a77a9d8a1a1204b68347c15d3a03eede441ee544699f3e3894c87e985264c11fa3239b42dcccedb007f2abc7c7d33a8d791d6aed6a7e38 WHIRLPOOL fe82849e18abd34f0722800f0ce396aa5051222d5eaac8efef526e3190093ff238296db5a61f4e5fb9133f54cbe6369ddc6185f160480487860a8158d5141ef8
 AUX kmail-4.8.4-sec.patch 1058 SHA256 55dcb1b4e7de1c2fb391c7aaed42df10c4d2ea93d05549e219c7125f2eb81760 SHA512 bb43df6c27e565ed1f7147129953abfbcb2b52b8b0c5dfd01b340926cdac016b7c3de7625c528eeaf2d0c94059bc82fef11f4c72faf74fbc761baac0ffbfd373 WHIRLPOOL 73e8ac316c1c852de87228aa0ef7dfaa27eb03e359ffee763fa9aefa35d3861671a9ddc77656f41b81b68c99b04aaefa4e673a81556deb973fcaabe2f3a4c3d3
+AUX kmail-4.8.5-spamfilter-mail-loss.patch 1181 SHA256 30710925f55ab20745a31a0dd2b51085ac41195dcf7159c94cd942ca538d3f87 SHA512 3851b0dd79165249fff1d74edc13909e9ac4e1e6fc832ce0eb448d79284ba65d1b5665a266407090daa7fe7da238d9be845950f5cab8890461eb16959a3261ea WHIRLPOOL 176c53fb575424af93d205935347688abe5f72eee8595c522cdfa4f9d099cfc274bd86153521ee7a6fad98287b4ee942879456f6b06452afe9045abaa14798cd
 AUX kmail-4.9.0-gcc44.patch 662 SHA256 410cf3852fd90d9a07f0aee6c0be28660c4c99b5cfb0124a25297978cfca2d79 SHA512 4848d6d88cfce1b456be1003028991b6638fbf7356cb3e70f5b08a3feee8e198951d6688439ded1e9a7c2735d3b38438d663bb57bee89de92af1257882893535 WHIRLPOOL 44ea45313ae729365e48b07d64df459640a6b3748db0d8cdb41618ead958fb05381b722971b0c7d0de3cf86d8b6950a1cbd95d2faeffb83a53fb8f59ed9f6adc
+AUX kmail-4.9.0-spamfilter-mail-loss.patch 1311 SHA256 c5a58ac00fae9da9f7b31fe1843301f343b1e4fb2573862c29eb8de2e85d81e4 SHA512 5cc76586e6aa7ecf91527182e5ab7dff4285c98f0c45b93d4a40f6069368cd7c556dc950cf73685e48d688171b9d885d9716209851f476d64f8726f5af83879f WHIRLPOOL 3d35b25e81a7c882109ef03e0f16d84ccab20bb92fbd5f769c9e27381b93448a4d74518b41f51e05ccf66edae7693a738911967eeff29c729619954c94043175
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 DIST kdepim-4.7.4.tar.bz2 16182345 SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
 DIST kdepim-4.8.3.tar.xz 14609952 SHA256 995e548bcd0fbcc8ea3c69a4bb20da02956a4379e519f8ade7852eaa0bd02639 SHA512 2ce8924a669c1520df97412b3358a520363e1107ca6b0de029ed59e09bb4410a16204e8a18ab6617800100758741abe15e549a0dab50f26507e59732c9d6ca4c WHIRLPOOL 0a1f13173cd1a029629b6a6527f61d052edf0df0e7131d33f797918a7181fc8e70886bfb492fafe9c90e58061db3434d2c8a882189e1a5ca585ce6830d33309a
@@ -19,18 +21,18 @@ EBUILD kmail-4.4.11.1-r1.ebuild 1835 SHA256 31ee7368fcfb18359c5efcb566c2a5d98959
 EBUILD kmail-4.4.11.1.ebuild 1762 SHA256 c1d87cfca0f373ca27afce6b5f4fdefd235516aa15ed99087719be72d9134b17 SHA512 f126952d6fb85f051d3ae094bfff13403b4873e8bb211edf6806238cc8b102267336f8ba676a304b306f3dca9365841b8db931ad58ec9ca691e10768b4c02f39 WHIRLPOOL 6f75de9eb8bc7eecc645398d6b4922b3b864095b78cb624675bbdbc221e92eb59bf91c36ceab21e7d52c0c30a3df4c8e2e2592d9155cf19787e4d31aca0ccff4
 EBUILD kmail-4.7.4-r1.ebuild 1708 SHA256 f9d63f7f6795ceaf09cb62e45997be009d849fd28d94e39b7ee488c8b0af4c17 SHA512 337c7c7c4aff9bcd058db7c6b4a17c1d27102ed54698d0757a467865ea7b2dbfb39adc72d71be87e7bfb04e0cd917df40e601d64446ed71b0696acb249f26f94 WHIRLPOOL 9cc97287ccdb7199bbc6e8c815a4cf7534dd711e47d3031258b980d3402ec2757c3128e52088a0e330c2856d2512dc2999df76ae6b2ddedc05941750633fc8b6
 EBUILD kmail-4.8.3-r1.ebuild 1760 SHA256 096c93fe6e21c8b06f3d42203f54091a5cba617ae09731e55d23dee1d0ead6d3 SHA512 c6bf95ce51bb8c832adbb50ad31c5da78cb21d6c2dab881bb78a592db3903edfc50063432e30bde1fad3ccd86a2cf27df65136eae16b285e4957a69f4a51d421 WHIRLPOOL 81f19496380e29afb25e31d933425c758f24989fd431d1633f94baa016918752bda11e4323ae8b3080e52c5d9e10afe4b3d598305db98eda4670bf7c28fb881a
-EBUILD kmail-4.8.5.ebuild 1672 SHA256 35f36d86607fd6086499496439b8603203443934a09b9ad998a9736591bae9d9 SHA512 a2cea62dd0e7012e9aef7018ab519b62d2d876f4747b406a646e942843b3dc56073d8ab9bb43f40031d96d5922ea44b856c42b786e1a407c238ec658aa3eab5d WHIRLPOOL a8167743fb34018cdee159f1b80ff0bdaf8d73ea967d56f6ff33b3998a61328a1fd42fa526a9733d42337b5e010614f1a45454f5f7686aafce2cc1c620fcf6a9
-EBUILD kmail-4.9.0-r1.ebuild 1788 SHA256 7e9cb49e17fb5136674fc54744ead6484e799ee0e0f9ba26435db5224500ac9e SHA512 b5a6effa5092c2b2621adbc1a17c6f493405fed230c55d62606cedbc12aab2c020f6e3787f76651fa9cd045e02c7a6bdb24fe517ce41b93efbe73cd67276926f WHIRLPOOL 310d35e9415c4cd337e329bae93093ac8ad32857a0dbb33aee734bb3127c41fef619942c3f9b37e881d335d8030c88d83f87935441f25f4de9ff4ad9124d7338
-MISC ChangeLog 39596 SHA256 3e8785d6ed48640d4df30f9d0a3b22a8fcf5becf659fbbeafa7ec9628dda359c SHA512 188c9d7b55cc5747c37b9c36b032ad42dfdfc140bf807e7291caac3283302e16871a33aaa03f28e9051996dd6b126b3daf97655c7dcb107dd8fca04ef47ee4bd WHIRLPOOL 2ed0d95a442769bb1350a883826ebc3d100090ac178e22be9302400687325fd4f68433bd96642307d28525774d5d835193076d85621ac43d29fb9c12d07f566f
+EBUILD kmail-4.8.5-r1.ebuild 1734 SHA256 2c6d7c7ac2e8b76af84a5ffc916df2baeae9bed1ea0a87dd5a0dcf8ff0a19700 SHA512 af34c885764bb3f19400860b32f50ba87e19f9d8d52bb279def6b0aa3d1798e212a1940a0c099951c661307f5f42ce034525ebd79189f2c890af4b427b58b7cd WHIRLPOOL 96468e54674205778c0d01c19105475017ac8f8e90f297c9e7d86810db359e80bbad67dcc7d548d1933b2c76052f5392e8fcd43a1bffb21727a4db7c41db2532
+EBUILD kmail-4.9.0-r2.ebuild 1836 SHA256 1b5e3efaecc10ca00f02958e8d8e458b4e91c7b32ff289d812436b62c4bc594e SHA512 b1a6a5a82a1a3db01541b69fd5de25c7af5629df98729c8c55d787128ecfa5dbc5cc4494ebf7fc80411ae8ce819cd35c75c1d429f46ffe12eab83dbc0375eaba WHIRLPOOL d1b7ae0219fb16a5958575f63fbc65130384a08c314e68377979804e67cd54a3b75cf706e93b24405f9393faee726889d9c31598c084f12d9b907900389deb58
+MISC ChangeLog 39979 SHA256 b985d8665d44fada159b97eac7bccb0baa9b3bc037263ac18bf333a5cfa4defb SHA512 9f79bd33214180a4ed90fd671d4d56d1a35f6e2cb84dd502674273e267db5f75057901b920b9b7cb3554c002d5c934ba6536852b0ae1e7b786dcd07d8cee73aa WHIRLPOOL 932e717e2c3d8440796502f499af6756b235c3b8185dec2bb6c857d709749bab87c590e5e44ba17e78db64e6482a518e0fa9a4546257bd0e062b33063daee992
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQLiYFAAoJEO+t9ga+3I3asRAH/3K9wnAWoIlq7RobGcSYkd5E
-llU8IRYDq88sIPZmWnLawFh5rY0m+XFdKx3GuW8+vYBnrwWqqdBCtwH3BvqXnO/a
-tfvIr9DdnD8vGPUo1tWJQFlGlOGEvmax+y0GcO6Bgch0Rfz8PyQQq81UT2zZtE82
-L8uGoUzwPxrb9q2cAk/9WNMUufLoEBOGya/FfUxnCRXx4hbbtFJ3TYKt398btmDQ
-+ToMa07SJduYnxoxlKRhgSQSIwI5cR9yCczNw7DeQSexS+7QI48B6uhElez97j2d
-PMBk1+3fJCR3DwnNDH1/AtXHu+cH3OIa9dYmSSrMYldxu2aW7gBFwJ0mDUlpuFU=
-=Ydl9
+iQEcBAEBCAAGBQJQPeykAAoJEO+t9ga+3I3aqZgH+gKHKHitTOjyPgS5QJPeXQaA
+j1JMdaS3USfRwkuNJKsMN31dKc+FCaXesz8brw/aGL0BW/qdLUERe0nWYcfRIAJv
+lea14KAqXBFLSjyFOHBQ1QpfKr4i+h9LAGZw9R42LqUAapUC3ZQw+65N1HK0TXes
+uuHhKPaaoOqsmLptbTjHJW4TJLzzrd2k8aofvtK6YI7ew+4z9QpUuuyiXpEc+98h
+arHtK7vPxRplnOCkxl0zoi1opgTHQW9bWqTAWDmHx3Qio+K9G8tJHu+pZNlVjYaa
+XRLVyzzdMs/rovdt8FNl0bemsivTNDURq7VMeNcdC3g+mZWfYqma6j+PWM/YDcw=
+=yIyj
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
new file mode 100644
index 000000000000..5e9210ecb9a2
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
@@ -0,0 +1,22 @@
+commit 628faec2651f6f20a438f61fc9c861c0d5eab0f8
+Author: Andras Mantia <amantia@kde.org>
+Date:   Sat Aug 25 11:52:45 2012 +0300
+
+    Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that needs a content.
+    
+    FIXED-IN: 4.8.6
+    
+    BUG: 295484
+
+diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
+index 5f66e74..4e37ac7 100644
+--- a/mailfilteragent/mailfilteragent.cpp
++++ b/mailfilteragent/mailfilteragent.cpp
+@@ -111,6 +111,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
+ 
+   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
+   if (m_filterManager->requiresFullMailBody()) {
++    changeRecorder()->itemFetchScope().setCacheOnly(false);
+     changeRecorder()->itemFetchScope().fetchFullPayload();
+   } else {
+     changeRecorder()->itemFetchScope().fetchPayloadPart( Akonadi::MessagePart::Header, true );
diff --git a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
new file mode 100644
index 000000000000..9a2dc4b5b095
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
@@ -0,0 +1,23 @@
+commit e98937475a7f03e69a3a3c6a4ee67a8d41f027b5
+Author: Andras Mantia <amantia@kde.org>
+Date:   Sat Aug 25 11:47:36 2012 +0300
+
+    Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that *needs* a content.
+    
+    FIXED-IN: 4.9.1
+    
+    BUG: 295484
+    (cherry picked from commit c691cb5d9cc7bb337c149e0279e21397f168c314)
+
+diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
+index 7220d90..75d6f05 100644
+--- a/mailfilteragent/mailfilteragent.cpp
++++ b/mailfilteragent/mailfilteragent.cpp
+@@ -117,6 +117,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
+   Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job );
+ 
+   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
++  changeRecorder()->itemFetchScope().setCacheOnly(false);
+   mRequestedPart = m_filterManager->requiredPart();
+   if (mRequestedPart == MailCommon::SearchRule::CompleteMessage) {
+     changeRecorder()->itemFetchScope().fetchFullPayload();
diff --git a/kde-base/kmail/kmail-4.8.5.ebuild b/kde-base/kmail/kmail-4.8.5-r1.ebuild
index a42d017ae8c3..40743b723fa6 100644
--- a/kde-base/kmail/kmail-4.8.5.ebuild
+++ b/kde-base/kmail/kmail-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.8.5.ebuild,v 1.1 2012/08/07 11:04:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.8.5-r1.ebuild,v 1.1 2012/08/29 10:13:18 johu Exp $
 
 EAPI=4
 
@@ -55,6 +55,8 @@ KMEXTRA="
 
 KMLOADLIBS="kdepim-common-libs"
 
+PATCHES=( "${FILESDIR}/${P}-spamfilter-mail-loss.patch" )
+
 src_configure() {
 	# Bug 308903
 	use ppc64 && append-flags -mminimal-toc
diff --git a/kde-base/kmail/kmail-4.9.0-r1.ebuild b/kde-base/kmail/kmail-4.9.0-r2.ebuild
index ed7c36d4b7a8..1659dc08c1ec 100644
--- a/kde-base/kmail/kmail-4.9.0-r1.ebuild
+++ b/kde-base/kmail/kmail-4.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.9.0-r1.ebuild,v 1.2 2012/08/09 10:30:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.9.0-r2.ebuild,v 1.1 2012/08/29 10:13:18 johu Exp $
 
 EAPI=4
 
@@ -60,7 +60,10 @@ KMEXTRA="
 
 KMLOADLIBS="kdepim-common-libs"
 
-PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc44.patch"
+	"${FILESDIR}/${P}-spamfilter-mail-loss.patch"
+)
 
 src_configure() {
 	# Bug 308903