diff -Nru --exclude configure --exclude po --exclude spec seahorse-2.22.1/agent/seahorse-agent-io.c seahorse-2.22.2/agent/seahorse-agent-io.c --- seahorse-2.22.1/agent/seahorse-agent-io.c 2008-04-07 03:52:50.000000000 +0200 +++ seahorse-2.22.2/agent/seahorse-agent-io.c 2008-05-26 19:35:01.000000000 +0200 @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/ChangeLog /tmp/zksUFUtKpW/seahorse-2.22.2/ChangeLog --- seahorse-2.22.1/ChangeLog 2008-04-07 03:56:37.000000000 +0200 +++ seahorse-2.22.2/ChangeLog 2008-05-26 19:36:10.000000000 +0200 @@ -1,3 +1,27 @@ +=== seahorse 2.22.2 === + +2008-05-26 Stef Walter + + * NEWS: + * README: Release version 2.22.2 + +2008-05-01 Adam Schreiber + + * agent/seahorse-agent-io.c: Add includes. + * libseahorse/seahorse-gpg-options.c:remove paths.h. + Patches from Brian Cameron. Fixes bug #530952 + +2008-04-17 Adam Schreiber + + * libseahorse/seahorse-secure-memory.c: Test for secure memory before + remapping memory functions. Patch from Coleman Kane. Fixes bug #527193 + * libseahorse/seahorse-hkp-source.c: Fix importing keys from hkp keyservers. + Patch from Mackenzie Morgan. Fixes bug #528150 + +2008-04-06 Stef Walter + + * configure.in: Bump version number + === seahorse 2.22.1 === 2008-04-06 Stef Walter diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/configure.in /tmp/zksUFUtKpW/seahorse-2.22.2/configure.in --- seahorse-2.22.1/configure.in 2008-04-07 03:55:18.000000000 +0200 +++ seahorse-2.22.2/configure.in 2008-05-26 19:35:03.000000000 +0200 @@ -5,7 +5,7 @@ dnl **************************************************************************** dnl MAIN SEAHORSE VERSION (update after release) -AC_INIT(seahorse, 2.22.1) +AC_INIT(seahorse, 2.22.2) dnl **************************************************************************** dnl LIBCRYPTUI libtool versioning diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/daemon/seahorse-service-bindings.h /tmp/zksUFUtKpW/seahorse-2.22.2/daemon/seahorse-service-bindings.h --- seahorse-2.22.1/daemon/seahorse-service-bindings.h 2008-04-07 04:08:32.000000000 +0200 +++ seahorse-2.22.2/daemon/seahorse-service-bindings.h 2008-01-07 17:49:55.000000000 +0100 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:1) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:1) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -62,10 +62,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, @@ -100,7 +100,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:2) */ +/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:2) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -109,10 +109,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOXED_POINTER_POINTER) (gpointer data1, @@ -151,7 +151,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:3) */ +/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:3) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -160,10 +160,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (gpointer data1, @@ -200,7 +200,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:4) */ +/* BOOLEAN:STRING,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:4) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -209,10 +209,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER_POINTER) (gpointer data1, @@ -251,7 +251,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,STRING,STRING,BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:5) */ +/* BOOLEAN:STRING,STRING,STRING,BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:5) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_STRING_BOOLEAN_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -260,10 +260,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_STRING_BOOLEAN_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_STRING_BOOLEAN_POINTER) (gpointer data1, diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/daemon/seahorse-service-crypto-bindings.h /tmp/zksUFUtKpW/seahorse-2.22.2/daemon/seahorse-service-crypto-bindings.h --- seahorse-2.22.1/daemon/seahorse-service-crypto-bindings.h 2008-04-07 04:08:33.000000000 +0200 +++ seahorse-2.22.2/daemon/seahorse-service-crypto-bindings.h 2008-01-07 17:49:55.000000000 +0100 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:BOXED,STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.8YX38T:1) */ +/* BOOLEAN:BOXED,STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.GP0N4T:1) */ extern void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__BOXED_STRING_INT_STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -62,10 +62,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__BOXED_STRING_INT_STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_STRING_INT_STRING_POINTER_POINTER) (gpointer data1, @@ -108,7 +108,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.8YX38T:2) */ +/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.GP0N4T:2) */ extern void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -117,10 +117,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER_POINTER) (gpointer data1, @@ -161,7 +161,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.8YX38T:3) */ +/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.GP0N4T:3) */ extern void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -170,10 +170,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER_POINTER_POINTER) (gpointer data1, diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/daemon/seahorse-service-keyset-bindings.h /tmp/zksUFUtKpW/seahorse-2.22.2/daemon/seahorse-service-keyset-bindings.h --- seahorse-2.22.1/daemon/seahorse-service-keyset-bindings.h 2008-04-07 04:08:32.000000000 +0200 +++ seahorse-2.22.2/daemon/seahorse-service-keyset-bindings.h 2008-01-07 17:49:55.000000000 +0100 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:1) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:1) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -62,10 +62,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, @@ -100,7 +100,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:2) */ +/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:2) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -109,10 +109,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOXED_POINTER_POINTER) (gpointer data1, @@ -151,7 +151,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:3) */ +/* BOOLEAN:STRING,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:3) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_STRING_POINTER_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -160,10 +160,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_STRING_POINTER_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER_POINTER_POINTER) (gpointer data1, @@ -204,7 +204,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:BOXED,INT,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:4) */ +/* BOOLEAN:BOXED,INT,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:4) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -213,10 +213,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_INT_POINTER_POINTER_POINTER) (gpointer data1, @@ -257,7 +257,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:BOXED,INT,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:5) */ +/* BOOLEAN:BOXED,INT,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:5) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -266,10 +266,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_INT_POINTER_POINTER) (gpointer data1, diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/debian/changelog /tmp/zksUFUtKpW/seahorse-2.22.2/debian/changelog --- seahorse-2.22.1/debian/changelog 2008-05-27 10:45:42.000000000 +0200 +++ seahorse-2.22.2/debian/changelog 2008-05-27 10:45:43.000000000 +0200 @@ -1,3 +1,13 @@ +seahorse (2.22.2-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version: + - Fix importing keys from hkp keyservers. + - Build fixes. + * debian/patches/12_import_key.patch: + - the change is in the new version + + -- Sebastien Bacher Tue, 27 May 2008 10:33:56 +0200 + seahorse (2.22.1-0ubuntu2) hardy; urgency=low * debian/patches/12_import_key.patch: fix importing of remote keys to diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/debian/patches/12_import_key.patch /tmp/zksUFUtKpW/seahorse-2.22.2/debian/patches/12_import_key.patch --- seahorse-2.22.1/debian/patches/12_import_key.patch 2008-05-27 10:45:42.000000000 +0200 +++ seahorse-2.22.2/debian/patches/12_import_key.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -Index: seahorse-2.22.1/libseahorse/seahorse-hkp-source.c -=================================================================== ---- seahorse-2.22.1.orig/libseahorse/seahorse-hkp-source.c -+++ seahorse-2.22.1/libseahorse/seahorse-hkp-source.c -@@ -821,6 +821,7 @@ - gchar *t; - SoupURI *uri; - const gchar *fpr; -+ gchar hexfpr[11]; - GHashTable *form; - guint len; - GSList *l; -@@ -847,6 +848,9 @@ - (GDestroyNotify)gpgmex_data_release); - } - -+ /* prepend the hex prefix (0x) to make keyservers happy */ -+ strncpy(hexfpr, "0x", 3); -+ - form = g_hash_table_new (g_str_hash, g_str_equal); - for (l = keyids; l; l = g_slist_next (l)) { - -@@ -855,10 +859,12 @@ - len = strlen (fpr); - if (len > 8) - fpr += (len - 8); -+ -+ strncpy(hexfpr + 2, fpr, 9); - - /* The get key URI */ - g_hash_table_insert (form, "op", "get"); -- g_hash_table_insert (form, "search", (char *)fpr); -+ g_hash_table_insert (form, "search", (char *)hexfpr); - soup_uri_set_query_from_form (uri, form); - - message = soup_message_new_from_uri ("GET", uri); diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/debian/patches/series /tmp/zksUFUtKpW/seahorse-2.22.2/debian/patches/series --- seahorse-2.22.1/debian/patches/series 2008-05-27 10:45:42.000000000 +0200 +++ seahorse-2.22.2/debian/patches/series 2008-05-27 10:45:43.000000000 +0200 @@ -3,4 +3,3 @@ 09_xul1.9.patch 11_ubuntu_keyserver.patch 10_relibtoolize.patch -12_import_key.patch diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/libseahorse/seahorse-gpg-options.c /tmp/zksUFUtKpW/seahorse-2.22.2/libseahorse/seahorse-gpg-options.c --- seahorse-2.22.1/libseahorse/seahorse-gpg-options.c 2008-04-07 03:52:52.000000000 +0200 +++ seahorse-2.22.2/libseahorse/seahorse-gpg-options.c 2008-05-26 19:35:03.000000000 +0200 @@ -22,9 +22,12 @@ #include #include #include +#include +#include #include #include #include +#include #include "seahorse-gpgmex.h" #include "seahorse-util.h" diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/libseahorse/seahorse-hkp-source.c /tmp/zksUFUtKpW/seahorse-2.22.2/libseahorse/seahorse-hkp-source.c --- seahorse-2.22.1/libseahorse/seahorse-hkp-source.c 2008-04-07 03:52:52.000000000 +0200 +++ seahorse-2.22.2/libseahorse/seahorse-hkp-source.c 2008-05-26 19:35:03.000000000 +0200 @@ -821,6 +821,7 @@ gchar *t; SoupURI *uri; const gchar *fpr; + gchar hexfpr[11]; GHashTable *form; guint len; GSList *l; @@ -847,6 +848,9 @@ (GDestroyNotify)gpgmex_data_release); } + /* prepend the hex prefix (0x) to make keyservers happy */ + strncpy(hexfpr, "0x", 3); + form = g_hash_table_new (g_str_hash, g_str_equal); for (l = keyids; l; l = g_slist_next (l)) { @@ -855,10 +859,12 @@ len = strlen (fpr); if (len > 8) fpr += (len - 8); + + strncpy(hexfpr + 2, fpr, 9); /* The get key URI */ g_hash_table_insert (form, "op", "get"); - g_hash_table_insert (form, "search", (char *)fpr); + g_hash_table_insert (form, "search", (char *)hexfpr); soup_uri_set_query_from_form (uri, form); message = soup_message_new_from_uri ("GET", uri); diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/libseahorse/seahorse-secure-memory.c /tmp/zksUFUtKpW/seahorse-2.22.2/libseahorse/seahorse-secure-memory.c --- seahorse-2.22.1/libseahorse/seahorse-secure-memory.c 2008-04-07 03:52:52.000000000 +0200 +++ seahorse-2.22.2/libseahorse/seahorse-secure-memory.c 2008-05-26 19:35:03.000000000 +0200 @@ -94,16 +94,34 @@ } } +static gboolean +seahorse_try_gk_secure_memory () +{ + gpointer p; + + p = gnome_keyring_memory_try_alloc (10); + if (p != NULL) { + gnome_keyring_memory_free (p); + return TRUE; + } + + return FALSE; +} + void seahorse_secure_memory_init () { - GMemVTable vtable; - - memset (&vtable, 0, sizeof (vtable)); - vtable.malloc = switch_malloc; - vtable.realloc = switch_realloc; - vtable.free = switch_free; - vtable.calloc = switch_calloc; - g_mem_set_vtable (&vtable); -} + if (seahorse_try_gk_secure_memory() == TRUE) { + GMemVTable vtable; + memset (&vtable, 0, sizeof (vtable)); + vtable.malloc = switch_malloc; + vtable.realloc = switch_realloc; + vtable.free = switch_free; + vtable.calloc = switch_calloc; + g_mem_set_vtable (&vtable); + } else { + g_warning ("Unable to allocate secure memory from gnome-keyring.\n"); + g_warning ("Proceeding using insecure memory for password fields.\n"); + } +} diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/NEWS /tmp/zksUFUtKpW/seahorse-2.22.2/NEWS --- seahorse-2.22.1/NEWS 2008-04-07 03:57:27.000000000 +0200 +++ seahorse-2.22.2/NEWS 2008-05-26 19:37:52.000000000 +0200 @@ -1,3 +1,9 @@ +seahorse 2.22.2 +--------------- + + * Fix importing keys from hkp keyservers. [Mackenzie Morgan] + * Build fixes. [Brian Cameron] + seahorse 2.22.1 --------------- diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/plugins/applet/docs/ChangeLog /tmp/zksUFUtKpW/seahorse-2.22.2/plugins/applet/docs/ChangeLog --- seahorse-2.22.1/plugins/applet/docs/ChangeLog 2008-04-07 03:52:45.000000000 +0200 +++ seahorse-2.22.2/plugins/applet/docs/ChangeLog 2008-05-26 19:34:58.000000000 +0200 @@ -1,3 +1,7 @@ +2008-04-14 Jorge Gonzalez + + * es/es.po: Updated Spanish translation, fixes bug #528053 + 2008-02-27 Claude Paroz * fr/fr.po: Updated French translation. diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/plugins/applet/docs/es/es.po /tmp/zksUFUtKpW/seahorse-2.22.2/plugins/applet/docs/es/es.po --- seahorse-2.22.1/plugins/applet/docs/es/es.po 2008-04-07 04:11:03.000000000 +0200 +++ seahorse-2.22.2/plugins/applet/docs/es/es.po 2008-05-26 19:52:17.000000000 +0200 @@ -1,12 +1,12 @@ -# translation of applet-help.HEAD.po to Español +# translation of applet-help.gnome-2-22.po to Español # spanish translation for encription-applet manual # # Jorge González , 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: applet-help.HEAD\n" -"POT-Creation-Date: 2008-02-11 21:24+0000\n" -"PO-Revision-Date: 2008-02-11 22:22+0100\n" +"Project-Id-Version: applet-help.gnome-2-22\n" +"POT-Creation-Date: 2008-04-03 04:02+0100\n" +"PO-Revision-Date: 2008-04-14 19:47+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -212,8 +212,7 @@ #: C/seahorse-applet.xml:75(title) msgid "To Add Encryption Applet to a Panel" -msgstr "" -"Añadir la miniaplicación de Cifrado a un panel" +msgstr "Añadir la miniaplicación de Cifrado a un panel" #: C/seahorse-applet.xml:76(para) msgid "" @@ -274,12 +273,11 @@ msgstr "" "Las preferencias para la miniaplicación de Cifrado son parte de su Cifrado y depósitos de claves y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos de claves, o pulsando con el botón derecho sobre la miniaplicación de Cifrado y seleccionando " -"Preferencias." +"application> y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos " +"de claves, o pulsando con el botón derecho sobre " +"la miniaplicación de Cifrado y seleccionando " +"Preferencias." #: C/seahorse-applet.xml:109(title) msgid "Display options" @@ -346,3 +344,4 @@ #: C/seahorse-applet.xml:0(None) msgid "translator-credits" msgstr "Jorge González , 2007-2008." + diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/plugins/applet/docs/es/seahorse-applet.xml /tmp/zksUFUtKpW/seahorse-2.22.2/plugins/applet/docs/es/seahorse-applet.xml --- seahorse-2.22.1/plugins/applet/docs/es/seahorse-applet.xml 2008-04-07 04:11:02.000000000 +0200 +++ seahorse-2.22.2/plugins/applet/docs/es/seahorse-applet.xml 2008-05-26 19:52:17.000000000 +0200 @@ -86,7 +86,7 @@ Preferencias de la miniaplicación de Cifrado - Las preferencias para la miniaplicación de Cifrado son parte de su Cifrado y depósitos de claves y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos de claves, o pulsando con el botón derecho sobre la miniaplicación de Cifrado y seleccionando Preferencias. + Las preferencias para la miniaplicación de Cifrado son parte de su Cifrado y depósitos de claves y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos de claves, o pulsando con el botón derecho sobre la miniaplicación de Cifrado y seleccionando Preferencias. Opciones de mostrado Estas opciones afectan sobre si una ventana que muestra el texto resultante se presenta después de realizar una operación de cifrado. Activar estas opciones puede ser útil al leer un correo web o gestionar otras tareas de cifrado donde un campo puede no estar fácilmente disponible o se requiere una visualización inmediata. diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/README /tmp/zksUFUtKpW/seahorse-2.22.2/README --- seahorse-2.22.1/README 2008-04-07 03:55:31.000000000 +0200 +++ seahorse-2.22.2/README 2008-05-26 19:36:53.000000000 +0200 @@ -1,5 +1,5 @@ Seahorse: a Gnome encryption interface. -This describes version 2.22.1 +This describes version 2.22.2 Seahorse is a graphical interface for managing and using encryption keys. Currently it supports PGP keys (using GPG/GPGME) and SSH keys. Its goal is to diff -Nru --exclude configure --exclude po --exclude spec /tmp/hHF4pgwarj/seahorse-2.22.1/seahorse.spec /tmp/zksUFUtKpW/seahorse-2.22.2/seahorse.spec --- seahorse-2.22.1/seahorse.spec 2008-04-07 04:00:25.000000000 +0200 +++ seahorse-2.22.2/seahorse.spec 2008-05-26 19:40:07.000000000 +0200 @@ -1,6 +1,6 @@ Summary: GNOME2 interface for gnupg Name: seahorse -Version: 2.22.1 +Version: 2.22.2 Release: 0 License: GPL Group: User Interface/Desktop