This commit is contained in:
parent
f79622fb96
commit
f84c29baaa
13
gdm-2.23.92-host-wild.patch
Normal file
13
gdm-2.23.92-host-wild.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: gdm-2.23.92/daemon/gdm-display-access-file.c
|
||||
===================================================================
|
||||
--- gdm-2.23.92.orig/daemon/gdm-display-access-file.c
|
||||
+++ gdm-2.23.92/daemon/gdm-display-access-file.c
|
||||
@@ -409,7 +409,7 @@ _get_auth_info_for_display (GdmDisplayAc
|
||||
gdm_display_is_local (display, &is_local, NULL);
|
||||
|
||||
if (is_local) {
|
||||
- *family = FamilyLocal;
|
||||
+ *family = FamilyWild;
|
||||
*address = g_strdup (g_get_host_name ());
|
||||
} else {
|
||||
*family = FamilyWild;
|
@ -1,13 +0,0 @@
|
||||
Index: gdm-2.23.92/daemon/gdm-slave.c
|
||||
===================================================================
|
||||
--- gdm-2.23.92.orig/daemon/gdm-slave.c
|
||||
+++ gdm-2.23.92/daemon/gdm-slave.c
|
||||
@@ -218,6 +218,8 @@ get_script_environment (GdmSlave *slav
|
||||
|
||||
if (! slave->priv->display_is_local) {
|
||||
g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname));
|
||||
+ } else {
|
||||
+ g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost"));
|
||||
}
|
||||
|
||||
/* Runs as root */
|
@ -6,7 +6,7 @@ diff -upr gdm-2.22.0-pre/daemon/gdm-server.c gdm-2.22.0-post/daemon/gdm-server.c
|
||||
|
||||
error = NULL;
|
||||
- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
|
||||
+ command = g_strdup_printf (LIBEXECDIR "/ConsoleKit/ck-get-x11-display-device --display %s",
|
||||
+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
|
||||
server->priv->display_name);
|
||||
|
||||
g_debug ("GdmServer: Running helper %s", command);
|
||||
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 12 13:21:56 EDT 2008 - jpr@novell.com
|
||||
|
||||
- Move gdm-2.23.92-set-xauthlocalhostname-when-local.patch to
|
||||
gdm-2.23.92-host-wild.patch to really fix race (bnc #420057)
|
||||
- Update gdm-consolekit-helper-subdir.patch, it was using gdm's
|
||||
LIBEXECDIR, not ConsoleKit's
|
||||
- Use correct at-spi dir config option
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 11 07:41:55 EDT 2008 - jpr@novell.com
|
||||
|
||||
|
12
gdm.spec
12
gdm.spec
@ -56,7 +56,7 @@ PreReq: %insserv_prereq
|
||||
License: GPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.23.92
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: The GNOME 2.x Display Manager
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gdm.pamd
|
||||
@ -66,7 +66,7 @@ Source3: SuSEconfig.gdm
|
||||
Source5: sysconfig.displaymanager-gdm
|
||||
Patch1: gdm-consolekit-helper-subdir.patch
|
||||
Patch2: gdm-2.21.9-no-fatal-warnings.patch
|
||||
Patch3: gdm-2.23.92-set-xauthlocalhostname-when-local.patch
|
||||
Patch3: gdm-2.23.92-host-wild.patch
|
||||
Patch4: gdm-2.21.5-vt7-temporary-hack.patch
|
||||
Patch5: gdm-2.23.92-gsd-path.patch
|
||||
Patch28: gdm-X_SERVER.patch
|
||||
@ -139,7 +139,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
%configure\
|
||||
--libexecdir=%{_prefix}/lib/gdm \
|
||||
--localstatedir=%{_localstatedir} \
|
||||
--with-atspi-dir=%{_prefix}/lib/at-spi \
|
||||
--with-at-spi-registryd-directory=%{_prefix}/lib/at-spi \
|
||||
--with-selinux \
|
||||
--enable-ipv6\
|
||||
--disable-scrollkeeper\
|
||||
@ -237,6 +237,12 @@ fi
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
* Fri Sep 12 2008 jpr@novell.com
|
||||
- Move gdm-2.23.92-set-xauthlocalhostname-when-local.patch to
|
||||
gdm-2.23.92-host-wild.patch to really fix race (bnc #420057)
|
||||
- Update gdm-consolekit-helper-subdir.patch, it was using gdm's
|
||||
LIBEXECDIR, not ConsoleKit's
|
||||
- Use correct at-spi dir config option
|
||||
* Thu Sep 11 2008 jpr@novell.com
|
||||
- Update to version 2.23.92:
|
||||
* Fix selection handling in language and layout choosers
|
||||
|
Loading…
x
Reference in New Issue
Block a user