SOURCES (AC-branch): gdm-conf.patch, gdm-desktop.patch, gdm-logdir...

baggins baggins at pld-linux.org
Mon May 15 16:11:50 CEST 2006 

Author: baggins                      Date: Mon May 15 14:11:50 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   gdm-conf.patch (1.6 -> 1.6.4.1) , gdm-desktop.patch (1.9 -> 1.9.4.1) , gdm-logdir.patch (1.2 -> 1.2.2.1) , gdm-xdmcp.patch (1.8 -> 1.8.4.1) 

---- Diffs:

================================================================
Index: SOURCES/gdm-conf.patch
diff -u SOURCES/gdm-conf.patch:1.6 SOURCES/gdm-conf.patch:1.6.4.1
--- SOURCES/gdm-conf.patch:1.6	Tue Aug  9 15:56:58 2005
+++ SOURCES/gdm-conf.patch	Mon May 15 16:11:44 2006
@@ -1,14 +1,32 @@
-diff -urN gdm-2.8.0.2.orig/config/gdm.conf.in gdm-2.8.0.2/config/gdm.conf.in
---- gdm-2.8.0.2.orig/config/gdm.conf.in	2005-08-09 15:50:15.572151616 +0200
-+++ gdm-2.8.0.2/config/gdm.conf.in	2005-08-09 15:50:41.737173928 +0200
-@@ -71,8 +71,8 @@
- # User and group used for running gdm GUI applicaitons.  By default this
- # is set to user gdm and group gdm.  This user/group should have very
- # limited permissions and access to ony the gdm directories and files.
+diff -aurN gdm-2.13.0.7.orig/config/gdm.conf.in gdm-2.13.0.7/config/gdm.conf.in
+--- gdm-2.13.0.7.orig/config/gdm.conf.in	2006-01-28 00:11:50.000000000 +0100
++++ gdm-2.13.0.7/config/gdm.conf.in	2006-02-05 17:27:41.737522000 +0100
+@@ -92,8 +92,8 @@
+ # User and group used for running GDM GUI applicaitons.  By default this is set
+ # to user "gdm" and group "gdm".  This user/group should have very limited
+ # permissions and access to ony the gdm directories and files.
 -User=gdm
 -Group=gdm
 +User=xdm
 +Group=xdm
+ 
  # To try to kill all clients started at greeter time or in the Init script.
- # doesn't always work, only if those clients have a window of their own
- #KillInitClients=true
+ # does not always work, only if those clients have a window of their own.
+@@ -159,7 +159,7 @@
+ # Automatic VT allocation.  Right now only works on Linux.  This way we force
+ # X to use specific vts.  turn VTAllocation to false if this is causing
+ # problems.
+-#FirstVT=7
++FirstVT=9
+ #VTAllocation=true
+ # Should double login be treated with a warning (and possibility to change VT's
+ # on Linux and FreeBSD systems for console logins)
+@@ -436,7 +436,7 @@
+ # list then provide a list that is delimited by /: to the GraphicalThemes
+ # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
+ # and specify just one theme.
+-#GraphicalTheme=circles
++GraphicalTheme=storky
+ #GraphicalThemes=circles/:happygnome
+ GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/
+ GraphicalThemeRand=false

================================================================
Index: SOURCES/gdm-desktop.patch
diff -u SOURCES/gdm-desktop.patch:1.9 SOURCES/gdm-desktop.patch:1.9.4.1
--- SOURCES/gdm-desktop.patch:1.9	Tue Dec  7 02:11:41 2004
+++ SOURCES/gdm-desktop.patch	Mon May 15 16:11:45 2006
@@ -1,46 +1,48 @@
-diff -urN aa/gdm-2.6.0.3/gui/gdmphotosetup.desktop.in gdm-2.6.0.3/gui/gdmphotosetup.desktop.in
---- aa/gdm-2.6.0.3/gui/gdmphotosetup.desktop.in	2003-07-28 17:59:52.000000000 +0200
-+++ gdm-2.6.0.3/gui/gdmphotosetup.desktop.in	2004-07-26 01:38:53.871528568 +0200
-@@ -9,7 +9,7 @@
- StartupNotify=true
+diff -aurN gdm-2.13.0.7.orig/gui/gdmflexiserver.desktop.in gdm-2.13.0.7/gui/gdmflexiserver.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmflexiserver.desktop.in	2004-05-13 03:39:52.000000000 +0200
++++ gdm-2.13.0.7/gui/gdmflexiserver.desktop.in	2006-02-05 17:24:16.157522000 +0100
+@@ -7,7 +7,7 @@
+ Icon=gdm
  Terminal=false
  Type=Application
--Categories=Application;Settings;AdvancedSettings;
-+Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
+-Categories=Application;System;
++Categories=GTK;GNOME;System;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general
-diff -urN gdm-2.6.0.3-patrys/gui/gdmsetup.desktop.in gdm-2.6.0.3/gui/gdmsetup.desktop.in
---- gdm-2.6.0.3/gui/gdmsetup.desktop.in	2004-07-26 01:38:53.871528568 +0200
-+++ gdm-2.6.0.3-patrys/gui/gdmsetup.desktop.in	2003-07-28 17:59:52.000000000 +0200
-@@ -9,7 +9,7 @@
- StartupNotify=true
+diff -aurN gdm-2.13.0.7.orig/gui/gdmflexiserver-xnest.desktop.in gdm-2.13.0.7/gui/gdmflexiserver-xnest.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmflexiserver-xnest.desktop.in	2004-05-13 03:39:52.000000000 +0200
++++ gdm-2.13.0.7/gui/gdmflexiserver-xnest.desktop.in	2006-02-05 17:22:15.987522000 +0100
+@@ -10,7 +10,7 @@
+ Icon=gdm-xnest
  Terminal=false
  Type=Application
--Categories=Application;System;SystemSetup;X-Red-Hat-Base;
-+Categories=GTK;GNOME;Settings;
+-Categories=Application;System;
++Categories=GTK;GNOME;System;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general
---- gdm-2.6.0.6/gui/gdmflexiserver-xnest.desktop.in2	2004-07-13 21:46:30.865876104 +0100
-+++ gdm-2.6.0.6-patrys/gui/gdmflexiserver-xnest.desktop.in	2004-12-06 20:19:28.000000000 +0200
-@@ -10,7 +10,7 @@
- Icon=gdm-xnest
+diff -aurN gdm-2.13.0.7.orig/gui/gdmphotosetup.desktop.in gdm-2.13.0.7/gui/gdmphotosetup.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmphotosetup.desktop.in	2003-07-26 20:57:15.000000000 +0200
++++ gdm-2.13.0.7/gui/gdmphotosetup.desktop.in	2006-02-05 17:22:55.237522000 +0100
+@@ -9,7 +9,7 @@
+ StartupNotify=true
  Terminal=false
  Type=Application
--Categories=Application;System;
-+Categories=GTK;GNOME;System;
+-Categories=Application;Settings;AdvancedSettings;
++Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general
---- gdm-2.6.0.6/gui/gdmflexiserver.desktop.in	2004-05-13 20:19:28.000000000 +0200
-+++ gdm-2.6.0.6-patrys/gui/gdmflexiserver.desktop.in	2004-12-06 23:09:20.413390048 +0100
-@@ -7,7 +7,7 @@
- Icon=gdm
+diff -aurN gdm-2.13.0.7.orig/gui/gdmsetup.desktop.in gdm-2.13.0.7/gui/gdmsetup.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmsetup.desktop.in.in	2005-11-04 01:55:31.000000000 +0100
++++ gdm-2.13.0.7/gui/gdmsetup.desktop.in.in	2006-02-05 17:23:29.727522000 +0100
+@@ -9,7 +9,7 @@
+ StartupNotify=true
  Terminal=false
  Type=Application
--Categories=Application;System;
-+Categories=GTK;GNOME;System;
+-Categories=GNOME;Application;System;Settings;
++Categories=GTK;GNOME;Settings;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general

================================================================
Index: SOURCES/gdm-logdir.patch
diff -u SOURCES/gdm-logdir.patch:1.2 SOURCES/gdm-logdir.patch:1.2.2.1
--- SOURCES/gdm-logdir.patch:1.2	Sat Sep 27 12:04:13 2003
+++ SOURCES/gdm-logdir.patch	Mon May 15 16:11:45 2006
@@ -1,24 +1,24 @@
-diff -Nuard gdm-2.4.4.3.orig/config/Makefile.am gdm-2.4.4.3/config/Makefile.am
---- gdm-2.4.4.3.orig/config/Makefile.am	2003-09-23 00:13:12.000000000 +0200
-+++ gdm-2.4.4.3/config/Makefile.am	2003-09-27 12:00:18.000000000 +0200
-@@ -6,7 +6,7 @@
+diff -aurN gdm-2.14.1.orig/config/Makefile.am gdm-2.14.1/config/Makefile.am
+--- gdm-2.14.1.orig/config/Makefile.am	2006-03-29 01:43:20.000000000 +0200
++++ gdm-2.14.1/config/Makefile.am	2006-04-12 17:38:22.703380096 +0200
+@@ -5,7 +5,7 @@
  instsessdir = $(datadir)/xsessions
- initdir = $(sysconfdir)/gdm/Init
+ initdir = $(gdmconfdir)/Init
  authdir = $(localstatedir)/gdm
 -logdir = $(localstatedir)/log/gdm
 +logdir = /var/log/gdm
- gnomercdir = $(sysconfdir)/gdm
- postdir = $(sysconfdir)/gdm/PostSession
- predir = $(sysconfdir)/gdm/PreSession
-diff -Nuard gdm-2.4.4.3.orig/configure.in gdm-2.4.4.3/configure.in
---- gdm-2.4.4.3.orig/configure.in	2003-09-25 20:31:12.000000000 +0200
-+++ gdm-2.4.4.3/configure.in	2003-09-27 11:59:52.000000000 +0200
-@@ -524,7 +524,7 @@
- AC_SUBST(EXPANDED_AUTHDIR)
- AC_DEFINE_UNQUOTED(EXPANDED_AUTHDIR,"$EXPANDED_AUTHDIR")
+ gnomercdir = $(gdmconfdir)
+ postdir = $(gdmconfdir)/PostSession
+ predir = $(gdmconfdir)/PreSession
+diff -aurN gdm-2.14.1.orig/configure.ac gdm-2.14.1/configure.ac
+--- gdm-2.14.1.orig/configure.ac	2006-04-10 22:08:15.000000000 +0200
++++ gdm-2.14.1/configure.ac	2006-04-12 17:39:15.822304792 +0200
+@@ -793,7 +793,7 @@
+ #
+ AC_SUBST(authdir, ${localstatedir}/gdm)
+ AC_SUBST(gdmlocaledir, ${gdmconfdir})
+-AC_SUBST(logdir, ${localstatedir}/log/gdm)
++AC_SUBST(logdir, /var/log/gdm)
+ AC_SUBST(pixmapdir, ${datadir}/pixmaps)
  
--LOGDIR_TMP="$localstatedir/log/gdm"
-+LOGDIR_TMP="/var/log/gdm"
- EXPANDED_LOGDIR=`eval echo $LOGDIR_TMP`
- AC_SUBST(EXPANDED_LOGDIR)
- AC_DEFINE_UNQUOTED(EXPANDED_LOGDIR,"$EXPANDED_LOGDIR")
+ withval=""

================================================================
Index: SOURCES/gdm-xdmcp.patch
diff -u SOURCES/gdm-xdmcp.patch:1.8 SOURCES/gdm-xdmcp.patch:1.8.4.1
--- SOURCES/gdm-xdmcp.patch:1.8	Sun Apr 11 15:22:02 2004
+++ SOURCES/gdm-xdmcp.patch	Mon May 15 16:11:45 2006
@@ -1,10 +1,10 @@
-diff -urN gdm-2.4.2.99.orig/daemon/server.c gdm-2.4.2.99/daemon/server.c
---- gdm-2.4.2.99.orig/daemon/server.c	Fri Aug  1 01:39:23 2003
-+++ gdm-2.4.2.99/daemon/server.c	Fri Aug  1 01:40:23 2003
-@@ -1061,7 +1061,7 @@
+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 (GdmLogDir, d->name, ".log");
- 	VE_IGNORE_EINTR (unlink (logfile));
+ 	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));
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gdm-conf.patch?r1=1.6&r2=1.6.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/gdm-desktop.patch?r1=1.9&r2=1.9.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/gdm-logdir.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/gdm-xdmcp.patch?r1=1.8&r2=1.8.4.1&f=u

More information about the pld-cvs-commit mailing list