[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.12.4-1-4-g730ad00

[Didier Raboud]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=bb54381

The following commit has been merged in the master branch:
commit bb5438192c0e50f6cd4fd5d2fa7f907272391f1f
Author: Didier Raboud <odyx at debian.org>
Date:   Fri May 9 15:30:41 2014 +0200

    Add patch to avoid akonadi_imap crash (upstream bug: 329805)
---
 debian/changelog                                   |  7 +++
 .../fix_upstream_329805_akonadi_imap_crash.patch   | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 60 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f3b8cc9..a0c265a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdepim-runtime (4:4.12.4-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch to avoid akonadi_imap crash (upstream bug:
+    329805)
+
+ -- Didier Raboud <odyx at debian.org>  Fri, 09 May 2014 15:30:58 +0200
+
 kdepim-runtime (4:4.12.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/fix_upstream_329805_akonadi_imap_crash.patch b/debian/patches/fix_upstream_329805_akonadi_imap_crash.patch
new file mode 100644
index 0000000..63e4a00
--- /dev/null
+++ b/debian/patches/fix_upstream_329805_akonadi_imap_crash.patch
@@ -0,0 +1,52 @@
+commit e376267dda6972ffc2eeea215901f08145e3c993
+Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
+Date:   Thu May 8 10:42:54 2014 +0200
+
+    IMAP-Resource: Don't crash if IDLE collection is not subscribed locally.
+    
+    BUG: 329805
+
+--- a/resources/imap/imapresource.cpp
++++ b/resources/imap/imapresource.cpp
+@@ -645,6 +645,11 @@
+   if ( !m_pool->serverCapabilities().contains( QLatin1String("IDLE") ) )
+     return;
+ 
++  //Without password we don't even have to try
++  if (Settings::self()->password().isEmpty()) {
++    return;
++  }
++
+   const QStringList ridPath = Settings::self()->idleRidPath();
+   if ( ridPath.size() < 2 )
+     return;
+@@ -672,21 +677,17 @@
+ 
+ void ImapResource::onIdleCollectionFetchDone( KJob *job )
+ {
+-  if ( job->error() == 0 ) {
+-    Akonadi::CollectionFetchJob *fetch = static_cast<Akonadi::CollectionFetchJob*>( job );
+-    Akonadi::Collection c = fetch->collections().first();
+-
+-    const QString password = Settings::self()->password();
+-    if ( password.isEmpty() )
+-      return;
+-
+-    ResourceStateInterface::Ptr state = ::ResourceState::createIdleState( this, c );
+-    m_idle = new ImapIdleManager( state, m_pool, this );
+-
+-  } else {
++  if (job->error()) {
+     kWarning() << "CollectionFetch for idling failed."
+                << "error=" << job->error()
+                << ", errorString=" << job->errorString();
++    return;
++  }
++  Akonadi::CollectionFetchJob *fetch = static_cast<Akonadi::CollectionFetchJob*>(job);
++  //Can be empty if collection is not subscribed locally
++  if (!fetch->collections().isEmpty()) {
++    ResourceStateInterface::Ptr state = ::ResourceState::createIdleState( this, fetch->collections().first() );
++    m_idle = new ImapIdleManager( state, m_pool, this );
+   }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5879913..9e37331 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 hide_akonaditray.diff
+fix_upstream_329805_akonadi_imap_crash.patch

-- 
KDE PIM Runtime module packaging