[evolution-data-server/f17] Add patch for Red Hat bug #854017 (deadlock in MH-format camel provider)

[Milan Crha]

commit 95f92ea26bb7719882dce528cbeddaf66a1a8602
Author: Milan Crha <mcrha at redhat.com>
Date:   Wed May 15 19:07:49 2013 +0200

    Add patch for Red Hat bug #854017 (deadlock in MH-format camel provider)

 evolution-data-server-3.4.4-mh-deadlock.patch |   23 +++++++++++++++++++++++
 evolution-data-server.spec                    |    9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.4.4-mh-deadlock.patch b/evolution-data-server-3.4.4-mh-deadlock.patch
new file mode 100644
index 0000000..288f03f
--- /dev/null
+++ b/evolution-data-server-3.4.4-mh-deadlock.patch
@@ -0,0 +1,23 @@
+diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
+index d0c8e8a..dbf0054 100644
+--- a/camel/providers/local/camel-mh-store.c
++++ b/camel/providers/local/camel-mh-store.c
+@@ -188,18 +188,10 @@ fill_fi (CamelStore *store,
+ 	local_store = CAMEL_LOCAL_STORE (store);
+ 	folder = camel_object_bag_peek (store->folders, fi->full_name);
+ 
+-	if (folder == NULL
+-	    && (flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0)
+-		folder = camel_store_get_folder_sync (
+-			store, fi->full_name, 0, cancellable, NULL);
+-
+ 	if (folder != NULL) {
+-		if ((flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0)
+-			camel_folder_refresh_info_sync (folder, cancellable, NULL);
+ 		fi->unread = camel_folder_get_unread_message_count (folder);
+ 		fi->total = camel_folder_get_message_count (folder);
+ 		g_object_unref (folder);
+-
+ 	} else {
+ 		CamelLocalSettings *local_settings;
+ 		CamelSettings *settings;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 8a0bb84..47dc61d 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 3.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -50,6 +50,9 @@ Patch03: evolution-data-server-3.4.4-mh-leak.patch
 # RH bug #814341
 Patch04: evolution-data-server-3.4.4-authmethod.patch
 
+# RH bug #854017
+Patch05: evolution-data-server-3.4.4-mh-deadlock.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -133,6 +136,7 @@ This package contains developer documentation for %{name}.
 %patch02 -p1 -b .maildir-filters
 %patch03 -p1 -b .mh-leak
 %patch04 -p1 -b .authmethod
+%patch05 -p1 -b .mh-deadlock
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -365,6 +369,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Wed May 15 2013 Milan Crha <mcrha at redhat.com> - 3.4.4-5
+- Add patch for Red Hat bug #854017 (deadlock in MH-format camel provider)
+
 * Fri Nov 16 2012 Milan Crha <mcrha at redhat.com> - 3.4.4-4
 - Add patch for Red Hat bug #814341 (crash in ldap's authenticate_user)