xfce4-session: not sure who else hates HAL as much as I do, but if you

want to remove it from your system this fix is required.
This commit is contained in:
Zero_Chaos 2010-11-12 20:43:37 +00:00
parent dd9209b60f
commit f35f3de1e7
4 changed files with 130 additions and 0 deletions

View file

@ -0,0 +1,4 @@
AUX xfce4-session-4.7.1-bad-cookie.patch 1122 RMD160 a55f5eef18da738fbe80c6ce4f8ea1f8663d9c2f SHA1 c2199223e983df061ef6d8315b402ed50f5681b2 SHA256 dd91f824f573ccf11f1e7520930b0b1e669cc945c5cb7421d6119aa884fc0afe
AUX xfce4-session-4.7.1-fix_logout_with_sudo.patch 1571 RMD160 11725dddcb3a8c21d99f19677cb659c5f579c6df SHA1 d69f49829f43cb76dbd67474f26afc056db3190a SHA256 a560a930d994e4d09a277de48cfea27ac37541afdcfccdaf8ed09ce5efbe115f
DIST xfce4-session-4.7.1.tar.bz2 1460911 RMD160 99958f36f88b44e98bc3f9b4f34c2507fa539035 SHA1 d65c79e0bf7337705af1cf14964dd53b3422e2ce SHA256 5ee970da59a1433efd4c321794134e4af202ba7b6375ebaf63c84fc246877ee0
EBUILD xfce4-session-4.7.1-r1.ebuild 1486 RMD160 a54f75ce6b333a18874da4f634c5acd2ba32afb8 SHA1 8adea46e98ebfb7ed73f4584e844af826b1eac23 SHA256 5709017d1c3442bf49b2ebbd2861822dfae7e618cb81f3191002c87e0a83802b

View file

@ -0,0 +1,30 @@
diff -ur xfce4-session-4.7.1.orig/xfce4-session/xfsm-shutdown-helper.c xfce4-session-4.7.1/xfce4-session/xfsm-shutdown-helper.c
--- xfce4-session-4.7.1.orig/xfce4-session/xfsm-shutdown-helper.c 2010-11-03 22:11:37.000000000 +0200
+++ xfce4-session-4.7.1/xfce4-session/xfsm-shutdown-helper.c 2010-11-12 20:22:22.000000000 +0200
@@ -335,7 +335,7 @@
const gchar *consolekit_cookie;
#endif
GValue hash_elem = { 0 };
- gboolean subject_created = FALSE;
+// gboolean subject_created = FALSE;
helper->polkit_proxy =
dbus_g_proxy_new_for_name (helper->system_bus,
@@ -394,7 +394,7 @@
g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("session-id"), &val);
g_free (consolekit_session);
- subject_created = TRUE;
+ //subject_created = TRUE;
}
else if (error)
{
@@ -410,7 +410,7 @@
* We failed to get valid session data, then we try
* to check authentication using the pid.
**/
- if (subject_created == FALSE)
+ //if (subject_created == FALSE)
{
gint pid;
guint64 start_time;

View file

@ -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

View file

@ -0,0 +1,51 @@
# 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
"${FILESDIR}"/${P}-bad-cookie.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"
}