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,11 @@ +seahorse (2.22.1-0ubuntu2) hardy; urgency=low + + * debian/patches/12_import_key.patch: fix importing of remote keys to + prepend "0x" to key ids when constructing URIs. Thanks to Mackenzie + Morgan for the preliminary patch. LP: #215729 + + -- Steve Langasek Tue, 15 Apr 2008 19:44:59 -0700 + 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,36 @@ +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);