From f84c29baaa90a3b6b373353605bdc3e422ed4c2fa6c86757b53159ab1c9409f6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 13 Sep 2008 11:28:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=54 --- gdm-2.23.92-host-wild.patch | 13 +++++++++++++ gdm-2.23.92-set-xauthlocalhostname-when-local.patch | 13 ------------- gdm-consolekit-helper-subdir.patch | 2 +- gdm.changes | 9 +++++++++ gdm.spec | 12 +++++++++--- 5 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 gdm-2.23.92-host-wild.patch delete mode 100644 gdm-2.23.92-set-xauthlocalhostname-when-local.patch diff --git a/gdm-2.23.92-host-wild.patch b/gdm-2.23.92-host-wild.patch new file mode 100644 index 0000000..e287187 --- /dev/null +++ b/gdm-2.23.92-host-wild.patch @@ -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; diff --git a/gdm-2.23.92-set-xauthlocalhostname-when-local.patch b/gdm-2.23.92-set-xauthlocalhostname-when-local.patch deleted file mode 100644 index d4821f0..0000000 --- a/gdm-2.23.92-set-xauthlocalhostname-when-local.patch +++ /dev/null @@ -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 */ diff --git a/gdm-consolekit-helper-subdir.patch b/gdm-consolekit-helper-subdir.patch index 7eff50a..f9a6d28 100644 --- a/gdm-consolekit-helper-subdir.patch +++ b/gdm-consolekit-helper-subdir.patch @@ -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); diff --git a/gdm.changes b/gdm.changes index 3d498ef..2c73c9a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -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 diff --git a/gdm.spec b/gdm.spec index 1967174..36bcf79 100644 --- a/gdm.spec +++ b/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