From 092a79e01ac729eae1280fea1644b470847d48d10912c6a12638cbe652c30300 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Sep 2012 19:22:04 +0000 Subject: [PATCH] Accepting request 135072 from home:dimstar:branches:GNOME:Factory Update to 3.5.92.1 OBS-URL: https://build.opensuse.org/request/show/135072 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=219 --- gdm-3.5.91.tar.xz | 3 -- gdm-3.5.92.1.tar.xz | 3 ++ gdm-gdmslave-typo.patch | 75 ----------------------------------------- gdm.changes | 22 +++++++++++- gdm.spec | 5 +-- 5 files changed, 25 insertions(+), 83 deletions(-) delete mode 100644 gdm-3.5.91.tar.xz create mode 100644 gdm-3.5.92.1.tar.xz delete mode 100644 gdm-gdmslave-typo.patch diff --git a/gdm-3.5.91.tar.xz b/gdm-3.5.91.tar.xz deleted file mode 100644 index 44ef3e6..0000000 --- a/gdm-3.5.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc7fd30ab41c631e91399623a4769a013c37aa3018659e4d92209f5767d2f44d -size 1642176 diff --git a/gdm-3.5.92.1.tar.xz b/gdm-3.5.92.1.tar.xz new file mode 100644 index 0000000..1f9ae94 --- /dev/null +++ b/gdm-3.5.92.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:334e469b65c5406a6c8819ec787fabc1caad0c85a85cb17ebf06c7b6cc0406cb +size 1622788 diff --git a/gdm-gdmslave-typo.patch b/gdm-gdmslave-typo.patch deleted file mode 100644 index 40eac05..0000000 --- a/gdm-gdmslave-typo.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 3b7053e7c20896b69981f52f7f9e295af9dad05f Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 13 Sep 2012 20:20:28 +0000 -Subject: daemon: s/CanSessionsForUnixUser/GetSessionsForUnixUser/ - -Correct typo in method call name. ---- -diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c -index 55ef526..6f26d8e 100644 ---- a/daemon/gdm-slave.c -+++ b/daemon/gdm-slave.c -@@ -1412,7 +1412,7 @@ gdm_slave_get_primary_session_id_for_user_from_ck (GdmSlave *slave, - CK_NAME, - CK_MANAGER_PATH, - CK_MANAGER_INTERFACE, -- "CanSessionsForUnixUser", -+ "GetSessionsForUnixUser", - g_variant_new ("(u)", uid), - G_VARIANT_TYPE ("(ao)"), - G_DBUS_CALL_FLAGS_NONE, --- -cgit v0.9.0.2 - -From 39a38f321c696ef0e98e2b4241a0156040aafa75 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 13 Sep 2012 21:34:51 +0000 -Subject: slave: more gdm_slave_get_primary_session_id_for_user_from_ck fixes - -It's getting the types wrong, rework it to be (subjectively) clearer. ---- -diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c -index 6f26d8e..9195b9b 100644 ---- a/daemon/gdm-slave.c -+++ b/daemon/gdm-slave.c -@@ -1365,12 +1365,11 @@ gdm_slave_get_primary_session_id_for_user_from_ck (GdmSlave *slave, - { - gboolean can_activate_sessions; - GError *error; -+ const char **sessions; -+ int i; - char *primary_ssid; - uid_t uid; - GVariant *reply; -- GVariant *array; -- GVariantIter iter; -- char *ssid; - - error = NULL; - primary_ssid = NULL; -@@ -1426,17 +1425,16 @@ gdm_slave_get_primary_session_id_for_user_from_ck (GdmSlave *slave, - return NULL; - } - -- array = g_variant_get_child_value (reply, 0); -- g_variant_iter_init (&iter, array); -- while (g_variant_iter_loop (&iter, "(&s)", &ssid)) { -- if (x11_session_is_on_seat (slave, ssid, slave->priv->display_seat_id)) { -- primary_ssid = g_strdup (ssid); -+ g_variant_get_child (reply, 0, "^a&o", &sessions); -+ for (i = 0; sessions[i] != NULL; i++) { -+ if (x11_session_is_on_seat (slave, sessions[i], slave->priv->display_seat_id)) { -+ primary_ssid = g_strdup (sessions[i]); - break; - } - } - -+ g_free (sessions); - g_variant_unref (reply); -- g_variant_unref (array); - return primary_ssid; - } - #endif --- -cgit v0.9.0.2 - diff --git a/gdm.changes b/gdm.changes index fec974a..4ab0452 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,7 +1,27 @@ +------------------------------------------------------------------- +Tue Sep 18 21:31:05 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.92.1: + + Fix crasher when hitting escape really fast at unlock time. + +------------------------------------------------------------------- +Tue Sep 18 20:59:46 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.92: + + More PAM distro changes + + Clean up initialization code + + export Version property over bus + + SELinux integration + + ConsoleKit fixes + + Autologin fixes + + Make reauthentication session have user's environment + + Updated translations. +- Drop gdm-gdmslave-typo.patch: fixed upstream. + ------------------------------------------------------------------- Thu Sep 13 20:24:57 UTC 2012 - dimstar@opensuse.org -- Add gdm-gdmslave-typo.patch: Fix type in Method call, which can +- Add gdm-gdmslave-typo.patch: Fix typo in Method call, which can cause gdm to crash on login when operated with ConsoleKit. ------------------------------------------------------------------- diff --git a/gdm.spec b/gdm.spec index 518a6b5..d276750 100644 --- a/gdm.spec +++ b/gdm.spec @@ -24,7 +24,7 @@ %define enable_split_authentication 0 Name: gdm -Version: 3.5.91 +Version: 3.5.92.1 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0+ @@ -59,8 +59,6 @@ Patch34: gdm-default-wm.patch Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting Patch40: gdm-look-at-runlevel.patch -# PATCH-FIX-UPSTREAM gdm-gdmslave-typo.patch dimstar@opensuse.org -- Fix crash on login due to wrong method call. Taken from git. -Patch41: gdm-gdmslave-typo.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -218,7 +216,6 @@ translation-update-upstream %patch34 -p1 %patch35 -p1 %patch40 -p1 -%patch41 -p1 %build NOCONFIGURE=1 gnome-autogen.sh