From 076e773739d71914b7d527b2b1f5fcdfbbd63cffe434652a30ce9aad28ed608e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Jun 2008 14:12:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=32 --- bnc-394654-eds-crasher.patch | 31 +++++++++++++++++++++++++++++++ evolution-data-server.changes | 6 ++++++ evolution-data-server.spec | 8 +++++++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 bnc-394654-eds-crasher.patch diff --git a/bnc-394654-eds-crasher.patch b/bnc-394654-eds-crasher.patch new file mode 100644 index 0000000..6b0c9b9 --- /dev/null +++ b/bnc-394654-eds-crasher.patch @@ -0,0 +1,31 @@ +Index: servers/groupwise/e-gw-item.c +=================================================================== +--- servers/groupwise/e-gw-item.c (revision 8803) ++++ servers/groupwise/e-gw-item.c (working copy) +@@ -543,7 +543,7 @@ e_gw_item_init (EGwItem *item, EGwItemCl + priv->attach_list = NULL ; + priv->simple_fields = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free); + priv->full_name = g_new0(FullName, 1); +- priv->addresses = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_postal_address); ++ priv->addresses = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, free_postal_address); + priv->additions = g_hash_table_new(g_str_hash, g_str_equal); + priv->updates = g_hash_table_new (g_str_hash, g_str_equal); + priv->deletions = g_hash_table_new (g_str_hash, g_str_equal); +@@ -1277,7 +1277,7 @@ set_contact_fields_from_soap_parameter ( + add = "Other"; + + if (value) +- g_hash_table_insert (item->priv->addresses, (char*)add, address); ++ g_hash_table_insert (item->priv->addresses, (char *) add, address); + else + free_postal_address (address); + g_free (value); +@@ -1411,7 +1411,7 @@ set_organization_fields_from_soap_parame + if (subparam) { + address = g_new0 (PostalAddress, 1); + set_postal_address_from_soap_parameter (address, subparam); +- g_hash_table_insert (item->priv->addresses, g_strdup ("Office"), address); ++ g_hash_table_insert (item->priv->addresses, "Office", address); + + } + diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 78719f1..6847eb1 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 2 10:43:43 CEST 2008 - abharath@suse.de + +- Added + + bnc#394654 - bnc-394654-eds-crasher.patch: EDS crasher (Chenthill) + ------------------------------------------------------------------- Wed May 21 21:27:53 IST 2008 - msuman@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index a0a7215..b998f6c 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: 6 +Release: 9 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 - @@ -43,6 +43,8 @@ Patch9: bgo-530514-check-to-handle-specific-server-response.diff 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 +# PATCH-FIX-UPSTREAM: bnc-394654-eds-crasher.patch bnc394654 pchenthill@suse.de -- +Patch12: bnc-394654-eds-crasher.patch # 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 @@ -114,6 +116,7 @@ documentation. %patch9 %patch10 %patch11 +%patch12 %patch99 %build @@ -175,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Mon Jun 02 2008 abharath@suse.de +- Added + + bnc#394654 - bnc-394654-eds-crasher.patch: EDS crasher (Chenthill) * Wed May 21 2008 msuman@suse.de - Added + bgo-530514-check-to-handle-specific-server-response.diff (Sankar P)