r2669 - in /jessie/evolution-data-server/debian: changelog patches/03_Use-after-free-gpg-verif.patch patches/05_imapx-Shared-folders-removed-folder-list-refresh.patch patches/series

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Thu Feb 12 11:58:41 UTC 2015 

Author: jordi
Date: Thu Feb 12 11:58:40 2015
New Revision: 2669

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2669
Log:
d/p/05_imapx-Shared-folders-removed-folder-list-refresh.patch: Fix shared
IMAP folders disappearing in some situations.

Added:
    jessie/evolution-data-server/debian/patches/05_imapx-Shared-folders-removed-folder-list-refresh.patch
Modified:
    jessie/evolution-data-server/debian/changelog
    jessie/evolution-data-server/debian/patches/03_Use-after-free-gpg-verif.patch
    jessie/evolution-data-server/debian/patches/series

Modified: jessie/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/jessie/evolution-data-server/debian/changelog?rev=2669&op=diff
==============================================================================
--- jessie/evolution-data-server/debian/changelog	(original)
+++ jessie/evolution-data-server/debian/changelog	Thu Feb 12 11:58:40 2015
@@ -1,3 +1,10 @@
+evolution-data-server (3.12.9~git20141128.5242b0-2+deb8u2) UNRELEASED; urgency=medium
+
+  * d/p/05_imapx-Shared-folders-removed-folder-list-refresh.patch: Fix shared
+    IMAP folders disappearing in some situations.
+
+ -- Jordi Mallach <jordi at debian.org>  Thu, 12 Feb 2015 10:59:19 +0100
+
 evolution-data-server (3.12.9~git20141128.5242b0-2+deb8u1) unstable; urgency=medium
 
   * d/p/03_Use-after-free-gpg-verif.patch: Fix crash during GPG signature

Modified: jessie/evolution-data-server/debian/patches/03_Use-after-free-gpg-verif.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/jessie/evolution-data-server/debian/patches/03_Use-after-free-gpg-verif.patch?rev=2669&op=diff
==============================================================================
--- jessie/evolution-data-server/debian/patches/03_Use-after-free-gpg-verif.patch	(original)
+++ jessie/evolution-data-server/debian/patches/03_Use-after-free-gpg-verif.patch	Thu Feb 12 11:58:40 2015
@@ -4,11 +4,11 @@
 Subject: Bug 741434 - Use-after-free after error in GPG signature verification
 
 
-diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
-index 742e943..0b694a7 100644
---- a/camel/camel-gpg-context.c
-+++ b/camel/camel-gpg-context.c
-@@ -1888,6 +1888,7 @@ gpg_verify_sync (CamelCipherContext *context,
+Index: evolution-data-server-3.12.9~git20141128.5242b0/camel/camel-gpg-context.c
+===================================================================
+--- evolution-data-server-3.12.9~git20141128.5242b0.orig/camel/camel-gpg-context.c
++++ evolution-data-server-3.12.9~git20141128.5242b0/camel/camel-gpg-context.c
+@@ -1889,6 +1889,7 @@ gpg_verify_sync (CamelCipherContext *con
  
  	g_object_unref (filter);
  	g_object_unref (istream);
@@ -16,6 +16,3 @@
  
  	g_seekable_seek (G_SEEKABLE (canon_stream), 0, G_SEEK_SET, NULL, NULL);
  
--- 
-cgit v0.10.1
-

Added: jessie/evolution-data-server/debian/patches/05_imapx-Shared-folders-removed-folder-list-refresh.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/jessie/evolution-data-server/debian/patches/05_imapx-Shared-folders-removed-folder-list-refresh.patch?rev=2669&op=file
==============================================================================
--- jessie/evolution-data-server/debian/patches/05_imapx-Shared-folders-removed-folder-list-refresh.patch	(added)
+++ jessie/evolution-data-server/debian/patches/05_imapx-Shared-folders-removed-folder-list-refresh.patch	Thu Feb 12 11:58:40 2015
@@ -0,0 +1,77 @@
+From c64b95c59e5774a6eb335805122fae5cd54f0bbf Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 11 Feb 2015 18:13:37 +0100
+Subject: Bug 743533 - [IMAPx] Shared folders removed on folder list refresh
+
+
+Index: evolution-data-server-3.12.9~git20141128.5242b0/camel/providers/imapx/camel-imapx-store.c
+===================================================================
+--- evolution-data-server-3.12.9~git20141128.5242b0.orig/camel/providers/imapx/camel-imapx-store.c
++++ evolution-data-server-3.12.9~git20141128.5242b0/camel/providers/imapx/camel-imapx-store.c
+@@ -1425,8 +1425,6 @@ sync_folders (CamelIMAPXStore *imapx_sto
+ {
+ 	CamelIMAPXServer *server;
+ 	GHashTable *folder_info_results;
+-	GPtrArray *array;
+-	guint ii;
+ 	gboolean success;
+ 
+ 	server = camel_imapx_store_ref_server (imapx_store, NULL, FALSE, cancellable, error);
+@@ -1486,48 +1484,6 @@ sync_folders (CamelIMAPXStore *imapx_sto
+ 		g_mutex_unlock (&imapx_store->priv->mailboxes_lock);
+ 	}
+ 
+-	array = camel_store_summary_array (imapx_store->summary);
+-
+-	for (ii = 0; ii < array->len; ii++) {
+-		CamelStoreInfo *si;
+-		CamelFolderInfo *fi;
+-		const gchar *mailbox_name;
+-		const gchar *si_path;
+-		gboolean pattern_match;
+-
+-		si = g_ptr_array_index (array, ii);
+-		si_path = camel_store_info_path (imapx_store->summary, si);
+-
+-		mailbox_name = ((CamelIMAPXStoreInfo *) si)->mailbox_name;
+-		if (mailbox_name == NULL || *mailbox_name == '\0')
+-			continue;
+-
+-		pattern_match =
+-			(root_folder_path == NULL) ||
+-			(*root_folder_path == '\0') ||
+-			(g_str_has_prefix (si_path, root_folder_path));
+-		if (!pattern_match)
+-			continue;
+-
+-		fi = g_hash_table_lookup (folder_info_results, mailbox_name);
+-
+-		if (fi == NULL) {
+-			gchar *dup_folder_path = g_strdup (si_path);
+-
+-			if (dup_folder_path != NULL) {
+-				/* Do not unsubscribe from it, it influences UI for non-subscribable folders */
+-				imapx_delete_folder_from_cache (
+-					imapx_store, dup_folder_path);
+-				g_free (dup_folder_path);
+-			} else {
+-				camel_store_summary_remove (
+-					imapx_store->summary, si);
+-			}
+-		}
+-	}
+-
+-	camel_store_summary_array_free (imapx_store->summary, array);
+-
+ exit:
+ 	g_hash_table_destroy (folder_info_results);
+ 
+@@ -1771,7 +1727,7 @@ imapx_store_get_folder_info_sync (CamelS
+ 	}
+ 
+ 	/* XXX I don't know why the SUBSCRIBED flag matters here. */
+-	if (!initial_setup && flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) {
++	if (!initial_setup && (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) != 0) {
+ 		time_t time_since_last_refresh;
+ 
+ 		time_since_last_refresh =

Modified: jessie/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/jessie/evolution-data-server/debian/patches/series?rev=2669&op=diff
==============================================================================
--- jessie/evolution-data-server/debian/patches/series	(original)
+++ jessie/evolution-data-server/debian/patches/series	Thu Feb 12 11:58:40 2015
@@ -1,3 +1,4 @@
 02_Only-export-symbols-starting-with-e.patch
 03_Use-after-free-gpg-verif.patch
 04_sqlite-Track-pending-sync-requests.patch
+05_imapx-Shared-folders-removed-folder-list-refresh.patch

More information about the pkg-evolution-commits mailing list