Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/xfce-base
diff options
context:
space:
mode:
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-session/ChangeLog8
-rw-r--r--xfce-base/xfce4-session/files/xfce4-session-4.7.1-fix_logout_with_sudo.patch45
-rw-r--r--xfce-base/xfce4-session/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch167
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.7.2.ebuild (renamed from xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild)7
4 files changed, 8 insertions, 219 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 2c23fe74ed65..7811b456391a 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,12 @@
# 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.124 2010/11/13 12:08:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.125 2010/12/03 21:40:23 ssuominen Exp $
+
+*xfce4-session-4.7.2 (03 Dec 2010)
+
+ 03 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +xfce4-session-4.7.2.ebuild:
+ Version bump.
13 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
files/xfce4-session-4.7.1-stop_using_subject_cookie.patch:
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
deleted file mode 100644
index 8b0a6efdf075..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.7.1-fix_logout_with_sudo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch b/xfce-base/xfce4-session/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch
deleted file mode 100644
index 9a71332bf7b1..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 394a43c96387ec1c294105b6fa8ea610d5e381dc Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis@xfce.org>
-Date: Sat, 13 Nov 2010 11:57:19 +0000
-Subject: Don't use "unix-session" authorization with PolicyKit (bug #6817).
-
-This fixes suspend/hibernate in xfce4-session-logout. For some reason
-PolicyKit either has a broken "unix-session" implementation or no
-implementation at all. So most GNOME apps seem to use "unix-process".
----
-diff --git a/xfce4-session/xfsm-shutdown-helper.c b/xfce4-session/xfsm-shutdown-helper.c
-index e6c2817..9f902ad 100644
---- a/xfce4-session/xfsm-shutdown-helper.c
-+++ b/xfce4-session/xfsm-shutdown-helper.c
-@@ -331,11 +331,9 @@ init_dbus_gtypes (void)
- static gboolean
- xfsm_shutdown_helper_init_polkit_data (XfsmShutdownHelper *helper)
- {
--#ifdef ENABLE_CONSOLE_KIT
-- const gchar *consolekit_cookie;
--#endif
- GValue hash_elem = { 0 };
-- gboolean subject_created = FALSE;
-+ guint64 start_time;
-+ gint pid;
-
- helper->polkit_proxy =
- dbus_g_proxy_new_for_name (helper->system_bus,
-@@ -346,112 +344,41 @@ xfsm_shutdown_helper_init_polkit_data (XfsmShutdownHelper *helper)
- if (!helper->polkit_proxy)
- return FALSE;
-
--#ifdef ENABLE_CONSOLE_KIT
-- /**
-- * This variable should be set by the session manager or by
-- * the login manager (gdm?). under clean Xfce environment
-- * it is set by the session manager (4.8 and above)
-- * since we don't have a login manager, yet!
-- **/
-- consolekit_cookie = g_getenv ("XDG_SESSION_COOKIE");
--
-- if (consolekit_cookie)
-- {
-- DBusGProxy *proxy;
-- GError *error = NULL;
-- gboolean ret;
-- gchar *consolekit_session;
--
-- proxy = dbus_g_proxy_new_for_name (helper->system_bus,
-- "org.freedesktop.ConsoleKit",
-- "/org/freedesktop/ConsoleKit/Manager",
-- "org.freedesktop.ConsoleKit.Manager");
-+ pid = getpid ();
-
-- if (proxy)
-- {
-- ret = dbus_g_proxy_call (proxy, "GetSessionForCookie", &error,
-- G_TYPE_STRING, consolekit_cookie,
-- G_TYPE_INVALID,
-- DBUS_TYPE_G_OBJECT_PATH, &consolekit_session,
-- G_TYPE_INVALID);
-+ start_time = get_start_time_for_pid (pid);
-
-- if (G_LIKELY (ret))
-- {
-- GValue val = { 0 };
-+ if (G_LIKELY (start_time != 0))
-+ {
-+ GValue val = { 0 }, pid_val = { 0 }, start_time_val = { 0 };
-
-- helper->polkit_subject = g_value_array_new (2);
-- helper->polkit_subject_hash = g_hash_table_new_full (g_str_hash,
-- g_str_equal,
-- g_free, NULL);
-- g_value_init (&val, G_TYPE_STRING);
-- g_value_set_string (&val, "unix-session");
-- g_value_array_append (helper->polkit_subject, &val);
-+ helper->polkit_subject = g_value_array_new (2);
-+ helper->polkit_subject_hash = g_hash_table_new_full (g_str_hash,
-+ g_str_equal,
-+ g_free, NULL);
-+ g_value_init (&val, G_TYPE_STRING);
-+ g_value_set_string (&val, "unix-process");
-+ g_value_array_append (helper->polkit_subject, &val);
-
-- g_value_unset (&val);
-- g_value_init (&val, G_TYPE_STRING);
-- g_value_set_string (&val, consolekit_session);
-+ g_value_unset (&val);
-
-- g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("session-id"), &val);
-+ g_value_init (&pid_val, G_TYPE_UINT);
-+ g_value_set_uint (&pid_val, pid);
-+ g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("pid"), &pid_val);
-
-- g_free (consolekit_session);
-- subject_created = TRUE;
-- }
-- else if (error)
-- {
-- g_warning ("'GetSessionForCookie' failed : %s", error->message);
-- g_error_free (error);
-- }
-- g_object_unref (proxy);
-- }
-+ g_value_init (&start_time_val, G_TYPE_UINT64);
-+ g_value_set_uint64 (&start_time_val, start_time);
-+ g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("start-time"), &start_time_val);
- }
--#endif
--
-- /**
-- * We failed to get valid session data, then we try
-- * to check authentication using the pid.
-- **/
-- if (subject_created == FALSE)
-+ else
- {
-- gint pid;
-- guint64 start_time;
--
-- pid = getpid ();
--
-- start_time = get_start_time_for_pid (pid);
--
-- if (G_LIKELY (start_time != 0))
-- {
-- GValue val = { 0 }, pid_val = { 0 }, start_time_val = { 0 };
--
-- helper->polkit_subject = g_value_array_new (2);
-- helper->polkit_subject_hash = g_hash_table_new_full (g_str_hash,
-- g_str_equal,
-- g_free, NULL);
-- g_value_init (&val, G_TYPE_STRING);
-- g_value_set_string (&val, "unix-process");
-- g_value_array_append (helper->polkit_subject, &val);
--
-- g_value_unset (&val);
--
-- g_value_init (&pid_val, G_TYPE_UINT);
-- g_value_set_uint (&pid_val, pid);
-- g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("pid"), &pid_val);
--
-- g_value_init (&start_time_val, G_TYPE_UINT64);
-- g_value_set_uint64 (&start_time_val, start_time);
-- g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("start-time"), &start_time_val);
-- }
-- else
-- {
-- g_warning ("Unable to create Polkit subject");
-- return FALSE;
-- }
-+ g_warning ("Unable to create Polkit subject");
-+ return FALSE;
- }
-+
-
-- g_value_init (&hash_elem,
-- dbus_g_type_get_map ("GHashTable",
-- G_TYPE_STRING,
-- G_TYPE_VALUE));
-+ g_value_init (&hash_elem,
-+ dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE));
-
- g_value_set_static_boxed (&hash_elem, helper->polkit_subject_hash);
- g_value_array_append (helper->polkit_subject, &hash_elem);
---
-cgit v0.8.3.4
diff --git a/xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.7.2.ebuild
index bf2010dca609..688522fd3b35 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.7.2.ebuild
@@ -1,6 +1,6 @@
# 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-r2.ebuild,v 1.1 2010/11/12 20:50:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.2.ebuild,v 1.1 2010/12/03 21:40:23 ssuominen Exp $
EAPI=3
inherit xfconf
@@ -32,11 +32,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
pkg_setup() {
- PATCHES=(
- "${FILESDIR}"/${P}-fix_logout_with_sudo.patch
- "${FILESDIR}"/${P}-stop_using_subject_cookie.patch
- )
-
XFCONF=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}
--disable-dependency-tracking