Fix logout with sudo.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 104 insertions, 2 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 2f1873ce850c..85b7e0fcc060 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.121 2010/11/03 21:28:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.122 2010/11/08 19:30:42 ssuominen Exp $
+
+*xfce4-session-4.7.1-r1 (08 Nov 2010)
+
+  08 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-session-4.7.1-r1.ebuild,
+  +files/xfce4-session-4.7.1-fix_logout_with_sudo.patch:
+  Fix logout with sudo.
 
 *xfce4-session-4.7.1 (03 Nov 2010)
 
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 90fd9ceb822b..3889992100b9 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,8 @@
+AUX xfce4-session-4.7.1-fix_logout_with_sudo.patch 1571 RMD160 11725dddcb3a8c21d99f19677cb659c5f579c6df SHA1 d69f49829f43cb76dbd67474f26afc056db3190a SHA256 a560a930d994e4d09a277de48cfea27ac37541afdcfccdaf8ed09ce5efbe115f
 DIST xfce4-session-4.6.2.tar.bz2 1385541 RMD160 3c45028d57aee5950a485d760799d0c74ada735e SHA1 2a5778a1543f97845f118a186e2dbb8a8ea3ff4b SHA256 725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8
 DIST xfce4-session-4.7.1.tar.bz2 1460911 RMD160 99958f36f88b44e98bc3f9b4f34c2507fa539035 SHA1 d65c79e0bf7337705af1cf14964dd53b3422e2ce SHA256 5ee970da59a1433efd4c321794134e4af202ba7b6375ebaf63c84fc246877ee0
 EBUILD xfce4-session-4.6.2.ebuild 1651 RMD160 63827c6581d8720ba7205fd1fbf9f816d4caabbc SHA1 dae3fc51c7119453f757b1effaebee17b8fbcaa8 SHA256 3a95405ac286b4195e1072414d966eba3b1a3fb4e825f5b9f3a28e6bc9f1a98c
+EBUILD xfce4-session-4.7.1-r1.ebuild 1441 RMD160 acca2cf0841ec726dc2bb683f96f37d40ae04b4b SHA1 b0fca73e79217b42dade6f5206eb00d1ee7f489b SHA256 121eecef7ed98cbc6e82878d1d4cc44056f439948d4bff64a22c05b12f826ab5
 EBUILD xfce4-session-4.7.1.ebuild 1378 RMD160 08d0f3fd91acaed4edc04ce94f32f7325ac8f0cd SHA1 62ab3519e2ecfa7279c60eeb432def3a71e7c500 SHA256 8e9fb5b5e3fd3e9fae4c16437f4c9c977a6f1059ca5d3fbd8ddedb80c0367db9
-MISC ChangeLog 15604 RMD160 2c6bd28809f44c6bfe2dc559e0b8bea37a55593e SHA1 fef88b037e9a5c3b6583ca31224b4de5a3a808f9 SHA256 5c4b73e0374cd32d21d20fcd341ee8eb1465c2367da6f17f827ee51b83b6845c
+MISC ChangeLog 15813 RMD160 6324183cfdbaf6f3152a97bfbe401c81653548ee SHA1 156c94f50a96ac6931bd0c4770c5a59ee94cd798 SHA256 d47942c77679c57dcd4a1cd02d20a49f75256fb976e8141d5bad70b704086e7b
 MISC metadata.xml 365 RMD160 f5394f10309125c57f366f5bc00d72b7ed2c187f SHA1 71fa94d2aa83cffa134f23be4ec0736e78bc8a19 SHA256 3dd7350379719051299f2cd5f5501c0b3c5cf699b1bd0b89e0c9e6517a4c1b4d
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.7.1-fix_logout_with_sudo.patch b/xfce-base/xfce4-session/files/xfce4-session-4.7.1-fix_logout_with_sudo.patch
new file mode 100644
index 000000000000..8b0a6efdf075
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.7.1-fix_logout_with_sudo.patch
@@ -0,0 +1,45 @@
+From 6f8746b55cbbe1687c4978da55905177cc860968 Mon Sep 17 00:00:00 2001
+From: Landry Breuil <landry@openbsd.org>
+Date: Sun, 07 Nov 2010 11:59:01 +0000
+Subject: Fix logout with sudo.
+
+---
+diff --git a/xfce4-session/xfsm-shutdown-helper.c b/xfce4-session/xfsm-shutdown-helper.c
+index e0a65e8..e6c2817 100644
+--- a/xfce4-session/xfsm-shutdown-helper.c
++++ b/xfce4-session/xfsm-shutdown-helper.c
+@@ -1331,13 +1331,20 @@ xfsm_shutdown_helper_init (XfsmShutdownHelper *helper)
+       xfsm_shutdown_helper_check_backends (helper);
+     }
+   else
+-    /* Unable to connect to the system bus, just try sudo*/
+     {
+-      g_critical ("Failed to connect to the system bus : %s", error->message);
++      g_warning ("Failed to connect to the system bus : %s", error->message);
+       g_error_free (error);
+ 
++      /* Unable to connect to the system bus, just try sudo */
+       if (xfsm_shutdown_helper_check_sudo (helper))
+-        helper->shutdown_backend = XFSM_SHUTDOWN_BACKEND_SUDO;
++        {
++          helper->shutdown_backend = XFSM_SHUTDOWN_BACKEND_SUDO;
++
++          helper->can_shutdown = TRUE;
++          helper->can_restart = TRUE;
++          helper->auth_shutdown = TRUE;
++          helper->auth_restart  = TRUE;
++        }
+     }
+ }
+ 
+@@ -1645,7 +1652,7 @@ xfsm_shutdown_helper_sudo_send (XfsmShutdownHelper *helper,
+   fprintf (helper->outfile, "%s\n", action);
+   fflush (helper->outfile);
+ 
+-  g_message (G_STRLOC ": Using ConsoleKit to %s",action);
++  g_message (G_STRLOC ": Using sudo to %s", action);
+ 
+   if (ferror (helper->outfile))
+     {
+--
+cgit v0.8.3.4
diff --git a/xfce-base/xfce4-session/xfce4-session-4.7.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..efa08b691cd2
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.7.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.1-r1.ebuild,v 1.1 2010/11/08 19:30:42 ssuominen Exp $
+
+EAPI=3
+inherit xfconf
+
+DESCRIPTION="Session manager for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug gnome gnome-keyring +xfce_plugins_logout"
+
+RDEPEND=">=dev-libs/dbus-glib-0.73
+	x11-apps/iceauth
+	x11-libs/libSM
+	>=x11-libs/libwnck-2.22
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.7
+	>=xfce-base/libxfce4ui-4.7
+	>=xfce-base/xfconf-4.7
+	>=xfce-base/xfce-utils-4.7
+	gnome? ( gnome-base/gconf )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.7.2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-fix_logout_with_sudo.patch )
+
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-static
+		$(use_enable xfce_plugins_logout panel-plugin)
+		$(use_enable gnome)
+		$(use_enable gnome-keyring libgnome-keyring)
+		$(xfconf_use_debug)
+		)
+
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}