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

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Sun Oct 18 14:39:06 2015
New Revision: 46734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46734
Log:
Backport two post-release upstream commits to properly unexport
secret prompt objects (fix_object_path_regression.patch; closes:
#800660).

Added:
    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=46734&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Sun Oct 18 14:39:06 2015
@@ -6,6 +6,9 @@
   * Drop fix_tests_for_new_glib.patch, applied upstream.
   * Drop init_secret_service.patch, applied upstream.
   * Drop fork_before_using_dbus.patch, the issue has been fixed properly.
+  * Backport two post-release upstream commits to properly unexport
+    secret prompt objects (fix_object_path_regression.patch; closes:
+    #800660).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 18 Oct 2015 17:30:21 +0300
 

Added: desktop/unstable/gnome-keyring/debian/patches/fix_object_path_regression.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/fix_object_path_regression.patch?rev=46734&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/fix_object_path_regression.patch	(added)
+++ desktop/unstable/gnome-keyring/debian/patches/fix_object_path_regression.patch	[utf-8] Sun Oct 18 14:39:06 2015
@@ -0,0 +1,45 @@
+Description: properly unexport secret prompt objects
+Origin: upstream
+ https://git.gnome.org/browse/gnome-keyring/commit/?id=7840cb97902c952c
+ https://git.gnome.org/browse/gnome-keyring/commit/?id=e53af4d55052b879
+Bug-Debian: https://bugs.debian.org/800660
+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=756032
+Last-Update: 2015-10-18
+
+--- a/daemon/dbus/gkd-secret-create.c
++++ b/daemon/dbus/gkd-secret-create.c
+@@ -176,6 +176,7 @@
+ 
+ 	g_object_ref (self);
+ 	prompt = GKD_SECRET_PROMPT (self);
++	gkd_secret_prompt_unexport (prompt);
+ 
+ 	unlock = gkd_secret_unlock_new (gkd_secret_prompt_get_service (prompt),
+ 					gkd_secret_prompt_get_caller (prompt),
+--- a/daemon/dbus/gkd-secret-prompt.c
++++ b/daemon/dbus/gkd-secret-prompt.c
+@@ -202,6 +202,14 @@
+ 			  G_CALLBACK (prompt_method_prompt), self);
+ }
+ 
++void
++gkd_secret_prompt_unexport (GkdSecretPrompt *self)
++{
++	g_return_if_fail (self->pv->skeleton != NULL);
++	g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (self->pv->skeleton));
++	g_clear_object (&self->pv->skeleton);
++}
++
+ static void
+ gkd_secret_prompt_init (GkdSecretPrompt *self)
+ {
+--- a/daemon/dbus/gkd-secret-prompt.h
++++ b/daemon/dbus/gkd-secret-prompt.h
+@@ -77,4 +77,7 @@
+ void                gkd_secret_prompt_dismiss_with_error      (GkdSecretPrompt *self,
+                                                                GError *error);
+ 
++/* Used by derived classes */
++void                gkd_secret_prompt_unexport                (GkdSecretPrompt *self);
++
+ #endif /* __GKD_SECRET_PROMPT_H__ */

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=46734&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] Sun Oct 18 14:39:06 2015
@@ -1 +1,2 @@
 03_kfreebsd.patch
+fix_object_path_regression.patch