From: radek <radek@pld-linux.org>
Date: Mon, 13 Oct 2008 10:01:36 +0000 (+0000)
Subject: - back out 2.24 changes to DEVEL
X-Git-Tag: auto/th/gdm-2_20_7-2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fgdm.git;a=commitdiff_plain;h=e342c432ce74e229bd9f8b9817a75004bed9eb9d;ds=sidebyside

- back out 2.24 changes to DEVEL

Changed files:
    gdm-xdmcp.patch -> 1.11
    gdm-xsession.patch -> 1.4
---

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
index c41d087..06ed096 100644
--- a/gdm-xdmcp.patch
+++ b/gdm-xdmcp.patch
@@ -1,11 +1,12 @@
---- gdm-2.24.0.orig/daemon/gdm-server.c	2008-10-03 00:53:12.000000000 +0200
-+++ gdm-2.24.0/daemon/gdm-server.c	2008-10-03 00:53:57.000000000 +0200
-@@ -419,7 +419,7 @@
-         g_debug ("GdmServer: Opening logfile for server %s", log_path);
- 
-         VE_IGNORE_EINTR (g_unlink (log_path));
--        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
-+        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640));
- 
-         g_free (log_path);
+diff -aurN gdm-2.13.0.7.orig/daemon/server.c gdm-2.13.0.7/daemon/server.c
+--- gdm-2.13.0.7.orig/daemon/server.c	2006-01-19 00:32:50.000000000 +0100
++++ gdm-2.13.0.7/daemon/server.c	2006-02-05 17:12:06.557522000 +0100
+@@ -1150,7 +1150,7 @@
+         /* Log all output from spawned programs to a file */
+ 	logfile = gdm_make_filename (gdm_get_value_string (GDM_KEY_LOG_DIR), d->name, ".log");
+ 	VE_IGNORE_EINTR (g_unlink (logfile));
+-	VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
++	VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640));
  
+ 	if (logfd != -1) {
+ 		VE_IGNORE_EINTR (dup2 (logfd, 1));
diff --git a/gdm-xsession.patch b/gdm-xsession.patch
index b60d73a..a5447ca 100644
--- a/gdm-xsession.patch
+++ b/gdm-xsession.patch
@@ -1,6 +1,6 @@
-diff -urN gdm-2.6.0.3.orig/data/Xsession.in gdm-2.6.0.3/data/Xsession.in
---- gdm-2.6.0.3.orig/data/Xsession.in	2004-05-28 21:50:17.000000000 +0200
-+++ gdm-2.6.0.3/data/Xsession.in	2004-07-09 15:07:16.039478016 +0200
+diff -urN gdm-2.6.0.3.orig/config/Xsession.in gdm-2.6.0.3/config/Xsession.in
+--- gdm-2.6.0.3.orig/config/Xsession.in	2004-05-28 21:50:17.000000000 +0200
++++ gdm-2.6.0.3/config/Xsession.in	2004-07-09 15:07:16.039478016 +0200
 @@ -35,6 +35,10 @@
  test -f /etc/xprofile && . /etc/xprofile
  test -f "$HOME/.xprofile" && . "$HOME/.xprofile"