Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: freeze-exception
Hi,
Please unblock package xfce4-session
xfce4-session (4.6.2-2) unstable; urgency=low
* debian/patches:
- 03_gk-start-with-path and 04_gk-dont-check-running-use-start added,
change the way it starts gnome-keyring so it correctly runs in the
session and exports environment variables. closes: #523322
* debian/control
- update standards version to 3.9.1.
These patches are needed for xfce4-session to launch correctly gnome-keyring >=
2.30. They have been in unstable for almost a month, and no new bugs were
reported about them.
Debdiff attached.
unblock xfce4-session/4.6.2-2
Thanks!
Cheers,
Lionel
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: debian/control
===================================================================
--- debian/control (revision 4072)
+++ debian/control (working copy)
@@ -8,7 +8,7 @@
libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev,
x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev,
intltool (>= 0.31)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
Index: debian/changelog
===================================================================
--- debian/changelog (revision 4072)
+++ debian/changelog (working copy)
@@ -1,3 +1,14 @@
+xfce4-session (4.6.2-2) unstable; urgency=low
+
+ * debian/patches:
+ - 03_gk-start-with-path and 04_gk-dont-check-running-use-start added,
+ change the way it starts gnome-keyring so it correctly runs in the
+ session and exports environment variables. closes: #523322
+ * debian/control
+ - update standards version to 3.9.1.
+
+ -- Yves-Alexis Perez <cor...@debian.org> Sat, 04 Sep 2010 18:42:53 +0200
+
xfce4-session (4.6.2-1) unstable; urgency=low
[Stefan Ott]
Index: debian/patches/03_gk-start-with-path.patch
===================================================================
--- debian/patches/03_gk-start-with-path.patch (revision 0)
+++ debian/patches/03_gk-start-with-path.patch (revision 4293)
@@ -0,0 +1,12 @@
+--- a/xfce4-session/xfsm-compat-gnome.c
++++ b/xfce4-session/xfsm-compat-gnome.c
+@@ -128,7 +128,8 @@
+ error = NULL;
+ argv[0] = GNOME_KEYRING_DAEMON;
+ argv[1] = NULL;
+- g_spawn_sync (NULL, argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
++ g_spawn_sync (NULL, argv, NULL,
++ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ child_setup, NULL,
+ &sout, NULL, &status, &error);
+
Index: debian/patches/04_gk-dont-check-running-use-start.patch
===================================================================
--- debian/patches/04_gk-dont-check-running-use-start.patch (revision 0)
+++ debian/patches/04_gk-dont-check-running-use-start.patch (revision 4293)
@@ -0,0 +1,79 @@
+Index: xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c
+===================================================================
+--- xfce4-session-4.6.2.orig/xfce4-session/xfsm-compat-gnome.c 2010-05-31 14:36:01.988123134 +0200
++++ xfce4-session-4.6.2/xfce4-session/xfsm-compat-gnome.c 2010-05-31 14:37:08.787058601 +0200
+@@ -100,34 +100,23 @@
+ static void
+ gnome_keyring_daemon_startup (void)
+ {
+- const char *old_keyring;
+-
+ GError *error = NULL;
+ gchar *sout;
+ gchar **lines;
++ gsize lineno;
+ gint status;
+ long pid;
+ gchar *pid_str;
+ gchar *end;
+- char *argv[2];
+-
+- /* If there is already a working keyring, don't start a new daemon */
+- old_keyring = g_getenv ("GNOME_KEYRING_SOCKET");
+- if (old_keyring != NULL && access (old_keyring, R_OK | W_OK) == 0)
+- {
+-#ifdef HAVE_GNOME_KEYRING
+- gnome_keyring_daemon_prepare_environment_sync ();
+-#endif
+- return;
+- }
+-
++ char *argv[3];
+
+ /* Pipe to slave keyring lifetime to */
+ pipe (keyring_lifetime_pipe);
+
+ error = NULL;
+ argv[0] = GNOME_KEYRING_DAEMON;
+- argv[1] = NULL;
++ argv[1] = "--start";
++ argv[2] = NULL;
+ g_spawn_sync (NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ child_setup, NULL,
+@@ -147,20 +136,22 @@
+ {
+ if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
+ {
+- lines = g_strsplit (sout, "\n", 3);
++ lines = g_strsplit (sout, "\n", 0);
+
+- if (lines[0] != NULL && lines[1] != NULL
+- && g_str_has_prefix (lines[1], "GNOME_KEYRING_PID="))
+- {
+- pid_str = lines[1] + strlen ("GNOME_KEYRING_PID=");
+- pid = strtol (pid_str, &end, 10);
+-
+- if (end != pid_str)
+- {
+- gnome_keyring_daemon_pid = pid;
+- xfce_putenv (lines[0]);
+- }
+- }
++ for (lineno = 0; lines[lineno] != NULL; lineno++)
++ {
++ xfce_putenv (lines[lineno]);
++
++ if (g_str_has_prefix (lines[lineno], "GNOME_KEYRING_PID="))
++ {
++ pid_str = lines[lineno] + strlen ("GNOME_KEYRING_PID=");
++ pid = strtol (pid_str, &end, 10);
++ if (end != pid_str)
++ {
++ gnome_keyring_daemon_pid = pid;
++ }
++ }
++ }
+
+ g_strfreev (lines);
+
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 4072)
+++ debian/patches/series (working copy)
@@ -1,2 +1,4 @@
01_correct_shadows.patch
02_fix-fortune-path.patch
+03_gk-start-with-path.patch
+04_gk-dont-check-running-use-start.patch
