Add 26_enable_remote_timedlogin.patch and remove linux-any in debian/controlHEADdebian/2.30.5-11tcos1master

5 files changed, 72 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 8394e03..6dc9b47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdm3 (2.30.5-11tcos1) unstable; urgency=low
+
+  * Add 26_enable_remote_timedlogin.patch
+  * Remove linux-any in debian/control
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Wed, 14 Sep 2011 16:29:55 +0200
+
 gdm3 (2.30.5-11) unstable; urgency=low
 
   * 35_double_free.patch: stolen from 2.30.7. Fix a double free issue in 
diff --git a/debian/control b/debian/control
index 32bfb63..cd16b60 100644
--- a/debian/control
+++ b/debian/control
@@ -36,10 +36,10 @@ Build-Depends: gnome-pkg-tools (>= 0.16.3),
                libxft-dev,
                libxi-dev,
                libxinerama-dev,
-               libselinux1-dev [linux-any],
-               libattr1-dev [linux-any],
+               libselinux1-dev,
+               libattr1-dev,
                iso-codes,
-               libaudit-dev [linux-any],
+               libaudit-dev,
                docbook-xml
 Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
diff --git a/debian/control.in b/debian/control.in
index 3ec3d10..17b705e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -31,10 +31,10 @@ Build-Depends: gnome-pkg-tools (>= 0.16.3),
                libxft-dev,
                libxi-dev,
                libxinerama-dev,
-               libselinux1-dev [linux-any],
-               libattr1-dev [linux-any],
+               libselinux1-dev,
+               libattr1-dev,
                iso-codes,
-               libaudit-dev [linux-any],
+               libaudit-dev,
                docbook-xml
 Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
diff --git a/debian/patches/26_enable_remote_timedlogin.patch b/debian/patches/26_enable_remote_timedlogin.patch
new file mode 100644
index 0000000..7e0f764
--- a/dev/null
+++ b/debian/patches/26_enable_remote_timedlogin.patch
@@ -0,0 +1,58 @@
+Index: gdm3-2.30.5/daemon/gdm-xdmcp-display.c
+===================================================================
+--- gdm3-2.30.5.orig/daemon/gdm-xdmcp-display.c	2010-08-11 16:19:44.000000000 +0200
++++ gdm3-2.30.5/daemon/gdm-xdmcp-display.c	2010-10-18 17:20:41.000000000 +0200
+@@ -41,6 +41,10 @@
+ #include "gdm-common.h"
+ #include "gdm-address.h"
+ 
++#include "gdm-settings.h"
++#include "gdm-settings-direct.h"
++#include "gdm-settings-keys.h"
++
+ #define GDM_XDMCP_DISPLAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_XDMCP_DISPLAY, GdmXdmcpDisplayPrivate))
+ 
+ struct GdmXdmcpDisplayPrivate
+@@ -190,6 +194,14 @@
+         *enabledp = FALSE;
+         *usernamep = g_strdup ("");
+         *delayp = 0;
++        gboolean allow_remote_autologin;
++
++        allow_remote_autologin = FALSE;
++        gdm_settings_direct_get_boolean (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN, &allow_remote_autologin);
++
++        if ( allow_remote_autologin ) {
++                GDM_DISPLAY_CLASS (gdm_xdmcp_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp);
++        }
+ }
+ 
+ static void
+Index: gdm3-2.30.5/data/gdm.schemas.in.in
+===================================================================
+--- gdm3-2.30.5.orig/data/gdm.schemas.in.in	2010-10-18 17:20:40.000000000 +0200
++++ gdm3-2.30.5/data/gdm.schemas.in.in	2010-10-18 17:20:41.000000000 +0200
+@@ -79,6 +79,11 @@
+       <signature>b</signature>
+       <default>true</default>
+     </schema>
++    <schema>
++      <key>security/AllowRemoteAutoLogin</key>
++      <signature>b</signature>
++      <default>false</default>
++    </schema>
+ 
+     <schema>
+       <key>greeter/Include</key>
+Index: gdm3-2.30.5/common/gdm-settings-keys.h
+===================================================================
+--- gdm3-2.30.5.orig/common/gdm-settings-keys.h	2010-10-18 17:20:40.000000000 +0200
++++ gdm3-2.30.5/common/gdm-settings-keys.h	2010-10-18 17:20:41.000000000 +0200
+@@ -44,6 +44,7 @@
+ #define GDM_KEY_INCLUDE_ALL "greeter/IncludeAll"
+ 
+ #define GDM_KEY_DISALLOW_TCP "security/DisallowTCP"
++#define GDM_KEY_ALLOW_REMOTE_AUTOLOGIN "security/AllowRemoteAutoLogin"
+ 
+ #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
+ #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
diff --git a/debian/patches/series b/debian/patches/series
index c78b9fc..026de44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,6 +25,7 @@
 22_noconsole.patch
 23_autologin_once.patch
 25_upower.patch
+26_enable_remote_timedlogin.patch
 26_username_escape.patch
 27_orca_braille.patch
 28_beep.patch