Accepting request 101594 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/101594
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=135

gdm-3.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a4986bdaeb8040644c76384af6f0f7f2346f51e93eabd7c1aaff272c167c102
-size 2359531

gdm-3.2.1.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd
+size 1632116

gdm-fix-no-split-again.patch

@@ -1,23 +0,0 @@
-commit ea366b1a582bbd886ec7da5d9f59b415d074164f
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Fri Oct 7 13:07:43 2011 +0200
-
-    daemon: additional fix for legacy auth compatibility layer
-    
-    g_str_has_prefix() was misused.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=658451
-
-diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
-index 535fdbf..d5a5bcd 100644
---- a/daemon/gdm-greeter-server.c
-+++ b/daemon/gdm-greeter-server.c
-@@ -270,7 +270,7 @@ translate_incoming_service_name (GdmGreeterServer *greeter_server,
-                 g_debug ("GdmGreeterServer: Adjusting pam service from '%s' to 'gdm' for legacy compatibility", service_name);
-                 service_name = "gdm";
-                 greeter_server->priv->using_legacy_service_name = TRUE;
--        } else if (g_str_has_prefix (service_name, "gdm-") == 0 && strcmp (service_name, "gdm-autologin") != 0) {
-+        } else if (g_str_has_prefix (service_name, "gdm-") && strcmp (service_name, "gdm-autologin") != 0) {
-                 g_debug ("GdmGreeterServer: Rejecting pam service '%s' for legacy compatibility", service_name);
-                 return NULL;
-         }

gdm-helper-directory.patch

@@ -67,8 +67,8 @@ Index: gdm-3.1.90/data/gdm-shell.session.in
  [GNOME Session]
  Name=Display Manager
  RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
+-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
-+IsRunnableHelper=@CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated'
  FallbackSession=gdm-fallback
 Index: gdm-3.1.90/data/Makefile.am
 ===================================================================

gdm-unified-auth.patch

@@ -1,62 +0,0 @@
-From 8874626358898d717ac2b7ee812eb039536deb80 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 26 Sep 2011 11:45:15 -0400
-Subject: [PATCH] daemon: fix the legacy auth compatibility layer
-
-In commit f91f017071ffa5f5999e6c2e2c0929e290482932 I
-introduced a translation layer that keeps compatibility
-for distros who build with --disable-split-authentication.
-
-The commit was somewhat faulty, though.  I made some last
-minute clean ups to the patch before committing that I didn't
-fully test.  Those cleanups resulted in the pam service name
-getting improperly translated and broke the compatibility layer
-the commit introduced.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658451
----
- daemon/gdm-greeter-server.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
-index 4803bc3..535fdbf 100644
---- a/daemon/gdm-greeter-server.c
-+++ b/daemon/gdm-greeter-server.c
-@@ -486,7 +486,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server,
-         dbus_connection_send (connection, reply, NULL);
-         dbus_message_unref (reply);
- 
--        service_name = translate_outgoing_service_name (greeter_server, service_name);
-+        service_name = translate_incoming_service_name (greeter_server, service_name);
-         g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION], 0, service_name);
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -544,7 +544,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server,
-         dbus_connection_send (connection, reply, NULL);
-         dbus_message_unref (reply);
- 
--        service_name = translate_outgoing_service_name (greeter_server, service_name);
-+        service_name = translate_incoming_service_name (greeter_server, service_name);
-         g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION_FOR_USER], 0, service_name, text);
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -575,7 +575,7 @@ handle_answer_query (GdmGreeterServer *greeter_server,
-         dbus_connection_send (connection, reply, NULL);
-         dbus_message_unref (reply);
- 
--        service_name = translate_outgoing_service_name (greeter_server, service_name);
-+        service_name = translate_incoming_service_name (greeter_server, service_name);
-         g_signal_emit (greeter_server, signals [QUERY_ANSWER], 0, service_name, text);
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -763,7 +763,7 @@ handle_start_session_when_ready (GdmGreeterServer *greeter_server,
-         dbus_connection_send (connection, reply, NULL);
-         dbus_message_unref (reply);
- 
--        service_name = (char *) translate_outgoing_service_name (greeter_server, service_name);
-+        service_name = (char *) translate_incoming_service_name (greeter_server, service_name);
-         if (should_start_session) {
-                 g_signal_emit (greeter_server, signals [START_SESSION_WHEN_READY], 0, service_name);
-         } else {
--- 
-1.7.6.2

gdm.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue Jan 17 09:43:44 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.2.1.1:
+  + Change the way we do dconf again (bgo#662168)
+- Changes from version 3.2.1:
+  + Legacy authentication fixes
+  + Change the way we do dconf
+  + Rearrange pam files for fingerprint/smartcard
+  + Add new "disable-user-list" gsettings key
+  + Allow users to connect to local $DISPLAY when ssh'd in without
+    mucking with xauth
+  + Updated translations.
+- Add xz BuildRequires because we can't build a package for a
+  xz-compressed tarball without explicitly specifying that... See
+  bnc#697467 for more details.
+- Drop gdm-unified-auth.patch and gdm-fix-no-split-again.patch:
+  fixed upstream.
+- Rebase gdm-helper-directory.patch.
+- Update for the new way to handle the gdm dconf database:
+  + Add Requires(post) for dconf.
+  + Call "dconf update" in %posttrans to generate the dconf
+    database for gdm after installation, as documented in
+    bgo#662168.
+  + Remove /etc/dconf/profile/gdm and touch it in %install, so we
+    can install the file as %ghost.
+
 -------------------------------------------------------------------
 Thu Dec  8 19:53:53 UTC 2011 - dimstar@opensuse.org
 

gdm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.2.0
+Version:        3.2.1.1
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gdm/
-Source:         http://download.gnome.org/sources/gdm/3.2/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gdm/3.2/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-welcome.pamd
@@ -68,10 +69,6 @@ Patch35:        gdm-xauthlocalhostname.patch
 Patch40:        gdm-look-at-runlevel.patch
 # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux
 Patch60:        gdm-selinux.patch
-# PATCH-FIX-OPENSUSE gdm-unified-auth.patch bgo#658451 vuntz@opensuse.org -- Fix "better unified authentication compatibility"
-Patch61:        gdm-unified-auth.patch
-# PATCH-FIX-OPENSUSE gdm-fix-no-split-again.patch bgo#658451 vuntz@opensuse.org -- Fix in addition to previous patch, to prevent crash in old greeter when trying to login
-Patch62:        gdm-fix-no-split-again.patch
 BuildRequires:  check-devel
 BuildRequires:  dbus-1-glib-devel
 # needed for directory ownership
@@ -97,6 +94,8 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-server
 BuildRequires:  xorg-x11-server-extra
+# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
+BuildRequires:  xz
 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(nss)
 Requires:       %{name}-branding = %{version}
@@ -114,6 +113,7 @@ Requires:       polkit-gnome
 Recommends:     gnome-shell
 ## All sessions
 Requires:       gnome-settings-daemon
+Requires(post): dconf
 # Those accessibility features rely on deprecated modules that we don't ship :/ See bgo#658429.
 #Recommends:     gnome-mag
 #Recommends:     gok
@@ -244,8 +244,6 @@ gnome-patch-translation-prepare
 %patch35 -p0
 %patch40 -p1
 %patch60
-%patch61 -p1
-%patch62 -p1
 gnome-patch-translation-update
 
 %build
@@ -282,6 +280,9 @@ mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
 %endif
 # Remove wrapper, it is not needed.
 mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
+# Remove dconf database, rebuilt in scriptlets; touch it for %%ghost
+rm %{buildroot}%{_sysconfdir}/dconf/profile/gdm
+touch %{buildroot}%{_sysconfdir}/dconf/profile/gdm
 ## Install PAM files.
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 # Generic pam config
@@ -350,6 +351,8 @@ fi
 %preun -f %{name}.schemas_preun
 
 %posttrans -f %{name}.schemas_posttrans
+# Create dconf database for gdm, to lockdown the gdm session
+dconf update
 
 %postun
 %insserv_cleanup
@@ -397,17 +400,16 @@ fi
 %dir %{_localstatedir}/cache/gdm
 %config /etc/pam.d/gdm
 %config /etc/pam.d/gdm-autologin
-%config /etc/pam.d/gdm-password
-%config /etc/pam.d/gdm-welcome
-%if %{enable_split_authentication}
 %config /etc/pam.d/gdm-fingerprint
-%config /etc/pam.d/gdm-smartcart
+%config /etc/pam.d/gdm-password
-%endif
+%config /etc/pam.d/gdm-smartcard
+%config /etc/pam.d/gdm-welcome
 %config %{_sysconfdir}/dbus-1/system.d/gdm.conf
 %dir %config %{_sysconfdir}/dconf/db/gdm.d
 %dir %config %{_sysconfdir}/dconf/db/gdm.d/locks
-%{_sysconfdir}/dconf/db/gdm
+%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
-%{_sysconfdir}/dconf/profile/gdm
+%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks
+%ghost %{_sysconfdir}/dconf/profile/gdm
 # /etc/xinit.d/xdm integration
 %dir %{_libexecdir}/X11/displaymanagers
 %{_libexecdir}/X11/displaymanagers/gdm