r39759 - in /desktop/experimental/gdm3/debian: changelog patches/20_credentials.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Oct 12 17:30:48 2013
New Revision: 39759

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39759
Log:
* debian/patches/20_credentials.patch:
  + Patch from Petr Salinger, use g_credentials_get_unix_pid() instead
    of our own function as the former supports kFreeBSD. Closes: #692739.

Added:
    desktop/experimental/gdm3/debian/patches/20_credentials.patch
Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/patches/series

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=39759&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Sat Oct 12 17:30:48 2013
@@ -1,3 +1,11 @@
+gdm3 (3.8.4-1.1) UNRELEASED; urgency=low
+
+  * debian/patches/20_credentials.patch:
+    + Patch from Petr Salinger, use g_credentials_get_unix_pid() instead
+      of our own function as the former supports kFreeBSD. Closes: #692739.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 12 Oct 2013 19:15:18 +0200
+
 gdm3 (3.8.4-1) experimental; urgency=low
 
   [ Laurent Bigonville ]

Added: desktop/experimental/gdm3/debian/patches/20_credentials.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/20_credentials.patch?rev=39759&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/20_credentials.patch	(added)
+++ desktop/experimental/gdm3/debian/patches/20_credentials.patch	[utf-8] Sat Oct 12 17:30:48 2013
@@ -0,0 +1,58 @@
+--- a/daemon/gdm-session.c	2013-10-12 10:43:49.000000000 +0200
++++ b/daemon/gdm-session.c	2013-10-12 11:02:30.000000000 +0200
+@@ -970,28 +970,6 @@
+         return FALSE;
+ }
+ 
+-static GPid
+-credentials_get_unix_pid (GCredentials *credentials)
+-{
+-        GPid pid = 0;
+-        gpointer native_credentials = NULL;
+-
+-#ifdef __linux__
+-        native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
+-        pid = (GPid) ((struct ucred *) native_credentials)->pid;
+-#elif defined (__FreeBSD__)
+-        native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
+-        pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
+-#elif defined (__OpenBSD__)
+-        native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
+-        pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
+-#else
+-#error "platform not supported, need mechanism to detect pid of connected process"
+-#endif
+-
+-        return pid;
+-}
+-
+ static gboolean
+ register_worker (GdmDBusWorkerManager  *worker_manager_interface,
+                  GDBusMethodInvocation *invocation,
+@@ -1021,7 +999,7 @@
+                                     connection_node);
+ 
+         credentials = g_dbus_connection_get_peer_credentials (connection);
+-        pid = credentials_get_unix_pid (credentials);
++        pid = g_credentials_get_unix_pid (credentials, NULL);
+ 
+         conversation = find_conversation_by_pid (self, (GPid) pid);
+ 
+@@ -1479,7 +1457,7 @@
+                             connection);
+ 
+         credentials = g_dbus_connection_get_peer_credentials (connection);
+-        pid_of_client = credentials_get_unix_pid (credentials);
++        pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
+ 
+         g_signal_emit (G_OBJECT (self),
+                        signals [CLIENT_DISCONNECTED],
+@@ -1531,7 +1509,7 @@
+         }
+ 
+         credentials = g_dbus_connection_get_peer_credentials (connection);
+-        pid_of_client = credentials_get_unix_pid (credentials);
++        pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
+ 
+         g_signal_emit (G_OBJECT (self),
+                        signals [CLIENT_CONNECTED],

Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=39759&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series	[utf-8] Sat Oct 12 17:30:48 2013
@@ -7,6 +7,7 @@
 10_no_gettext.patch
 #11_xephyr_nested.patch
 16_xserver_path.patch
+20_credentials.patch
 22_noconsole.patch
 90_config_comments.patch
 92_gsettings_path.patch