r23986 - in /desktop/unstable/gdm3/debian: changelog patches/06_first_vt.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Apr 23 17:46:59 2010
New Revision: 23986

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23986
Log:
06_first_vt.patch: fix a horrible bug that lead to re-use existing 
VTs, causing very ugly things happening when you tried to switch 
users.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/06_first_vt.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=23986&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Fri Apr 23 17:46:59 2010
@@ -1,4 +1,4 @@
-gdm3 (2.30.0-3) UNRELEASED; urgency=low
+gdm3 (2.30.0-3) unstable; urgency=low
 
   * New Spanish translations by Francisco Javier Cuadrado.
   * New Telugu translations by Veeven. Closes: #578713.
@@ -13,8 +13,11 @@
     give to translators.
   * New Asturian translations by maacub.
   * New Estonian translations by Mihkel.
-
- -- Josselin Mouette <joss at debian.org>  Thu, 22 Apr 2010 17:48:35 +0200
+  * 06_first_vt.patch: fix a horrible bug that lead to re-use existing 
+    VTs, causing very ugly things happening when you tried to switch 
+    users.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 23 Apr 2010 19:33:33 +0200
 
 gdm3 (2.30.0-2) unstable; urgency=low
 

Modified: desktop/unstable/gdm3/debian/patches/06_first_vt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/06_first_vt.patch?rev=23986&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/06_first_vt.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/06_first_vt.patch [utf-8] Fri Apr 23 17:46:59 2010
@@ -1,8 +1,10 @@
 It's almost the same tty manager of gdm 2.20, except we don't support Sun VTs,
 only Linux and FreeBSD.
---- a/common/gdm-settings-keys.h
-+++ b/common/gdm-settings-keys.h
-@@ -32,6 +32,7 @@
+Index: gdm-2.30.0/common/gdm-settings-keys.h
+===================================================================
+--- gdm-2.30.0.orig/common/gdm-settings-keys.h	2010-03-29 23:42:03.000000000 +0200
++++ gdm-2.30.0/common/gdm-settings-keys.h	2010-04-23 18:42:51.171351569 +0200
+@@ -32,6 +32,7 @@ G_BEGIN_DECLS
  #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
  #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
  #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
@@ -10,8 +12,10 @@
  
  #define GDM_KEY_DEBUG "debug/Enable"
  
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
+Index: gdm-2.30.0/daemon/gdm-server.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-server.c	2010-03-29 23:42:03.000000000 +0200
++++ gdm-2.30.0/daemon/gdm-server.c	2010-04-23 19:30:43.834854732 +0200
 @@ -44,6 +44,9 @@
  #include "gdm-common.h"
  #include "gdm-signal-handler.h"
@@ -22,7 +26,7 @@
  #include "gdm-server.h"
  
  extern char **environ;
-@@ -663,6 +666,187 @@
+@@ -663,6 +666,203 @@ gdm_server_spawn (GdmServer  *server,
          return ret;
  }
  
@@ -34,8 +38,24 @@
 +#elif defined (__FreeBSD__)
 +#define GDM_USE_CONSIO_VT
 +#include <sys/consio.h>
-+#endif
++
++static const char*
++__itovty (int val)
++{
++	static char str[8];
++	char* next = str + sizeof (str) - 1;
++
++	*next = '\0';
++	do {
++		*--next = "0123456789abcdefghigklmnopqrstuv"[val % 32];
++	} while (val /= 32);
++
++	return next;
++}
++#endif
++
 +#define GDMCONSOLEDEVICE "/dev/tty0"
++
 +
 +static gchar *
 +gdm_get_vt_device (int vtno)
@@ -110,7 +130,7 @@
 +                return -1;
 +        }
 +
-+        for (vtno = get_first_vt (), vtmask = 1 << (vtno - 1); vtstat.v_state & vtmask; vtno++, vtmask <<= 1);
++        for (vtno = get_first_vt (), vtmask = 1 << vtno; vtstat.v_state & vtmask; vtno++, vtmask <<= 1);
 +        if (!vtmask) {
 +                VE_IGNORE_EINTR (close (fd));
 +                return -1;
@@ -210,7 +230,7 @@
  /**
   * gdm_server_start:
   * @disp: Pointer to a GdmDisplay structure
-@@ -674,10 +858,14 @@
+@@ -674,10 +874,14 @@ gboolean
  gdm_server_start (GdmServer *server)
  {
          gboolean res;
@@ -226,8 +246,10 @@
          return res;
  }
  
---- a/data/gdm.schemas.in.in
-+++ b/data/gdm.schemas.in.in
+Index: gdm-2.30.0/data/gdm.schemas.in.in
+===================================================================
+--- gdm-2.30.0.orig/data/gdm.schemas.in.in	2010-03-29 23:42:03.000000000 +0200
++++ gdm-2.30.0/data/gdm.schemas.in.in	2010-04-23 18:42:51.171351569 +0200
 @@ -47,6 +47,11 @@
        <signature>i</signature>
        <default>30</default>