diff --git a/bgo-562228-eds-mailbox-field.patch b/bgo-562228-eds-mailbox-field.patch new file mode 100644 index 0000000..bbb82e2 --- /dev/null +++ b/bgo-562228-eds-mailbox-field.patch @@ -0,0 +1,40 @@ +Index: servers/exchange/lib/e2k-autoconfig.c +=================================================================== +--- servers/exchange/lib/e2k-autoconfig.c (revision 9780) ++++ servers/exchange/lib/e2k-autoconfig.c (working copy) +@@ -1516,6 +1516,8 @@ validate (const char *owa_url, char *use + } + + if (*result == E2K_AUTOCONFIG_OK) { ++ int len; ++ + *result = e2k_autoconfig_check_global_catalog (ac, &op); + e2k_operation_free (&op); + +@@ -1524,6 +1526,13 @@ validate (const char *owa_url, char *use + path = g_strdup (euri->path + 1); + e2k_uri_free (euri); + ++ /* no slash at the end of path */ ++ len = strlen (path); ++ while (len && path [len - 1] == '/') { ++ path [len - 1] = '\0'; ++ len--; ++ } ++ + /* change a mailbox only if not set by the caller */ + if (!exchange_params->mailbox || !*exchange_params->mailbox) { + mailbox = strrchr (path, '/'); +@@ -1536,6 +1545,12 @@ validate (const char *owa_url, char *use + + g_free (exchange_params->mailbox); + exchange_params->mailbox = g_strdup (mailbox); ++ } else { ++ /* always strip the mailbox part from the path */ ++ char *slash = strrchr (path, '/'); ++ ++ if (slash) ++ *slash = '\0'; + } + + exchange_params->owa_path = g_strdup_printf ("%s%s", "/", path); diff --git a/bnc-435632-moving-contacts-crash.patch b/bnc-435632-moving-contacts-crash.patch new file mode 100644 index 0000000..de70029 --- /dev/null +++ b/bnc-435632-moving-contacts-crash.patch @@ -0,0 +1,10 @@ +--- addressbook/libedata-book/e-data-book-view.c ++++ addressbook/libedata-book/e-data-book-view.c +@@ -247,7 +247,6 @@ e_data_book_view_notify_update (EDataBookView *book_view, + + id = e_contact_get_const (contact, E_CONTACT_UID); + if (!id) { +- g_object_unref (contact); + g_mutex_unlock (book_view->priv->pending_mutex); + return; + } diff --git a/bnc-440265-list-not-saved.patch b/bnc-440265-list-not-saved.patch new file mode 100644 index 0000000..21ee53d --- /dev/null +++ b/bnc-440265-list-not-saved.patch @@ -0,0 +1,12 @@ +--- addressbook/backends/groupwise/e-book-backend-groupwise.c ++++ addressbook/backends/groupwise/e-book-backend-groupwise.c +@@ -848,6 +848,9 @@ set_members_in_gw_item (EGwItem *item, EContact *contact, EBookBackendGroupwise + email = v ? v->data : NULL; + } + } ++ ++ if (!id && !email) ++ email = e_vcard_attribute_get_value (attr); + if (id) { + member = g_new0 (EGroupMember , 1); + member->id = g_strdup (id); diff --git a/bnc-447121-gw-memory-crasher.patch b/bnc-447121-gw-memory-crasher.patch new file mode 100644 index 0000000..8e0d149 --- /dev/null +++ b/bnc-447121-gw-memory-crasher.patch @@ -0,0 +1,11 @@ +--- addressbook/backends/groupwise/e-book-backend-groupwise.c ++++ addressbook/backends/groupwise/e-book-backend-groupwise.c +@@ -2020,7 +2020,7 @@ e_book_backend_groupwise_get_contact_list (EBookBackend *backend, + g_object_unref (contact); + } + g_ptr_array_free (ids, TRUE); +- ids->len = 0; ++ ids = NULL; + } + } + else { diff --git a/bnc-449916-task-memo-description.patch b/bnc-449916-task-memo-description.patch new file mode 100644 index 0000000..b649e13 --- /dev/null +++ b/bnc-449916-task-memo-description.patch @@ -0,0 +1,58 @@ +Index: camel/providers/groupwise/camel-groupwise-folder.c +=================================================================== +--- camel/providers/groupwise/camel-groupwise-folder.c (revision 9780) ++++ camel/providers/groupwise/camel-groupwise-folder.c (working copy) +@@ -2686,7 +2686,21 @@ + g_string_append_printf (gstr, "UID:%s\n",e_gw_item_get_icalid (item)); + g_string_append_printf (gstr, "DTSTART:%s\n",e_gw_item_get_start_date (item)); + g_string_append_printf (gstr, "SUMMARY:%s\n", e_gw_item_get_subject (item)); +- g_string_append_printf (gstr, "DESCRIPTION:%s\n", e_gw_item_get_message (item)); ++ ++ temp = e_gw_item_get_message (item); ++ if (temp) { ++ g_string_append(gstr, "DESCRIPTION:"); ++ while (*temp) { ++ if (*temp == '\n') ++ g_string_append(gstr, "\\n"); ++ else ++ g_string_append_c(gstr, *temp); ++ temp++; ++ } ++ g_string_append(gstr, "\n"); ++ } ++ temp = NULL; ++ + g_string_append_printf (gstr, "DTSTAMP:%s\n", e_gw_item_get_creation_date (item)); + g_string_append_printf (gstr, "X-GWMESSAGEID:%s\n", e_gw_item_get_id (item)); + g_string_append_printf (gstr, "X-GWSHOW-AS:BUSY\n"); +@@ -2741,6 +2755,7 @@ + EGwItemOrganizer *org = NULL; + GString *gstr = g_string_new (NULL); + char **tmp = NULL; ++ const char *temp = NULL; + + tmp = g_strsplit (e_gw_item_get_id (item), "@", -1); + +@@ -2750,7 +2765,21 @@ + g_string_append_printf (gstr, "UID:%s\n",e_gw_item_get_icalid (item)); + g_string_append_printf (gstr, "DTSTART:%s\n",e_gw_item_get_start_date (item)); + g_string_append_printf (gstr, "SUMMARY:%s\n", e_gw_item_get_subject (item)); +- g_string_append_printf (gstr, "DESCRIPTION:%s\n", e_gw_item_get_message (item)); ++ ++ temp = e_gw_item_get_message (item); ++ if (temp) { ++ g_string_append(gstr, "DESCRIPTION:"); ++ while (*temp) { ++ if (*temp == '\n') ++ g_string_append(gstr, "\\n"); ++ else ++ g_string_append_c(gstr, *temp); ++ temp++; ++ } ++ g_string_append(gstr, "\n"); ++ } ++ temp = NULL; ++ + g_string_append_printf (gstr, "DTSTAMP:%s\n", e_gw_item_get_creation_date (item)); + g_string_append_printf (gstr, "X-GWMESSAGEID:%s\n", e_gw_item_get_id (item)); + g_string_append_printf (gstr, "X-GWRECORDID:%s\n", tmp[0]); diff --git a/evolution-data-server.changes b/evolution-data-server.changes index a12d844..9a0125c 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Dec 4 12:05:08 CET 2008 - abharath@suse.de + +- Patches added + + bnc#440265 - bnc-440265-list-not-saved.patch - Groupwise + Address Book Contact Lists Are Not Saved. + + bnc#447121 - bnc-447121-gw-memory-crasher.patch - gwise: + memory corruption crasher. + + bnc#449916 - bnc-449916-task-memo-description.patch - Loss of + data in Messages related to shared memos and + Assigned tasks. + + bgo#562228 - bgo-562228-eds-mailbox-field.patch - Login to + exchange fails if "mailbox" is filled manually in + the config wizard. + + bnc#435632 - bnc-435632-moving-contacts-crash.patch - Evo + crashed moving contacts to a different addressbook + ------------------------------------------------------------------- Fri Nov 21 05:45:40 CET 2008 - pchenthill@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 8e6b992..57e09ee 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -57,7 +57,7 @@ Obsoletes: evolution-data-server-32bit %endif Summary: Evolution Data Server Version: 2.24.1.1 -Release: 3 +Release: 4 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.24/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch @@ -93,6 +93,16 @@ Patch17: bnc-438730-loosing-more-state.patch Patch18: evolution-data-server-shared-nss-db.patch # PATCH-FIX-UPSTREAM eds-comp-percent.diff pchenthill@suse.de -- Wrapper function to get percent as int. Needed for sharepoint connector. Will be pushed upstream. Patch19: eds-comp-percent.diff +# PATCH-FIX-UPSTREAM bnc-440265-list-not-saved.patch bnc440265 sragavan@novell.com -- Patch yet to be pushed upstream. +Patch20: bnc-440265-list-not-saved.patch +# PATCH-FIX-UPSTREAM bnc-447121-gw-memory-crasher.patch bnc447121 sragavan@novell.com -- Patch yet to be pushed upstream. +Patch21: bnc-447121-gw-memory-crasher.patch +# PATCH-FIX-UPSTREAM bnc-449916-task-memo-description.patch bnc449916 abharath@suse.de -- Patch yet to be pushed upstream. +Patch22: bnc-449916-task-memo-description.patch +# PATCH-FIX-UPSTREAM bgo-562228-eds-mailbox-field.patch bgo562228 -- Fix has been submitted upstream. +Patch23: bgo-562228-eds-mailbox-field.patch +# PATCH-FIX-UPSTREAM bnc-435632-moving-contacts-crash.patch bnc435632 sragavan@novell.com -- Patch yet to be pushed upstream. +Patch24: bnc-435632-moving-contacts-crash.patch # PATCH-FIX-OPENSUSE eds-core-mapi-changes.diff msuman@suse.de -- This patch contains changes in the core code base for the MAPI provider. Patch100: eds-core-mapi-changes.diff Url: http://www.gnome.org @@ -179,6 +189,11 @@ documentation. %patch17 %patch18 -p1 %patch19 -p1 +%patch20 +%patch21 +%patch22 +%patch23 +%patch24 %patch100 -p1 %build @@ -251,6 +266,20 @@ echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib MONO_PATH=%{_libdir %{_datadir}/gtk-doc/html/* %changelog +* Thu Dec 04 2008 abharath@suse.de +- Patches added + + bnc#440265 - bnc-440265-list-not-saved.patch - Groupwise + Address Book Contact Lists Are Not Saved. + + bnc#447121 - bnc-447121-gw-memory-crasher.patch - gwise: + memory corruption crasher. + + bnc#449916 - bnc-449916-task-memo-description.patch - Loss of + data in Messages related to shared memos and + Assigned tasks. + + bgo#562228 - bgo-562228-eds-mailbox-field.patch - Login to + exchange fails if "mailbox" is filled manually in + the config wizard. + + bnc#435632 - bnc-435632-moving-contacts-crash.patch - Evo + crashed moving contacts to a different addressbook * Fri Nov 21 2008 pchenthill@suse.de - eds-comp-percent.diff : Adds wrapper function to get percentage complete for tasks. Required for sharepoint connector.