From 77eb16fed575d1d5b6e1b5d6775e51b67c6dc95c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Jun 01 2007 04:20:57 +0000 Subject: - Revise patch for GNOME bug #376991 to fix RH bug #241974. --- diff --git a/evolution-data-server-1.9.92-e-passwords.patch b/evolution-data-server-1.9.92-e-passwords.patch index 6881251..7d88a1b 100644 --- a/evolution-data-server-1.9.92-e-passwords.patch +++ b/evolution-data-server-1.9.92-e-passwords.patch @@ -1,5 +1,5 @@ ---- evolution-data-server-1.10.1/libedataserverui/e-passwords.h.e-passwords 2007-04-09 08:42:54.000000000 -0400 -+++ evolution-data-server-1.10.1/libedataserverui/e-passwords.h 2007-05-21 10:29:53.000000000 -0400 +--- evolution-data-server-1.10.2/libedataserverui/e-passwords.h.e-passwords 2007-04-09 08:42:54.000000000 -0400 ++++ evolution-data-server-1.10.2/libedataserverui/e-passwords.h 2007-06-01 00:16:46.000000000 -0400 @@ -28,45 +28,65 @@ G_BEGIN_DECLS @@ -97,8 +97,8 @@ G_END_DECLS ---- evolution-data-server-1.10.1/libedataserverui/e-passwords.c.e-passwords 2007-04-09 08:42:54.000000000 -0400 -+++ evolution-data-server-1.10.1/libedataserverui/e-passwords.c 2007-05-21 10:31:00.000000000 -0400 +--- evolution-data-server-1.10.2/libedataserverui/e-passwords.c.e-passwords 2007-04-09 08:42:54.000000000 -0400 ++++ evolution-data-server-1.10.2/libedataserverui/e-passwords.c 2007-06-01 00:19:02.000000000 -0400 @@ -23,18 +23,29 @@ */ @@ -623,7 +623,7 @@ { GnomeKeyringAttributeList *attributes; GnomeKeyringAttribute attribute; -@@ -205,11 +438,8 @@ +@@ -205,11 +438,8 @@ ep_clear_passwords_keyring(EPassMsg *msg result = gnome_keyring_get_default_keyring_sync (&default_keyring); if (!default_keyring) { @@ -637,7 +637,7 @@ default_keyring = g_strdup ("default"); } -@@ -239,38 +469,44 @@ +@@ -239,38 +469,44 @@ ep_clear_passwords_keyring(EPassMsg *msg } g_free (default_keyring); @@ -700,7 +700,7 @@ { GnomeKeyringAttributeList *attributes; GnomeKeyringAttribute attribute; -@@ -281,11 +517,8 @@ +@@ -281,11 +517,8 @@ ep_forget_passwords_keyring(EPassMsg *ms result = gnome_keyring_get_default_keyring_sync (&default_keyring); if (!default_keyring) { @@ -714,7 +714,7 @@ default_keyring = g_strdup ("default"); } d(g_print("Get Default %d\n", result)); -@@ -316,69 +549,54 @@ +@@ -316,69 +549,54 @@ ep_forget_passwords_keyring(EPassMsg *ms g_free (default_keyring); /* free up the session passwords */ @@ -811,7 +811,7 @@ guint32 item_id; if (!strcmp (uri->protocol, "ldap") && !uri->user) { -@@ -419,48 +637,48 @@ +@@ -419,48 +637,48 @@ ep_remember_password_keyring(EPassMsg *m d(g_print("Remember %s: %d/%d\n", msg->key, result, item_id)); /* now remove it from our session hash */ @@ -890,7 +890,7 @@ } #if WITH_GNOME_KEYRING -@@ -472,7 +690,6 @@ +@@ -472,7 +690,6 @@ ep_forget_password_keyring (EPassMsg *ms GnomeKeyringResult result; GList *matches = NULL, *tmp; char *default_keyring = NULL; @@ -898,7 +898,7 @@ EUri *uri = e_uri_new (msg->key); if (!strcmp (uri->protocol, "ldap") && !uri->user) { -@@ -486,27 +703,17 @@ +@@ -486,27 +703,17 @@ ep_forget_password_keyring (EPassMsg *ms uri->user = keycopy; } @@ -929,7 +929,7 @@ default_keyring = g_strdup ("default"); } -@@ -567,35 +774,44 @@ +@@ -567,35 +774,44 @@ ep_forget_password_keyring (EPassMsg *ms } g_free (default_keyring); @@ -993,7 +993,7 @@ #if WITH_GNOME_KEYRING static void -@@ -605,11 +821,11 @@ +@@ -605,11 +821,11 @@ ep_get_password_keyring (EPassMsg *msg) GnomeKeyringAttributeList *attributes; GnomeKeyringAttribute attribute; GnomeKeyringResult result; @@ -1008,7 +1008,7 @@ } else { EUri *uri = e_uri_new (msg->key); -@@ -683,287 +899,154 @@ +@@ -683,287 +899,154 @@ ep_get_password_keyring (EPassMsg *msg) } } @@ -1386,7 +1386,7 @@ * * Set the offline-state of the application. This is a work-around * for having the backends fully offline aware, and returns a -@@ -972,10 +1055,11 @@ +@@ -972,10 +1055,11 @@ e_passwords_shutdown (void) * FIXME: This is not a permanent api, review post 2.0. **/ void @@ -1401,7 +1401,7 @@ } /** -@@ -986,150 +1070,137 @@ +@@ -986,150 +1070,137 @@ e_passwords_set_online(int state) void e_passwords_forget_passwords (void) { @@ -1605,7 +1605,7 @@ * @key: key to store the password under * @prompt: prompt string * @secret: whether or not the password text should be ***ed out -@@ -1146,241 +1217,45 @@ +@@ -1146,241 +1217,44 @@ e_passwords_add_password (const char *ke * return value is non-%NULL and @remember_type is not * E_PASSWORDS_DO_NOT_REMEMBER. **/ @@ -1632,7 +1632,6 @@ + + g_return_val_if_fail (title != NULL, NULL); + g_return_val_if_fail (component != NULL, NULL); -+ g_return_val_if_fail (key != NULL, NULL); + g_return_val_if_fail (prompt != NULL, NULL); if ((type & E_PASSWORDS_ONLINE) && !ep_online_state) @@ -1710,13 +1709,21 @@ - } - if (break_lines) - *outptr++ = '\n'; -- ++ msg = ep_msg_new (ep_ask_password, TRUE); ++ msg->component = component; ++ msg->key = (key != NULL) ? key : ""; ++ msg->data = data; + - *save = 0; - *state = 0; - - return outptr-out; -} -- ++ ep_msg_send (msg); ++ password = msg->password; ++ remember = data->remember; ++ ep_msg_free (msg); + -/* - performs an 'encode step', only encodes blocks of 3 characters to the - output at a time, saves left-over state in state and save (initialise to @@ -1785,8 +1792,11 @@ - - return outptr-out; -} -- -- ++ ep_dialog_data_free (data); + ++ if (p_remember != NULL) ++ *p_remember = remember; + -/** - * base64_decode_step: decode a chunk of base64 encoded data - * @in: input stream @@ -1825,18 +1835,10 @@ - } - } - } -+ msg = ep_msg_new (ep_ask_password, TRUE); -+ msg->component = component; -+ msg->key = key; -+ msg->data = data; - +- - *save = v; - *state = i; -+ ep_msg_send (msg); -+ password = msg->password; -+ remember = data->remember; -+ ep_msg_free (msg); - +- - /* quick scan back for '=' on the end somewhere */ - /* fortunately we can drop 1 output char for each trailing = (upto 2) */ - i=2; @@ -1848,14 +1850,11 @@ - i--; - } - } -+ ep_dialog_data_free (data); - +- - /* if i!= 0 then there is a truncation error! */ - return outptr-out; -} -+ if (p_remember != NULL) -+ *p_remember = remember; - +- -static char * -decode_base64 (char *base64) -{ @@ -1876,9 +1875,9 @@ - return (char *)plain; + return password; } ---- evolution-data-server-1.10.1/libedataserver/e-msgport.h.e-passwords 2007-04-09 08:42:55.000000000 -0400 -+++ evolution-data-server-1.10.1/libedataserver/e-msgport.h 2007-05-21 10:29:53.000000000 -0400 -@@ -54,7 +54,7 @@ +--- evolution-data-server-1.10.2/libedataserver/e-msgport.h.e-passwords 2007-04-09 08:42:55.000000000 -0400 ++++ evolution-data-server-1.10.2/libedataserver/e-msgport.h 2007-06-01 00:16:46.000000000 -0400 +@@ -54,7 +54,7 @@ typedef struct _EMsgPort EMsgPort; /* header for any message */ typedef struct _EMsg { diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 64ddf02..d1dee2b 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -26,7 +26,7 @@ Name: evolution-data-server Version: 1.10.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -400,6 +400,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Fri Jun 01 2007 Matthew Barnes - 1.10.2-2.fc7 +- Revise patch for GNOME bug #376991 to fix RH bug #241974. + * Mon May 28 2007 Matthew Barnes - 1.10.2-1.fc7 - Update to 1.10.2 - Remove patch for RH bug #235290 (fixed upstream).