From a5ea94f3ca13d0240a6b5ec6684c82cf20894ee3 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
Date: Sat, 25 Oct 2008 23:10:08 +0530
Subject: GDM didn't write it's PID file; fix it.

---
 gnome-base/gdm/Manifest                            |  2 +-
 .../gdm/files/gdm-fix-daemonize-regression.patch   | 33 +++++++++-------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d4e6850..235ca2e 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,4 +1,4 @@
-AUX gdm-fix-daemonize-regression.patch 3927 RMD160 c02a76652a84aa3d406359a22b117b37ad698afc SHA1 4c5b48efeb88ef3f65c53efad5608aa2d5e31c03 SHA256 85d792a6f8607728742d054744a18af749f87758a8828e3a37952691dd749bae
+AUX gdm-fix-daemonize-regression.patch 3810 RMD160 4d6cd08ba2cb27f3d4702a7f7d8cb55ba84e2e1f SHA1 c5c0569f2bf5f95ac86389da2c21088755dfd422 SHA256 95725e57a6c19667e7bbf7ac533c031dc6590e869b3a8b93916c5cda9b91ca71
 AUX gdm-selinux-remove-attr.patch 503 RMD160 f6281e88fdd718d04667effa938a23286e583770 SHA1 96736ecf27810a055b18890acceac46a25eb8b90 SHA256 cad06b235a669ee342386b9a97502e635c632b0d15b5833b05349c90ea76fb59
 DIST gdm-2.20.5-gentoo-files.tar.bz2 3214 RMD160 a075aa94fc3f6f2947bddf46f008979d62cc94d3 SHA1 9654caf36a91a83ffb5d4e53078a70e8c29a0b61 SHA256 47716f35eb1c6875e9c8e42120ff5f65da806aa06f15a48b082a6f5e5a94da83
 EBUILD gdm-9999.ebuild 4560 RMD160 6135a65182949274003ac7c8b936da8146677d21 SHA1 d72f2f1985fda9f3fa930f1a4f8496b32350a17d SHA256 6d008a382a5cff06fa1df41261a4178ecb289066c35eaa1f0169bd97d377a705
diff --git a/gnome-base/gdm/files/gdm-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-fix-daemonize-regression.patch
index d9a5210..698993c 100644
--- a/gnome-base/gdm/files/gdm-fix-daemonize-regression.patch
+++ b/gnome-base/gdm/files/gdm-fix-daemonize-regression.patch
@@ -1,8 +1,7 @@
-diff --git a/daemon/main.c b/daemon/main.c
-index 9d7ab5e..aef3adf 100644
---- a/daemon/main.c
-+++ b/daemon/main.c
-@@ -495,6 +495,63 @@ signal_cb (int      signo,
+diff -Naur gdm.orig/daemon/main.c gdm.trunk/daemon/main.c
+--- gdm.orig/daemon/main.c	2008-08-15 22:43:36.000000000 +0530
++++ gdm.trunk/daemon/main.c	2008-10-24 21:25:19.000000000 +0530
+@@ -495,6 +495,63 @@
          return ret;
  }
  
@@ -66,7 +65,7 @@ index 9d7ab5e..aef3adf 100644
  int
  main (int    argc,
        char **argv)
-@@ -505,6 +562,7 @@ main (int    argc,
+@@ -505,6 +562,7 @@
          DBusGConnection    *connection;
          GError             *error;
          int                 ret;
@@ -74,7 +73,7 @@ index 9d7ab5e..aef3adf 100644
          gboolean            res;
          gboolean            xdmcp_enabled;
          GdmSignalHandler   *signal_handler;
-@@ -512,9 +570,11 @@ main (int    argc,
+@@ -512,9 +570,11 @@
          static gboolean     do_timed_exit    = FALSE;
          static gboolean     print_version    = FALSE;
          static gboolean     fatal_warnings   = FALSE;
@@ -86,7 +85,7 @@ index 9d7ab5e..aef3adf 100644
                  { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time - for debugging"), NULL },
                  { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL },
  
-@@ -531,6 +591,14 @@ main (int    argc,
+@@ -531,6 +591,14 @@
  
          g_type_init ();
  
@@ -101,19 +100,15 @@ index 9d7ab5e..aef3adf 100644
          context = g_option_context_new (_("GNOME Display Manager"));
          g_option_context_add_main_entries (context, entries, NULL);
          g_option_context_set_ignore_unknown_options (context, TRUE);
-@@ -600,6 +668,12 @@ main (int    argc,
-         delete_pid ();
-         write_pid ();
+@@ -596,6 +664,11 @@
+                 exit (-1);
+         }
  
 +        if (!no_daemon) {
-+                /* fork and write pid file with child's pid */
++                /* fork */
 +                gdm_daemonify ();
-+                write_pid ();
 +        }
 +
-         g_chdir (AUTHDIR);
- 
-         manager = gdm_manager_new ();
--- 
-1.5.5.1
-
+         /* pid file */
+         delete_pid ();
+         write_pid ();
-- 
cgit v1.2.3-18-g5258