diff --git a/bgo-533058-gw-debug-logs.patch b/bgo-533058-gw-debug-logs.patch new file mode 100644 index 0000000..78bcebf --- /dev/null +++ b/bgo-533058-gw-debug-logs.patch @@ -0,0 +1,80 @@ +Index: servers/groupwise/soup-soap-response.c +=================================================================== +--- servers/groupwise/soup-soap-response.c (revision 8790) ++++ servers/groupwise/soup-soap-response.c (working copy) +@@ -562,3 +562,19 @@ soup_xml_real_node (xmlNode *node) + node = node->next; + return node; + } ++ ++ ++int ++soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer) ++{ ++ xmlChar *xmlbuff; ++ int buffersize, ret; ++ ++ SoupSoapResponsePrivate *priv = SOUP_SOAP_RESPONSE_GET_PRIVATE (response); ++ xmlDocDumpFormatMemory(priv->xmldoc, &xmlbuff, &buffersize, 1); ++ ++ ret = fputs ((char *) xmlbuff, buffer); ++ xmlFree (xmlbuff); ++ ++ return ret; ++} +Index: servers/groupwise/soup-soap-response.h +=================================================================== +--- servers/groupwise/soup-soap-response.h (revision 8790) ++++ servers/groupwise/soup-soap-response.h (working copy) +@@ -61,6 +61,9 @@ SoupSoapParameter *soup_soap_response_ge + SoupSoapParameter *from, + const char *name); + ++int soup_soap_response_dump_response (SoupSoapResponse *response, FILE *buffer); ++ ++ + G_END_DECLS + + #endif +Index: servers/groupwise/e-gw-connection.c +=================================================================== +--- servers/groupwise/e-gw-connection.c (revision 8790) ++++ servers/groupwise/e-gw-connection.c (working copy) +@@ -444,16 +444,18 @@ e_gw_connection_init (EGwConnection *cnc + priv->book_list = NULL; + priv->opts = NULL; + +- if (g_getenv ("GROUPWISE_DEBUG")) { ++ /* README: We do not use libsoup logger and use our own as we need formatted output etc. */ ++ /* ++ if (g_getenv ("GROUPWISE_DEBUG")) { + if (atoi (g_getenv ("GROUPWISE_DEBUG")) == 1) { + SoupLogger *logger; + +- logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, +- SOUP_LOGGER_LOG_BODY); ++ logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); + soup_logger_attach (logger, priv->soup_session); + g_object_unref (logger); + } + } ++ */ + } + + GType +@@ -675,6 +677,15 @@ e_gw_connection_send_message (EGwConnect + + /* process response */ + response = soup_soap_message_parse_response (msg); ++ ++ if (g_getenv ("GROUPWISE_DEBUG")) { ++ ++ /* README: The stdout can be replaced with Evolution's ++ Logging framework also */ ++ ++ soup_soap_response_dump_response (response, stdout); ++ g_print ("\n------\n"); ++ } + + return response; + } diff --git a/bnc-152070-eds-crash.patch b/bnc-152070-eds-crash.patch deleted file mode 100644 index 62d24b0..0000000 --- a/bnc-152070-eds-crash.patch +++ /dev/null @@ -1,16 +0,0 @@ -=== modified file 'addressbook/backends/groupwise/e-book-backend-groupwise.c' ---- addressbook/backends/groupwise/e-book-backend-groupwise.c 2007-12-18 16:36:30 +0000 -+++ addressbook/backends/groupwise/e-book-backend-groupwise.c 2007-12-18 16:42:36 +0000 -@@ -2421,6 +2421,11 @@ - EList *views = e_book_backend_get_book_views (E_BOOK_BACKEND (ebgw)); - EIterator *iter; - EDataBookView *rv = NULL; -+ -+ if (!iter) { -+ g_object_unref (views); -+ return NULL; -+ } - - if (!views) - return NULL; - diff --git a/bnc-163982-system-hang-with-126-error-popups.patch b/bnc-163982-system-hang-with-126-error-popups.patch deleted file mode 100644 index 668c891..0000000 --- a/bnc-163982-system-hang-with-126-error-popups.patch +++ /dev/null @@ -1,40 +0,0 @@ -=== modified file 'calendar/backends/file/e-cal-backend-file.c' ---- calendar/backends/file/e-cal-backend-file.c 2007-12-18 16:36:30 +0000 -+++ calendar/backends/file/e-cal-backend-file.c 2007-12-18 16:42:10 +0000 -@@ -128,6 +128,7 @@ - GnomeVFSFileSize out; - gchar *tmp, *backup_uristr; - char *buf; -+ char *error = NULL; - ECalBackendFile *cbfile = user_data; - - priv = cbfile->priv; -@@ -200,12 +201,15 @@ - g_static_rec_mutex_unlock (&priv->idle_save_rmutex); - e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), - _("Cannot save calendar data: Malformed URI.")); -- return TRUE; -+ return FALSE; - - error: - g_static_rec_mutex_unlock (&priv->idle_save_rmutex); -- e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), gnome_vfs_result_to_string (result)); -- return TRUE; -+ /* error = g_strconcat (_("Can't save calendar data: "), gnome_vfs_result_to_string (result), NULL); -+ e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), error); -+ g_free (error); */ -+ e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), gnome_vfs_result_to_string (result)); -+ return FALSE; - } - - static void -@@ -520,8 +524,6 @@ - g_assert (icalcomp != NULL); - - icalcomponent_add_component (priv->icalcomp, icalcomp); -- -- save (cbfile); - } - } - - diff --git a/bnc-388579-ical-fix-for-exch.patch b/bnc-388579-ical-fix-for-exch.patch new file mode 100644 index 0000000..8470e69 --- /dev/null +++ b/bnc-388579-ical-fix-for-exch.patch @@ -0,0 +1,28 @@ +--- calendar/libecal/e-cal-component.c 2008-05-09 13:12:53.000000000 +0530 ++++ calendar/libecal/e-cal-component.c 2008-05-09 13:24:49.000000000 +0530 +@@ -307,8 +307,15 @@ free_icalcomponent (ECalComponent *comp, + + priv->status = NULL; + +- for (l = priv->attachment_list; l != NULL; l = l->next) +- g_free (l->data); ++ for (l = priv->attachment_list; l != NULL; l = l->next) { ++ struct attachment *attachment; ++ ++ attachment = l->data; ++ ++ icalattach_unref (attachment->attach); ++ g_free (attachment); ++ } ++ + g_slist_free (priv->attachment_list); + priv->attachment_list = NULL; + +@@ -532,6 +539,7 @@ scan_attachment (GSList **attachment_lis + attachment->prop = prop; + + attachment->attach = icalproperty_get_attach (prop); ++ icalattach_ref (attachment->attach); + + *attachment_list = g_slist_append (*attachment_list, attachment); + } diff --git a/eds-compiler-warning.patch b/eds-compiler-warning.patch deleted file mode 100644 index 0f2ccf8..0000000 --- a/eds-compiler-warning.patch +++ /dev/null @@ -1,27 +0,0 @@ -=== modified file 'addressbook/backends/ldap/e-book-backend-ldap.c' ---- addressbook/backends/ldap/e-book-backend-ldap.c 2007-12-18 16:36:30 +0000 -+++ addressbook/backends/ldap/e-book-backend-ldap.c 2007-12-18 17:02:35 +0000 -@@ -2463,6 +2463,8 @@ - diff -= start.tv_sec * 1000 + start.tv_usec/1000; - - printf ("e_book_backend_ldap_get_contact_list invoked contact_list_handler "); -+ diff = end.tv_sec * 1000 + end.tv_usec/1000; -+ diff -= start.tv_sec * 1000 + start.tv_usec/1000; - printf ("and took %ld.%03ld seconds\n", diff/1000, diff%1000); - } - } - -=== modified file 'servers/exchange/storage/exchange-account.c' ---- servers/exchange/storage/exchange-account.c 2007-12-18 16:36:30 +0000 -+++ servers/exchange/storage/exchange-account.c 2007-12-18 17:02:35 +0000 -@@ -2011,6 +2011,9 @@ - E2kGlobalCatalogEntry *entry=NULL; /* This is never set before it's used! */ - int max_pwd_age_days = -1; - -+ /* Bull. The comment above is totally bogus. */ -+ entry = NULL; -+ - g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), 0); - - max_pwd_age_days = find_passwd_exp_period (account, entry); - diff --git a/evolution-data-server-abuild.patch b/evolution-data-server-abuild.patch deleted file mode 100644 index 4a93809..0000000 --- a/evolution-data-server-abuild.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: evolution-data-server-2.21.90/addressbook/backends/groupwise/e-book-backend-groupwise.c -=================================================================== ---- evolution-data-server-2.21.90.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c -+++ evolution-data-server-2.21.90/addressbook/backends/groupwise/e-book-backend-groupwise.c -@@ -2422,11 +2422,6 @@ find_book_view (EBookBackendGroupwise *e - EIterator *iter; - EDataBookView *rv = NULL; - -- if (!iter) { -- g_object_unref (views); -- return NULL; -- } -- - if (!views) - return NULL; - diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 6807eae..69b65ac 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed May 14 16:28:59 IST 2008 - psankar@suse.de + +- Removed: bnc-152070-eds-crash.patch +- Removed: eds-compiler-warning.patch +- Removed: evolution-data-server-abuild.patch +- Removed: bnc-163982-system-hang-with-126-error-popups.patch +- Removed: ical-fix-for-exchange-crasher.diff + +- The above patches are no longer needed + as the tarball has these patches within. + +- Added: bgo-533058-gw-debug-logs.patch - Enable Debug logs for GroupWise (Sankar) +- Added: bnc-388579-ical-fix-for-exch.patch - ical fixes for exchange (Chenthill) + +- Enabled Kerberos 4: FATE id: 301476 + ------------------------------------------------------------------- Thu May 8 08:24:35 CEST 2008 - psankar@suse.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 35f60aa..7d44197 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -18,27 +18,25 @@ Group: Development/Libraries/GNOME AutoReqProv: on Summary: Evolution Data Server Version: 2.22.1.1 -Release: 1 +Release: 4 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 -- Fix is in upstream svn. -Patch3: bnc-164367-gw-attachments-appts-throw-error.patch -# PATCH-NEEDS-REBASE: bnc-163982-system-hang-with-126-error-popups.patch -Patch4: bnc-163982-system-hang-with-126-error-popups.patch -# PATCH-FIX-UPSTREAM bnc-152070-eds-crash.patch bnc152070 -- Fix is in upstream svn. -Patch5: bnc-152070-eds-crash.patch +# PATCH-FIX-UPSTREAM bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 - +Patch1: bnc-164367-gw-attachments-appts-throw-error.patch # PATCH-FIX-UPSTREAM bnc-188523-eds-fix-authenticated-proxy-support.diff msuman@suse.de -- -Patch8: bnc-188523-eds-fix-authenticated-proxy-support.diff -Patch10: eds-compiler-warning.patch +Patch2: bnc-188523-eds-fix-authenticated-proxy-support.diff # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. -Patch11: evolution-data-server-1.11.5-cert-auth-complete.patch +Patch3: evolution-data-server-1.11.5-cert-auth-complete.patch # PATCH-FIX-UPSTREAM bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo. -Patch12: bnc-304835-ex-crash-after-restart.patch +Patch4: bnc-304835-ex-crash-after-restart.patch # PATCH-FIX-UPSTREAM: bnc-307861-calendar-auth.diff - bnc307861 bgo253574 -- Fix has been submitted to bgo. -Patch13: bnc-307861-calendar-auth.diff -Patch14: evolution-data-server-abuild.patch -Patch15: ical-fix-for-exchange-crasher.diff -Patch16: bgo-532284-gw-double-free.patch +Patch5: bnc-307861-calendar-auth.diff +# PATCH-FIX-UPSTREAM: bnc-388579-ical-fix-for-exch.patch bnc388579 psankar@suse.de - Fix is in upstream svn from 2.22.2 +Patch6: bnc-388579-ical-fix-for-exch.patch +# PATCH-FIX-UPSTREAM: bgo-532284-gw-double-free.patch bgo532284 psankar@suse.de - Fix is in upstream svn from 2.22.2 +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 # 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 @@ -99,17 +97,14 @@ documentation. %prep %setup -q %patch0 -#%patch3 -#%patch4 -#%patch5 +%patch1 +%patch2 +###%patch3 +###%patch4 +###%patch5 +%patch6 +%patch7 %patch8 -#%patch10 -###%patch11 -###%patch12 -#%patch13 -#%patch14 -p1 -%patch15 -%patch16 %patch99 %build @@ -127,6 +122,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" --libexecdir=%{_prefix}/lib/evolution-data-server\ --with-openldap\ --with-krb5=/usr\ + --with-krb4=/usr\ --enable-gnome-keyring\ --enable-gtk-doc\ --enable-ssl @@ -170,6 +166,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Wed May 14 2008 psankar@suse.de +- Removed: bnc-152070-eds-crash.patch +- Removed: eds-compiler-warning.patch +- Removed: evolution-data-server-abuild.patch +- Removed: bnc-163982-system-hang-with-126-error-popups.patch +- Removed: ical-fix-for-exchange-crasher.diff +- The above patches are no longer needed + as the tarball has these patches within. +- Added: bgo-533058-gw-debug-logs.patch - Enable Debug logs for GroupWise (Sankar) +- Added: bnc-388579-ical-fix-for-exch.patch - ical fixes for exchange (Chenthill) +- Enabled Kerberos 4: FATE id: 301476 * Thu May 08 2008 psankar@suse.de - Push 2.22.1.1 tarball - No crypto changes diff --git a/ical-fix-for-exchange-crasher.diff b/ical-fix-for-exchange-crasher.diff deleted file mode 100644 index f50b523..0000000 --- a/ical-fix-for-exchange-crasher.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- calendar/libecal/e-cal-component.c 2008-05-07 15:42:08.000000000 +0530 -+++ calendar/libecal/e-cal-component.c 2008-05-07 15:43:05.000000000 +0530 -@@ -532,6 +532,7 @@ scan_attachment (GSList **attachment_lis - attachment->prop = prop; - - attachment->attach = icalproperty_get_attach (prop); -+ icalattach_ref (attachment->attach); - - *attachment_list = g_slist_append (*attachment_list, attachment); - }