r1725 - in /unstable/evolution-data-server/debian: changelog patches/01_imapx_lockup.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Sep 18 10:34:45 2010
New Revision: 1725

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1725
Log:
01_imapx_lockup.patch: stolen upstream. Avoid evolution lockups when 
logging out with IDLE enabled.

Added:
    unstable/evolution-data-server/debian/patches/01_imapx_lockup.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/series

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1725&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sat Sep 18 10:34:45 2010
@@ -1,3 +1,10 @@
+evolution-data-server (2.30.3-2) UNRELEASED; urgency=low
+
+  * 01_imapx_lockup.patch: stolen upstream. Avoid evolution lockups when 
+    logging out with IDLE enabled.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 18 Sep 2010 12:34:22 +0200
+
 evolution-data-server (2.30.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: unstable/evolution-data-server/debian/patches/01_imapx_lockup.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/01_imapx_lockup.patch?rev=1725&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/01_imapx_lockup.patch (added)
+++ unstable/evolution-data-server/debian/patches/01_imapx_lockup.patch Sat Sep 18 10:34:45 2010
@@ -1,0 +1,21 @@
+From 5e04a3462d5266b5a651562ab32fd572b348fc7a Mon Sep 17 00:00:00 2001
+From: David Woodhouse <David.Woodhouse at intel.com>
+Date: Tue, 14 Sep 2010 21:57:18 +0000
+Subject: Bug 629714 - endless loop in imapx_parse_status()
+
+---
+diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
+index f77ed3a..359891e 100644
+--- a/camel/providers/imapx/camel-imapx-utils.c
++++ b/camel/providers/imapx/camel-imapx-utils.c
+@@ -1731,7 +1731,7 @@ imapx_parse_status(CamelIMAPXStream *is, CamelException *ex)
+ 		/* ignore anything we dont know about */
+ 		do {
+ 			tok = camel_imapx_stream_token(is, &token, &len, ex);
+-			if (tok == '\n') {
++			if (tok == '\n' || tok < 0) {
+ 				camel_exception_set (ex, 1, "server response truncated");
+ 				imapx_free_status(sinfo);
+ 				return NULL;
+--
+cgit v0.8.3.1

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=1725&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Sat Sep 18 10:34:45 2010
@@ -1,3 +1,4 @@
+01_imapx_lockup.patch
 25_mute-debug-messages.patch
 45_libcamel_providers_version.patch
 65_evolution-color.patch