r46762 - in /desktop/unstable/gnome-keyring/debian: changelog patches/fix_object_path_regression.patch patches/handle_aliases.patch patches/series

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Wed Oct 21 13:35:39 2015
New Revision: 46762

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46762
Log:
* New upstream bugfix release.
* Drop fix_object_path_regression.patch, applied upstream.
* Fix unlocking keyrings by aliases (handle_aliases.patch, closes: #802480).

Added:
    desktop/unstable/gnome-keyring/debian/patches/handle_aliases.patch
Removed:
    desktop/unstable/gnome-keyring/debian/patches/fix_object_path_regression.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/patches/series

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=46762&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Wed Oct 21 13:35:39 2015
@@ -1,3 +1,11 @@
+gnome-keyring (3.18.2-1) UNRELEASED; urgency=medium
+
+  * New upstream bugfix release.
+  * Drop fix_object_path_regression.patch, applied upstream.
+  * Fix unlocking keyrings by aliases (handle_aliases.patch, closes: #802480).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 21 Oct 2015 16:30:43 +0300
+
 gnome-keyring (3.18.1-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gnome-keyring/debian/patches/handle_aliases.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/handle_aliases.patch?rev=46762&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/handle_aliases.patch	(added)
+++ desktop/unstable/gnome-keyring/debian/patches/handle_aliases.patch	[utf-8] Wed Oct 21 13:35:39 2015
@@ -0,0 +1,37 @@
+Description: dbus: correctly handle alias paths in lookup_collection
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=756865#c5
+Bug-Debian: https://bugs.debian.org/802480
+Last-Update: 2015-10-21
+
+--- a/daemon/dbus/gkd-secret-objects.c
++++ b/daemon/dbus/gkd-secret-objects.c
+@@ -1047,6 +1047,7 @@
+ 	GList *objects;
+ 	GckSession *session;
+ 	gchar *identifier;
++	const gchar *real_identifier;
+ 
+ 	g_return_val_if_fail (GKD_SECRET_IS_OBJECTS (self), NULL);
+ 	g_return_val_if_fail (path, NULL);
+@@ -1054,6 +1055,11 @@
+ 	if (!gkd_secret_util_parse_path (path, &identifier, NULL))
+ 		return NULL;
+ 
++	if (g_str_has_prefix (path, SECRET_ALIAS_PREFIX))
++		real_identifier = gkd_secret_service_get_alias (self->service, identifier);
++	else
++		real_identifier = identifier;
++
+ 	/* The session we're using to access the object */
+ 	if (caller == NULL)
+ 		session = gkd_secret_service_internal_pkcs11_session (self->service);
+@@ -1062,7 +1068,7 @@
+ 	g_return_val_if_fail (session, NULL);
+ 
+ 	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_G_COLLECTION);
+-	gck_builder_add_string (&builder, CKA_ID, identifier);
++	gck_builder_add_string (&builder, CKA_ID, real_identifier);
+ 
+ 	objects = gck_session_find_objects (session, gck_builder_end (&builder), NULL, &error);
+ 

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=46762&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] Wed Oct 21 13:35:39 2015
@@ -1,2 +1,2 @@
 03_kfreebsd.patch
-fix_object_path_regression.patch
+handle_aliases.patch