From 05da170cf0580d85d3fc91c32ff0cee52ae46e88 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sep 19 2007 15:09:52 +0000 Subject: fix a hang --- diff --git a/gdm.spec b/gdm.spec index 9743e35..bba7d75 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -55,6 +55,9 @@ Patch35: gdmsetup-path.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=254164 Patch37: gdm-2.19.8-selinux.patch +# fixed in upstream svn +Patch38: hang.patch + Patch100: gdm-2.19.8-change-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -139,6 +142,7 @@ Extra icons / faces for the GNOME Display Manager. %patch33 -p1 -b .pass-ats-to-session %patch35 -p1 -b .gdmsetup-path %patch37 -p1 -b .selinux +%patch38 -p1 -b .hang %patch100 -p1 -b .change-defaults @@ -351,6 +355,9 @@ fi %{_datadir}/pixmaps/faces/extras/*.jpg %changelog +* Wed Sep 19 2007 Matthias Clasen - 1:2.20.0-2 +- Fix a hang on restart (#240853) + * Tue Sep 18 2007 Matthias Clasen - 1:2.20.0-1 - Update to 2.20.0 diff --git a/hang.patch b/hang.patch new file mode 100644 index 0000000..c2edad4 --- /dev/null +++ b/hang.patch @@ -0,0 +1,24 @@ +--- trunk/gui/gdmcommon.c 2007/09/18 14:48:25 5279 ++++ trunk/gui/gdmcommon.c 2007/09/18 18:39:42 5280 +@@ -681,7 +681,9 @@ + g_spawn_async (".", + pre_fetch_prog_argv, + NULL, +- (GSpawnFlags) (G_SPAWN_SEARCH_PATH), ++ (GSpawnFlags) (G_SPAWN_SEARCH_PATH | ++ G_SPAWN_STDOUT_TO_DEV_NULL | ++ G_SPAWN_STDERR_TO_DEV_NULL), + NULL, + NULL, + &pid, +@@ -710,7 +712,9 @@ + g_spawn_async (".", + atspi_prog_argv, + NULL, +- (GSpawnFlags) (G_SPAWN_SEARCH_PATH), ++ (GSpawnFlags) (G_SPAWN_SEARCH_PATH | ++ G_SPAWN_STDOUT_TO_DEV_NULL | ++ G_SPAWN_STDERR_TO_DEV_NULL), + NULL, + NULL, + &pid,