diff -u seahorse-2.22.1/debian/patches/series seahorse-2.22.1/debian/patches/series --- seahorse-2.22.1/debian/patches/series +++ seahorse-2.22.1/debian/patches/series @@ -5,0 +6 @@ +12_import_key.patch diff -u seahorse-2.22.1/debian/changelog seahorse-2.22.1/debian/changelog --- seahorse-2.22.1/debian/changelog +++ seahorse-2.22.1/debian/changelog @@ -1,3 +1,12 @@ +seahorse (2.22.1-0ubuntu2) hardy; urgency=low + + * debian/patches + - Added 12_import_key.patch thanks to Mackenzie Morgan. (LP: #215729) + - Patches libseahorse/seahorse-hkp-source.c inorder to fix importing + of remote keys. + + -- Andrew Starr-Bochicchio (andrewsomething) Mon, 14 Apr 2008 23:58:07 -0400 + seahorse (2.22.1-0ubuntu1) hardy; urgency=low * Remove code concerning mlock that is no longer used only in patch2: unchanged: --- seahorse-2.22.1.orig/debian/patches/12_import_key.patch +++ seahorse-2.22.1/debian/patches/12_import_key.patch @@ -0,0 +1,39 @@ +Index: seahorse-2.22.1/libseahorse/seahorse-hkp-source.c +=================================================================== +--- seahorse-2.22.1.orig/libseahorse/seahorse-hkp-source.c 2008-04-14 23:56:08.000000000 -0400 ++++ seahorse-2.22.1/libseahorse/seahorse-hkp-source.c 2008-04-14 23:56:46.000000000 -0400 +@@ -821,6 +821,7 @@ + gchar *t; + SoupURI *uri; + const gchar *fpr; ++ gchar *hexfpr; + GHashTable *form; + guint len; + GSList *l; +@@ -855,10 +856,17 @@ + len = strlen (fpr); + if (len > 8) + fpr += (len - 8); ++ ++ ++ /* prepend the hex prefix (0x) to make keyservers happy */ ++ hexfpr = (char*) g_malloc(sizeof(char) * 11); ++ strncpy(hexfpr, "0x", 2); ++ hexfpr[2] = 0; ++ strncat(hexfpr, fpr, 8); + + /* 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); +@@ -874,6 +882,7 @@ + t = g_strdup_printf (_("Connecting to: %s"), uri->host); + seahorse_operation_mark_progress (SEAHORSE_OPERATION (hop), t, -1); + g_free (t); ++ g_free (hexfpr); + + soup_uri_free (uri); + return SEAHORSE_OPERATION (hop);