Hello community, here is the log from the commit of package evolution-data-server checked in at Sat Apr 22 01:24:48 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-04-20 12:27:45.000000000 +0200 +++ STABLE/evolution-data-server/evolution-data-server.changes 2006-04-21 12:45:33.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Apr 21 12:44:25 CEST 2006 - sragavan@novell.com + +- Fixes (bgo) + 310433 - Should not allow renaming standard folders. - Sushma + 329371 - Use name in email format doesnot work. +- Fixes (bnc) + 164323 - Updated the previous patch for randomly marking messages unread. + +-------------------------------------------------------------------- +Fri Apr 21 07:31:29 CEST 2006 - sragavan@novell.com + +- Fixes (bnc) + 159934 - Fix for eds CPU high usage (Devashish) + 165714 - Send item id while delegating multiple events. (Harish) +- eds-kerb-check.diff - Ensure checks for expiry take effect while + trying for nt domain. (Harish) + +-------------------------------------------------------------------- New: ---- bgo-310433-eds-deny-rename-stdfolders.diff bgo-329371-eds-fix-full-username-email-format.patch bnc-159934-eds-CPU-spikes.patch bnc-164323-random-mark-unread-updated.patch bnc-165714-eds-delegate-multiple-events.diff eds-kerb-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.QuO1h9/_old 2006-04-22 01:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.QuO1h9/_new 2006-04-22 01:24:37.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 25 +Release: 28 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2 #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -67,6 +67,12 @@ Patch46: bnc-164323-random-mark-unread.patch Patch47: 167566-camel-groupwise-summary.patch Patch48: 167640-camel-groupwise-store.patch +Patch49: bnc-159934-eds-CPU-spikes.patch +Patch50: eds-kerb-check.diff +Patch51: bnc-165714-eds-delegate-multiple-events.diff +Patch52: bgo-310433-eds-deny-rename-stdfolders.diff +Patch53: bgo-329371-eds-fix-full-username-email-format.patch +Patch54: bnc-164323-random-mark-unread-updated.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -145,6 +151,12 @@ %patch46 %patch47 %patch48 +%patch49 +%patch50 +%patch51 +%patch52 +%patch53 +%patch54 %build rename no nb po/no.* @@ -194,6 +206,18 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Fri Apr 21 2006 - sragavan@novell.com +- Fixes (bgo) + 310433 - Should not allow renaming standard folders. - Sushma + 329371 - Use name in email format doesnot work. +- Fixes (bnc) + 164323 - Updated the previous patch for randomly marking messages unread. +* Fri Apr 21 2006 - sragavan@novell.com +- Fixes (bnc) + 159934 - Fix for eds CPU high usage (Devashish) + 165714 - Send item id while delegating multiple events. (Harish) +- eds-kerb-check.diff - Ensure checks for expiry take effect while + trying for nt domain. (Harish) * Thu Apr 20 2006 - psankar@novell.com - Fixes (bnc) 167566 - Crash on disable account - Sankar ++++++ bgo-310433-eds-deny-rename-stdfolders.diff ++++++ Index: servers/exchange/storage/exchange-hierarchy-webdav.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-hierarchy-webdav.c,v retrieving revision 1.11 diff -u -p -r1.11 exchange-hierarchy-webdav.c --- servers/exchange/storage/exchange-hierarchy-webdav.c 25 Feb 2006 06:09:14 -0000 1.11 +++ servers/exchange/storage/exchange-hierarchy-webdav.c 6 Apr 2006 13:50:35 -0000 @@ -421,7 +421,7 @@ xfer_folder (ExchangeHierarchy *hier, EF * update folder size in case of rename. */ - source_folder_name = strrchr (physical_uri + 1, '/'); + source_folder_name = strrchr (physical_uri, '/') + 1; source_parent = g_strndup (physical_uri, source_folder_name - physical_uri); if (!strcmp (e_folder_get_physical_uri (dest_parent), source_parent)) { ++++++ bgo-329371-eds-fix-full-username-email-format.patch ++++++ Index: servers/exchange/lib/e2k-uri.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/lib/e2k-uri.c,v retrieving revision 1.5 diff -u -p -r1.5 e2k-uri.c --- servers/exchange/lib/e2k-uri.c 27 Jan 2006 14:16:06 -0000 1.5 +++ servers/exchange/lib/e2k-uri.c 18 Apr 2006 10:00:10 -0000 @@ -109,14 +109,6 @@ e2k_uri_new (const char *uri_string) *backslash = '\0'; uri->user = g_strdup (backslash + 1); } - else { - /* if backslash is not there check for @ */ - user_at = strchr (uri->user, '@'); - if (user_at) { - *user_at = '\0'; - uri->domain = g_strdup (user_at + 1); - } - } } else uri->user = uri->passwd = uri->domain = NULL; Index: servers/exchange/lib/e2k-validate.h =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/lib/e2k-validate.h,v retrieving revision 1.3 diff -u -p -r1.3 e2k-validate.h --- servers/exchange/lib/e2k-validate.h 1 Jul 2005 05:43:21 -0000 1.3 +++ servers/exchange/lib/e2k-validate.h 18 Apr 2006 10:00:47 -0000 @@ -36,7 +36,7 @@ typedef enum { E2K_AUTOCONFIG_FAILED } E2kAutoconfigResult; -gboolean e2k_validate_user (const char *owa_url, char *user, ExchangeParams *exchange_params, gboolean *remember_password, E2kAutoconfigResult *result); +gboolean e2k_validate_user (const char *owa_url, char **user, ExchangeParams *exchange_params, gboolean *remember_password, E2kAutoconfigResult *result); #ifdef __cplusplus Index: servers/exchange/lib/e2k-autoconfig.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/lib/e2k-autoconfig.c,v retrieving revision 1.14 diff -u -p -r1.14 e2k-autoconfig.c --- servers/exchange/lib/e2k-autoconfig.c 6 Mar 2006 06:00:25 -0000 1.14 +++ servers/exchange/lib/e2k-autoconfig.c 18 Apr 2006 10:02:36 -0000 @@ -1002,6 +1002,7 @@ set_account_uri_string (E2kAutoconfig *a g_string_append (uri, ";mailbox="); e2k_uri_append_encoded (uri, mailbox, FALSE, ";?"); } + printf ("set account uri string: mailbox = %s \n", mailbox); g_string_append (uri, ";owa_path=/"); e2k_uri_append_encoded (uri, path, FALSE, ";?"); g_free (path); @@ -1505,6 +1506,7 @@ validate (const char *owa_url, char *use *mailbox++ = '\0'; exchange_params->mailbox = g_strdup (mailbox); + printf ("validate: mailbox = %s \n", exchange_params->mailbox); exchange_params->owa_path = g_strdup_printf ("%s%s", "/", path); g_free (path); exchange_params->host = g_strdup (ac->pf_server); @@ -1619,14 +1621,20 @@ validate (const char *owa_url, char *use } gboolean -e2k_validate_user (const char *owa_url, char *user, +e2k_validate_user (const char *owa_url, char **user, ExchangeParams *exchange_params, gboolean *remember_password, E2kAutoconfigResult *result) { gboolean valid = FALSE, remember=FALSE; char *key, *password, *prompt; + char *username; + gchar **usernames; + int try = 0; - key = g_strdup_printf ("%s//%s@%s/", "exchange:", user, owa_url); /* FIXME */ +try_auth_again: + username = g_strdup (*user); + + key = g_strdup_printf ("%s//%s@%s/", "exchange:", username, owa_url); /* FIXME */ password = e_passwords_get_password ("Exchange", key); if (password) { /* This can be the case, where user presses authenticate button and @@ -1636,7 +1644,7 @@ e2k_validate_user (const char *owa_url, e_passwords_forget_password ("Exchange", key); } - prompt = g_strdup_printf (_("Enter password for %s"), user); + prompt = g_strdup_printf (_("Enter password for %s"), username); password = e_passwords_ask_password (_("Enter password"), "Exchange", key, prompt, E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, @@ -1644,10 +1652,11 @@ e2k_validate_user (const char *owa_url, g_free (prompt); if (!password) { g_free (key); + g_free (username); return valid; } - valid = validate (owa_url, user, password, exchange_params, result); + valid = validate (owa_url, username, password, exchange_params, result); if (valid) { /* generate the proper key once the host name * is read and remember password temporarily, @@ -1659,18 +1668,35 @@ e2k_validate_user (const char *owa_url, g_free (key); if (exchange_params->is_ntlm) key = g_strdup_printf ("exchange://%s;auth=NTLM@%s/", - user, exchange_params->host); + username, exchange_params->host); else - key = g_strdup_printf ("exchange://%s@%s/", user, exchange_params->host); + key = g_strdup_printf ("exchange://%s@%s/", username, exchange_params->host); e_passwords_add_password (key, password); e_passwords_remember_password ("Exchange", key); } else { + if (try == 0) { + /* Check for name as e-mail id and try once again + * extracing username from e-mail id. + */ + usernames = g_strsplit (*user, "@", 2); + if (usernames && usernames[0] && usernames[1]) { + username = g_strdup (usernames[0]); + g_strfreev (usernames); + try ++; + memset(*user, 0, strlen(*user)); + g_free (*user); + *user = g_strdup (username); + g_free (username); + goto try_auth_again; + } + } /* if validation failed*/ e_passwords_forget_password ("Exchange", key); } g_free (key); g_free (password); + g_free (username); return valid; } ++++++ bnc-159934-eds-CPU-spikes.patch ++++++ ++++ 1608 lines (skipped) ++++++ bnc-164323-random-mark-unread-updated.patch ++++++ Index: camel/providers/groupwise/camel-groupwise-folder.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v retrieving revision 1.129 diff -u -p -r1.129 camel-groupwise-folder.c --- camel/providers/groupwise/camel-groupwise-folder.c 17 Apr 2006 10:26:16 -0000 1.129 +++ camel/providers/groupwise/camel-groupwise-folder.c 18 Apr 2006 15:14:40 -0000 @@ -586,11 +586,7 @@ groupwise_sync (CamelFolder *folder, gbo EGwConnectionStatus status; EGwConnection *cnc; int count, i; - - /* Sync-up the (un)read changes before getting updates, - so that the getFolderList will reflect the most recent changes too */ - groupwise_sync (folder, FALSE, ex); - + if (((CamelOfflineStore *) gw_store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL || ((CamelService *)gw_store)->status == CAMEL_SERVICE_DISCONNECTED) { groupwise_sync_summary (folder, ex); @@ -896,6 +892,10 @@ groupwise_refresh_folder(CamelFolder *fo char *time_string = NULL, *t_str = NULL; struct _folder_update_msg *msg; gboolean check_all = FALSE; + + /* Sync-up the (un)read changes before getting updates, + so that the getFolderList will reflect the most recent changes too */ + groupwise_sync (folder, FALSE, ex); if (((CamelOfflineStore *) gw_store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) { g_warning ("In offline mode. Cannot refresh!!!\n"); ++++++ bnc-165714-eds-delegate-multiple-events.diff ++++++ Index: calendar/backends/groupwise/e-cal-backend-groupwise.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise.c,v retrieving revision 1.173.2.1 diff -u -p -r1.173.2.1 e-cal-backend-groupwise.c --- calendar/backends/groupwise/e-cal-backend-groupwise.c 6 Apr 2006 08:18:28 -0000 1.173.2.1 +++ calendar/backends/groupwise/e-cal-backend-groupwise.c 21 Apr 2006 06:23:23 -0000 @@ -1814,12 +1814,11 @@ e_cal_backend_groupwise_modify_object (E in_offline (cbgw); return GNOME_Evolution_Calendar_RepositoryOffline; } - + /* check the component for validity */ icalcomp = icalparser_parse_string (calobj); if (!icalcomp) return GNOME_Evolution_Calendar_InvalidObject; - comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomp); e_cal_component_get_uid (comp, &uid); @@ -1844,9 +1843,8 @@ e_cal_backend_groupwise_modify_object (E if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) { recur_key = uid; - } else { - id = e_gw_item_get_id (item); - } + } + id = e_gw_item_get_id (item); status = e_gw_connection_delegate_request (priv->cnc, item, id, NULL, NULL, recur_key); ++++++ eds-kerb-check.diff ++++++ Index: servers/exchange/storage/exchange-account.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-account.c,v retrieving revision 1.30 diff -u -p -r1.30 exchange-account.c --- servers/exchange/storage/exchange-account.c 6 Mar 2006 06:00:26 -0000 1.30 +++ servers/exchange/storage/exchange-account.c 19 Apr 2006 09:26:18 -0000 @@ -1000,7 +1000,7 @@ is_password_expired (ExchangeAccount *ac result = e2k_kerberos_check_password (ac->username, domain, ac->password); - if (result != E2K_KERBEROS_OK || + if (result != E2K_KERBEROS_OK && result != E2K_KERBEROS_PASSWORD_EXPIRED) { /* try again with nt domain */ domain = ac->nt_domain; @@ -1102,7 +1102,7 @@ exchange_account_set_password (ExchangeA result = e2k_kerberos_change_password (account->priv->username, domain, old_pass, new_pass); - if (result != E2K_KERBEROS_OK || result != E2K_KERBEROS_PASSWORD_TOO_WEAK) { + if (result != E2K_KERBEROS_OK && result != E2K_KERBEROS_PASSWORD_TOO_WEAK) { /* try with nt_domain */ domain = account->priv->nt_domain; if (domain) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de