From 8802ee2bbc12b846b5f154c596400e8011e4ef51ba95ed83d5ae509016f83801 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 22 May 2008 23:40:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=31 --- ...ck-to-handle-specific-server-response.diff | 13 ++++++++++++ ...-leak-while-syncing-mails-for-offline.diff | 20 +++++++++++++++++++ ...ator-to-prevent-crash-in-offline-mail.diff | 15 ++++++++++++++ evolution-data-server.changes | 8 ++++++++ evolution-data-server.spec | 16 ++++++++++++++- 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 bgo-530514-check-to-handle-specific-server-response.diff create mode 100644 bgo-530543-leak-while-syncing-mails-for-offline.diff create mode 100644 bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff diff --git a/bgo-530514-check-to-handle-specific-server-response.diff b/bgo-530514-check-to-handle-specific-server-response.diff new file mode 100644 index 0000000..3d6d179 --- /dev/null +++ b/bgo-530514-check-to-handle-specific-server-response.diff @@ -0,0 +1,13 @@ +Index: camel/providers/groupwise/camel-groupwise-folder.c +=================================================================== +--- camel/providers/groupwise/camel-groupwise-folder.c 2008/05/19 10:25:42 8808 ++++ camel/providers/groupwise/camel-groupwise-folder.c 2008/05/19 10:33:21 8809 +@@ -1351,7 +1351,7 @@ + str = g_string_append (str, " "); + } + +- if (org->display_name[0] == '\0') { ++ if (org->display_name && org->display_name[0] == '\0') { + + str = g_string_append (str, org->email); + str = g_string_append (str, " "); diff --git a/bgo-530543-leak-while-syncing-mails-for-offline.diff b/bgo-530543-leak-while-syncing-mails-for-offline.diff new file mode 100644 index 0000000..8d34894 --- /dev/null +++ b/bgo-530543-leak-while-syncing-mails-for-offline.diff @@ -0,0 +1,20 @@ +Index: camel/providers/groupwise/camel-groupwise-folder.c +=================================================================== +--- camel/providers/groupwise/camel-groupwise-folder.c 2008/05/19 10:15:17 8806 ++++ camel/providers/groupwise/camel-groupwise-folder.c 2008/05/19 10:16:56 8807 +@@ -201,6 +201,7 @@ + + camel_message_info_free (&mi->info); + g_free (container_id); ++ g_object_unref (item); + return msg; + } + +@@ -1449,6 +1450,7 @@ + } + /******************** Caching stuff ends *************************/ + i++; ++ g_object_unref (item); + } + camel_operation_end (NULL); + g_free (container_id); diff --git a/bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff b/bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff new file mode 100644 index 0000000..52b4d5a --- /dev/null +++ b/bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff @@ -0,0 +1,15 @@ +Index: camel/providers/groupwise/camel-groupwise-folder.c +=================================================================== +--- camel/providers/groupwise/camel-groupwise-folder.c 2008/05/19 11:11:53 8810 ++++ camel/providers/groupwise/camel-groupwise-folder.c 2008/05/19 11:14:19 8811 +@@ -2163,8 +2163,8 @@ + _("This message is not available in offline mode.")); + + } else { +- camel_folder_summary_remove_uid (source->summary, uids->pdata[index]); +- camel_folder_change_info_remove_uid (changes, uids->pdata[index]); ++ camel_folder_summary_remove_uid (source->summary, uids->pdata[i]); ++ camel_folder_change_info_remove_uid (changes, uids->pdata[i]); + } + } + } diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 69b65ac..78719f1 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 21 21:27:53 IST 2008 - msuman@suse.de + +- Added + + bgo-530514-check-to-handle-specific-server-response.diff (Sankar P) + + bgo-530543-leak-while-syncing-mails-for-offline.diff (Sankar P) + + bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff (Sankar P) + ------------------------------------------------------------------- Wed May 14 16:28:59 IST 2008 - psankar@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 7d44197..a0a7215 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -18,7 +18,7 @@ Group: Development/Libraries/GNOME AutoReqProv: on Summary: Evolution Data Server Version: 2.22.1.1 -Release: 4 +Release: 6 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.22/%{name}-%{version}.tar.bz2 Patch0: evolution-data-server-configure.patch # PATCH-FIX-UPSTREAM bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 - @@ -37,6 +37,12 @@ Patch6: bnc-388579-ical-fix-for-exch.patch Patch7: bgo-532284-gw-double-free.patch # PATCH-FIX-UPSTREAM: bgo-533058-gw-debug-logs.patch bgo533058 psankar@suse.de - Fix is in upstream svn from 2.22.2 Patch8: bgo-533058-gw-debug-logs.patch +# PATCH-FIX-UPSTREAM: bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de - Fix is in upstream svn from 2.22.2 +Patch9: bgo-530514-check-to-handle-specific-server-response.diff +# PATCH-FIX-UPSTREAM: bgo-530543-leak-while-syncing-mails-for-offline.diff bgo530543 psankar@suse.de - Fix is in upstream svn from 2.22.2 +Patch10: bgo-530543-leak-while-syncing-mails-for-offline.diff +# PATCH-FIX-UPSTREAM: bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff bgo531009 psankar@suse.de - Fix is in upstream svn from 2.22.2 +Patch11: bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff # Change patch below if we move away from /opt/gnome # PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap Patch99: libgnomeui-dep.patch @@ -105,6 +111,9 @@ documentation. %patch6 %patch7 %patch8 +%patch9 +%patch10 +%patch11 %patch99 %build @@ -166,6 +175,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Wed May 21 2008 msuman@suse.de +- Added + + bgo-530514-check-to-handle-specific-server-response.diff (Sankar P) + + bgo-530543-leak-while-syncing-mails-for-offline.diff (Sankar P) + + bgo-531009-right-iterator-to-prevent-crash-in-offline-mail.diff (Sankar P) * Wed May 14 2008 psankar@suse.de - Removed: bnc-152070-eds-crash.patch - Removed: eds-compiler-warning.patch