[gentoo-commits] gentoo-x86 commit in kde-base/kmail/files: kmail-4.9.0-spamfilter-mail-loss.patch kmail-4.8.5-spamfilter-mail-loss.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kmail/files: kmail-4.9.0-spamfilter-mail-loss.patch kmail-4.8.5-spamfilter-mail-loss.patch

[Johannes Huber (johu)]

johu        12/08/29 10:13:18

  Added:                kmail-4.9.0-spamfilter-mail-loss.patch
                        kmail-4.8.5-spamfilter-mail-loss.patch
  Log:
  Revision bump adds upstream patch which prevents mail loss on spam filtering.
  
  (Portage version: 2.2.0_alpha123/cvs/Linux i686)

Revision  Changes    Path
1.1                  kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch?rev=1.1&content-type=text/plain

Index: kmail-4.9.0-spamfilter-mail-loss.patch
===================================================================
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();



1.1                  kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch?rev=1.1&content-type=text/plain

Index: kmail-4.8.5-spamfilter-mail-loss.patch
===================================================================
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 );