diff --git a/lxsession-0.4.4-fix-bnc623192.patch b/lxsession-0.4.4-fix-bnc623192.patch new file mode 100644 index 0000000..e726a19 --- /dev/null +++ b/lxsession-0.4.4-fix-bnc623192.patch @@ -0,0 +1,24 @@ +From b87979e4dfe4279be4f96f7e010ea4c8557f50a6 Mon Sep 17 00:00:00 2001 +From: Marty Jack +Date: Fri, 16 Jul 2010 16:46:58 -0400 +Subject: [PATCH] Soften from g_error to fprintf(stderr) to quiet abrt (Bug3030576) + +--- + lxsession/lxsession.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lxsession/lxsession.c b/lxsession/lxsession.c +index 17e3ff7..026a30b 100644 +--- a/lxsession/lxsession.c ++++ b/lxsession/lxsession.c +@@ -289,7 +289,7 @@ int main(int argc, char** argv) + else if( G_UNLIKELY( !single_instance_check()) ) + { + /* only one instance is allowed for each X. */ +- g_error( "Only one lxsession can be executed at a time." ); ++ fprintf(stderr, "Only one lxsession can be executed at a time"); + return 1; + } + +-- +1.6.3 diff --git a/lxsession-0.4.4-lock-screen-bnc622083.patch b/lxsession-0.4.4-lock-screen-bnc622083.patch new file mode 100644 index 0000000..7c74368 --- /dev/null +++ b/lxsession-0.4.4-lock-screen-bnc622083.patch @@ -0,0 +1,90 @@ +diff -urN lxsession-0.4.4.orig/lxsession-logout/lxsession-logout.c lxsession-0.4.4/lxsession-logout/lxsession-logout.c +--- lxsession-0.4.4.orig/lxsession-logout/lxsession-logout.c 2010-03-31 18:28:50.000000000 +0200 ++++ lxsession-0.4.4/lxsession-logout/lxsession-logout.c 2010-07-17 11:23:57.000000000 +0200 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -72,6 +73,7 @@ + int ltsp : 1; /* under LTSP environment */ + } HandlerContext; + ++static gboolean lock_screen(void); + static gboolean verify_running(char * display_manager, char * executable); + static void logout_clicked(GtkButton * button, HandlerContext * handler_context); + static void shutdown_clicked(GtkButton * button, HandlerContext * handler_context); +@@ -83,6 +85,46 @@ + static GtkPositionType get_banner_position(void); + static GdkPixbuf * get_background_pixbuf(void); + ++/* Try to lock the screen, return TRUE on success, FALSE if no suitable ++ * screensaver was found or the screensaver command exited abnormally. ++ */ ++static gboolean lock_screen(void) ++{ ++ gint i; ++ gint argcp; ++ gchar **argvp; ++ gint exit_status; ++ gchar *locking_commands[] = { ++ "xscreensaver-command -lock", ++ "gnome-screensaver-command --lock", ++ "xlock -mode blank", ++ NULL ++ }; ++ ++ for (i = 0; locking_commands[i] != NULL; ++i) ++ { ++ g_shell_parse_argv(locking_commands[i], &argcp, &argvp, NULL); ++ g_spawn_sync(NULL, ++ argvp, ++ NULL, ++ G_SPAWN_SEARCH_PATH|G_SPAWN_STDOUT_TO_DEV_NULL|G_SPAWN_STDERR_TO_DEV_NULL, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ &exit_status, ++ NULL); ++ g_strfreev (argvp); ++ ++ if (WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == 0) ++ { ++ return TRUE; ++ } ++ } ++ ++ return FALSE; ++} ++ + /* Verify that a program is running and that an executable is available. */ + static gboolean verify_running(char * display_manager, char * executable) + { +@@ -187,6 +229,7 @@ + /* Handler for "clicked" signal on Suspend button. */ + static void suspend_clicked(GtkButton * button, HandlerContext * handler_context) + { ++ lock_screen(); + if (handler_context->suspend_DeviceKit) + dbus_DeviceKit_Suspend(); + else if (handler_context->suspend_HAL) +@@ -197,6 +240,7 @@ + /* Handler for "clicked" signal on Hibernate button. */ + static void hibernate_clicked(GtkButton * button, HandlerContext * handler_context) + { ++ lock_screen(); + if (handler_context->hibernate_DeviceKit) + dbus_DeviceKit_Hibernate(); + else if (handler_context->hibernate_HAL) +@@ -207,6 +251,7 @@ + /* Handler for "clicked" signal on Switch User button. */ + static void switch_user_clicked(GtkButton * button, HandlerContext * handler_context) + { ++ lock_screen(); + if (handler_context->switch_user_GDM) + g_spawn_command_line_sync("gdmflexiserver --startnew", NULL, NULL, NULL, NULL); + else if (handler_context->switch_user_KDM) diff --git a/lxsession.changes b/lxsession.changes index 3503667..b1d2099 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Jul 17 09:51:25 UTC 2010 - guido+opensuse.org@berhoerster.name + +- refine patch for bnc#622083 + +------------------------------------------------------------------- +Sat Jul 17 08:21:07 UTC 2010 - andrea@opensuse.org + +- added lxsession-0.4.4-fix-bnc623192.patch to fix upstream + bug sf#3030576 (bnc#623192) + +------------------------------------------------------------------- +Wed Jul 14 08:44:53 UTC 2010 - andrea@opensuse.org + +- spec file clean up + +------------------------------------------------------------------- +Tue Jul 13 22:12:42 UTC 2010 - guido+opensuse.org@berhoerster.name + +- lock screen when suspending/hibernating/switching users, fixes + bnc#622083 + ------------------------------------------------------------------- Mon Jun 7 14:18:10 UTC 2010 - andrea@opensuse.org diff --git a/lxsession.spec b/lxsession.spec index b11b4d5..9e5ba5d 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -20,12 +20,18 @@ Name: lxsession Version: 0.4.4 -Release: 2 +Release: 3 Summary: LXDE Session Manager, required for running the desktop environment Group: System/GUI/LXDE License: GPL Url: http://www.lxde.org/ Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM lxsession-0.4.4-lock-screen-bnc622083.patch bnc#622083 guido+opensuse.org@berhoerster.name +# lxsession-logout should lock the screen before suspending/hibernating/switching users +Patch0: %name-0.4.4-lock-screen-bnc622083.patch +# PATCH-FIX-UPSTREAM lxsession-0.4.4-fix-bnc623192.patch bnc#623192 andrea@opensuse.org +# lxsession crasch with signal 6 (SIGABRT) +Patch1: %name-0.4.4-fix-bnc623192.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config BuildRequires: docbook-utils docbook-xsl-stylesheets hal-devel libxslt @@ -42,6 +48,8 @@ Authors: %prep %setup -q -n %name-%version +%patch0 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS"