r26213 - in /desktop/unstable/gnome-keyring/debian: changelog patches/07_keyring_encoding.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jan 11 16:32:30 2011
New Revision: 26213

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26213
Log:
07_keyring_encoding.patch: patch from upstream git. Correctly handle 
keyring names with non-ascii characters.
Closes: #591659, LP: #553759.

Added:
    desktop/unstable/gnome-keyring/debian/patches/07_keyring_encoding.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=26213&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Tue Jan 11 16:32:30 2011
@@ -1,3 +1,11 @@
+gnome-keyring (2.30.3-5) UNRELEASED; urgency=low
+
+  * 07_keyring_encoding.patch: patch from upstream git. Correctly handle 
+    keyring names with non-ascii characters.
+    Closes: #591659, LP: #553759.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 11 Jan 2011 17:30:48 +0100
+
 gnome-keyring (2.30.3-4) unstable; urgency=low
 
   * 06_init_timeout.patch: follow upstream and use a 120 second timeout 

Added: desktop/unstable/gnome-keyring/debian/patches/07_keyring_encoding.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/07_keyring_encoding.patch?rev=26213&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/07_keyring_encoding.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/07_keyring_encoding.patch [utf-8] Tue Jan 11 16:32:30 2011
@@ -1,0 +1,21 @@
+From 9072f847743e22eb6a96c70d1cac8bf506df8902 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stef at memberwebs.com>
+Date: Tue, 27 Jul 2010 08:23:52 +0000
+Subject: [dbus] Fix encoding problems with keyring names and foreign characters.
+
+ * Creating keyrings with a label that contained non-ascii charaters
+   was broken.
+---
+diff --git a/daemon/dbus/gkd-secret-util.c b/daemon/dbus/gkd-secret-util.c
+index b72f5b6..9ccc14f 100644
+--- a/daemon/dbus/gkd-secret-util.c
++++ b/daemon/dbus/gkd-secret-util.c
+@@ -141,7 +141,7 @@ gkd_secret_util_build_path (const gchar *base, gconstpointer identifier, gssize
+ 
+ 		/* Special characters are encoded with a _ */
+ 		} else {
+-			g_string_append_printf (result, "_%02x", (unsigned int)ch);
++			g_string_append_printf (result, "_%02x", (unsigned int)(unsigned char)ch);
+ 		}
+ 	}
+