r15881 - in /desktop/unstable/seahorse/debian: changelog patches/15_fix_find-remote-keys.patch patches/series

[jsogo at users.alioth.debian.org]

Author: jsogo
Date: Sat May 10 16:39:33 2008
New Revision: 15881

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15881
Log:
debian/patches/15_fix_find-remote-keys
 - Patch from upstream SVN r2171
 - Fix importing keys from hkp keyservers.

Added:
    desktop/unstable/seahorse/debian/patches/15_fix_find-remote-keys.patch
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/patches/series

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=15881&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Sat May 10 16:39:33 2008
@@ -1,9 +1,15 @@
 seahorse (2.22.1-2) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * seahorse.Xsession: only start seahorse-agent for GNOME sessions. 
     Closes: #443115, #472641.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 20 Apr 2008 16:08:25 +0200
+  [ Jose Carlos Garcia Sogo ]
+  * debian/patches/15_fix-find-remote-keys.patch:
+    - Added, from upstream SVN r2171.
+      Fix importing keys from hkp keyservers (Closes: #449461)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 10 May 2008 18:37:20 +0200
 
 seahorse (2.22.1-1) unstable; urgency=high
 

Added: desktop/unstable/seahorse/debian/patches/15_fix_find-remote-keys.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/15_fix_find-remote-keys.patch?rev=15881&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/15_fix_find-remote-keys.patch (added)
+++ desktop/unstable/seahorse/debian/patches/15_fix_find-remote-keys.patch Sat May 10 16:39:33 2008
@@ -1,0 +1,36 @@
+Index: seahorse-2.22.1/libseahorse/seahorse-hkp-source.c
+===================================================================
+--- seahorse-2.22.1.orig/libseahorse/seahorse-hkp-source.c	2008-05-10 18:30:52.000000000 +0200
++++ seahorse-2.22.1/libseahorse/seahorse-hkp-source.c	2008-05-10 18:31:00.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);

Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=15881&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series (original)
+++ desktop/unstable/seahorse/debian/patches/series Sat May 10 16:39:33 2008
@@ -3,3 +3,4 @@
 04_ldap_deprecated.patch
 08_force_ssh.patch
 10_relibtoolize.patch
+15_fix_find-remote-keys.patch