Accepting request 186860 from GNOME:Factory

push GNOME:Factory

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

gdm-3.8.3.1.tar.xz

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

gdm-3.9.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58583e94eaafc47dd09af00b8426fff8e3d0dc3d74ff38e3289b79893f4fabc4
+size 1557368

gdm-always-reflect-keyboard-layout.patch

@@ -1,15 +0,0 @@
-diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c
-index b3c37aa..e694056 100644
---- a/gui/simple-greeter/gdm-option-widget.c
-+++ b/gui/simple-greeter/gdm-option-widget.c
-@@ -534,10 +534,6 @@ static void
- on_changed (GtkComboBox     *combo_box,
-             GdmOptionWidget *widget)
- {
--        if (widget->priv->default_item_id == NULL) {
--                return;
--        }
--
-         activate_selected_item (widget);
- }
- 

gdm-desktop-session-env-pam.patch

@@ -1,8 +1,8 @@
-Index: gdm-3.5.91/daemon/gdm-session-worker.c
+Index: gdm-3.9.5/daemon/gdm-session-worker.c
 ===================================================================
---- gdm-3.5.91.orig/daemon/gdm-session-worker.c
+--- gdm-3.9.5.orig/daemon/gdm-session-worker.c
-+++ gdm-3.5.91/daemon/gdm-session-worker.c
++++ gdm-3.9.5/daemon/gdm-session-worker.c
-@@ -159,6 +159,8 @@ struct GdmSessionWorkerPrivate
+@@ -171,6 +171,8 @@ struct GdmSessionWorkerPrivate
          GdmSessionSettings *user_settings;
  
          GDBusMethodInvocation *pending_invocation;
@@ -11,8 +11,8 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.c
  };
  
  enum {
-@@ -1115,6 +1117,9 @@ gdm_session_worker_initialize_pam (GdmSe
+@@ -1157,6 +1159,9 @@ gdm_session_worker_initialize_pam (GdmSe
-         }
+         g_free (pam_xauth);
  #endif
  
 +        if (worker->priv->suse_session_name)
@@ -21,7 +21,7 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.c
          g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
          worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE;
  
-@@ -2035,12 +2040,36 @@ gdm_session_worker_handle_set_session_na
+@@ -2102,6 +2107,12 @@ gdm_session_worker_handle_set_session_na
  {
          GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
          g_debug ("GdmSessionWorker: session name set to %s", session_name);
@@ -34,10 +34,10 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.c
          gdm_session_settings_set_session_name (worker->priv->user_settings,
                                                 session_name);
          gdm_dbus_worker_complete_set_session_name (object, invocation);
-         return TRUE;
+@@ -2109,6 +2120,24 @@ gdm_session_worker_handle_set_session_na
  }
  
-+static gboolean
+ static gboolean
 +gdm_session_worker_handle_set_default_session_name (GdmDBusWorker         *object,
 +                                                    GDBusMethodInvocation *invocation,
 +                                                    const char            *session_name)
@@ -55,10 +55,11 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.c
 +}
 +
 +
- static gboolean
++static gboolean
  gdm_session_worker_handle_set_session_type (GdmDBusWorker         *object,
                                              GDBusMethodInvocation *invocation,
-@@ -2831,6 +2860,7 @@ worker_interface_init (GdmDBusWorkerIfac
+                                             const char            *session_type)
+@@ -2903,6 +2932,7 @@ worker_interface_init (GdmDBusWorkerIfac
          interface->handle_open = gdm_session_worker_handle_open;
          interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
          interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
@@ -66,7 +67,7 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.c
          interface->handle_set_session_type = gdm_session_worker_handle_set_session_type;
          interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable;
          interface->handle_start_program = gdm_session_worker_handle_start_program;
-@@ -2943,6 +2973,8 @@ gdm_session_worker_finalize (GObject *ob
+@@ -3015,6 +3045,8 @@ gdm_session_worker_finalize (GObject *ob
  
          g_hash_table_unref (worker->priv->reauthentication_requests);
  
@@ -75,10 +76,10 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.c
          G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object);
  }
  
-Index: gdm-3.5.91/daemon/gdm-session-worker.xml
+Index: gdm-3.9.5/daemon/gdm-session-worker.xml
 ===================================================================
---- gdm-3.5.91.orig/daemon/gdm-session-worker.xml
+--- gdm-3.9.5.orig/daemon/gdm-session-worker.xml
-+++ gdm-3.5.91/daemon/gdm-session-worker.xml
++++ gdm-3.9.5/daemon/gdm-session-worker.xml
 @@ -13,6 +13,9 @@
      <method name="SetSessionName">
        <arg name="session_name" direction="in" type="s" />
@@ -89,11 +90,11 @@ Index: gdm-3.5.91/daemon/gdm-session-worker.xml
      <method name="SetSessionType">
        <arg name="session_type" direction="in" type="s"/>
      </method>
-Index: gdm-3.5.91/daemon/gdm-session.c
+Index: gdm-3.9.5/daemon/gdm-session.c
 ===================================================================
---- gdm-3.5.91.orig/daemon/gdm-session.c
+--- gdm-3.9.5.orig/daemon/gdm-session.c
-+++ gdm-3.5.91/daemon/gdm-session.c
++++ gdm-3.9.5/daemon/gdm-session.c
-@@ -162,6 +162,8 @@ G_DEFINE_TYPE (GdmSession,
+@@ -165,6 +165,8 @@ G_DEFINE_TYPE (GdmSession,
                 gdm_session,
                 G_TYPE_OBJECT);
  
@@ -102,7 +103,7 @@ Index: gdm-3.5.91/daemon/gdm-session.c
  static GdmSessionConversation *
  find_conversation_by_name (GdmSession *self,
                             const char *service_name)
-@@ -598,6 +600,9 @@ get_default_session_name (GdmSession *se
+@@ -601,6 +603,9 @@ get_default_session_name (GdmSession *se
  static void
  gdm_session_defaults_changed (GdmSession *self)
  {
@@ -112,7 +113,7 @@ Index: gdm-3.5.91/daemon/gdm-session.c
  
          if (self->priv->greeter_interface != NULL) {
                  gdm_dbus_greeter_emit_default_language_name_changed (self->priv->greeter_interface,
-@@ -605,6 +610,19 @@ gdm_session_defaults_changed (GdmSession
+@@ -608,6 +613,19 @@ gdm_session_defaults_changed (GdmSession
                  gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface,
                                                                      get_default_session_name (self));
          }
@@ -132,7 +133,7 @@ Index: gdm-3.5.91/daemon/gdm-session.c
  }
  
  void
-@@ -910,6 +928,10 @@ worker_on_saved_session_name_read (GdmDB
+@@ -916,6 +934,10 @@ worker_on_saved_session_name_read (GdmDB
  
          if (strcmp (session_name,
                      get_default_session_name (self)) != 0) {
@@ -143,7 +144,7 @@ Index: gdm-3.5.91/daemon/gdm-session.c
                  g_free (self->priv->saved_session);
                  self->priv->saved_session = g_strdup (session_name);
  
-@@ -917,6 +939,19 @@ worker_on_saved_session_name_read (GdmDB
+@@ -923,6 +945,19 @@ worker_on_saved_session_name_read (GdmDB
                          gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface,
                                                                              session_name);
                  }

gdm.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Jul 30 16:25:23 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.9.5:
+  + Make selinux explicitly build time optional.
+  + Update pam config files for LFS.
+  + Tell user when their password is expired.
+  + Fix crasher when logging in and out quickly.
+  + Various auth session fixes.
+  + Enable smartcard authentication by default.
+  + Add setting for disabling password authentication.
+  + Give more friendly messages on password failure.
+  + Updated translations.
+- Rebase gdm-desktop-session-env-pam.patch.
+- Drop gdm-greeter-greater-ui.patch and
+  gdm-always-reflect-keyboard-layout.patch: simple greeter has been
+  dropped.
+- Drop libgdmsimplegreeter1 subpackage: the simple greeter has
+  been dropped.
+- No longer Provide / Obsolete libgdmsimplegreeter-devel from the
+  -devel package: with the drop of the simple greeter, this is no
+  longer provided.
+
 -------------------------------------------------------------------
 Tue Jul  2 20:59:38 UTC 2013 - dimstar@opensuse.org
 

gdm.spec

@@ -27,13 +27,13 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.8.3.1
+Version:        3.9.5
 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.8/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gdm/3.9/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-launch-environment.pamd
@@ -54,10 +54,6 @@ Patch7:         gdm-suse-xsession.patch
 Patch8:         gdm-sysconfig-settings.patch
 # PATCH-NEEDS-REBASE PATCH-FEATURE-OPENSUSE gdm-passwordless-login.patch vuntz@opensuse.org -- Support DISPLAYMANAGER_PASSWORD_LESS_LOGIN sysconfig option
 Patch9:         gdm-passwordless-login.patch
-# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch)
-Patch15:        gdm-greeter-greater-ui.patch
-# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
-Patch18:        gdm-always-reflect-keyboard-layout.patch
 # PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default
 Patch34:        gdm-default-wm.patch
 # PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bnc#538064 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to current hostname when we authenticate, for local logins, to avoid issues in the session in case the hostname changes later one. See comment 24 in the bug.
@@ -77,7 +73,7 @@ BuildRequires:  libXi-devel
 BuildRequires:  libXinerama-devel
 BuildRequires:  libattr-devel
 BuildRequires:  libcanberra-devel
-BuildRequires:  libupower-glib-devel
+#BuildRequires:  libupower-glib-devel
 BuildRequires:  pam-devel
 BuildRequires:  pwdutils
 BuildRequires:  tcpd-devel
@@ -91,7 +87,7 @@ BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(libsystemd-journal)
 BuildRequires:  pkgconfig(libsystemd-login) >= 186
 %endif
-BuildRequires:  pkgconfig(nss)
+#BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(ply-boot-client)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
@@ -156,35 +152,11 @@ providing graphical log-ins and managing local and remote displays.
 This package provides the GObject Introspection bindings for
 communicating with the GDM greeter server.
 
-%package -n libgdmsimplegreeter1
-Summary:        Library for GDM Simple Greeter Extensions
-Group:          System/Libraries
-Recommends:     gdm
-
-%description -n libgdmsimplegreeter1
-The GNOME Display Manager is a system service that is responsible for
-providing graphical log-ins and managing local and remote displays.
-
-%if %{enable_split_authentication}
-
-%package simple-greeter-extensions
-Summary:        GDM Simple Greeter Extensions -- Fingerprint and Smartcard Support
-Group:          System/Libraries
-Supplements:    gdm
-
-%description simple-greeter-extensions
-The GNOME Display Manager is a system service that is responsible for
-providing graphical log-ins and managing local and remote displays.
-%endif
-
 %package devel
 Summary:        Libraries for GDM -- Development Files
 Group:          Development/Libraries/GNOME
 Requires:       libgdm1 = %{version}
-Requires:       libgdmsimplegreeter1 = %{version}
 Requires:       typelib-1_0-Gdm-1_0 = %{version}
-Provides:       libgdmsimplegreeter-devel = %{version}
-Obsoletes:      libgdmsimplegreeter-devel < %{version}
 
 %description devel
 The GNOME Display Manager is a system service that is responsible for
@@ -229,8 +201,6 @@ translation-update-upstream
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch15 -p1
-%patch18 -p1
 %patch34 -p1
 %patch35 -p1
 %patch40 -p1
@@ -265,11 +235,6 @@ NOCONFIGURE=1 gnome-autogen.sh
 %install
 %make_install
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%if ! %{enable_split_authentication}
-# Create extensions directory if it's not there yet, so we can package it
-test ! -d %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
-mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
-%endif
 # Do not ship the systemd.service file: openSUSE uses xdm, which enables the DM based on sysconfig.
 %if %{with_systemd}
 rm %{buildroot}%{systemdsystemunitdir}/gdm.service
@@ -358,10 +323,6 @@ dconf update
 
 %postun -n libgdm1 -p /sbin/ldconfig
 
-%post -n libgdmsimplegreeter1 -p /sbin/ldconfig
-
-%postun -n libgdmsimplegreeter1 -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -373,7 +334,6 @@ dconf update
 %{_bindir}/gdm-screenshot
 %{_datadir}/gdm/
 %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
-%{_datadir}/gnome-session/sessions/gdm-fallback.session
 %{_datadir}/gnome-session/sessions/gdm-shell.session
 %{_datadir}/icons/*/*/*/*.*
 %{_datadir}/pixmaps/*.png
@@ -400,8 +360,6 @@ dconf update
 # /etc/xinit.d/xdm integration
 %dir %{_libexecdir}/X11/displaymanagers
 %{_libexecdir}/X11/displaymanagers/gdm
-# Exclude simple-greeter extensions
-%exclude %{_datadir}/gdm/simple-greeter/extensions
 
 %files -n libgdm1
 %defattr(-,root,root)
@@ -411,42 +369,11 @@ dconf update
 %defattr(-,root,root)
 %{_libdir}/girepository-1.0/Gdm-1.0.typelib
 
-%files -n libgdmsimplegreeter1
-%defattr(-,root,root)
-%{_libdir}/libgdmsimplegreeter.so.*
-# Own directory where extensions are put
-%dir %{_datadir}/gdm
-%dir %{_datadir}/gdm/simple-greeter
-%dir %{_datadir}/gdm/simple-greeter/extensions
-%dir %{_libdir}/gdm
-%dir %{_libdir}/gdm/simple-greeter
-%dir %{_libdir}/gdm/simple-greeter/extensions
-# The extension for non-split authentication
-%{_datadir}/gdm/simple-greeter/extensions/unified/
-%if %{enable_split_authentication}
-%{_datadir}/gdm/simple-greeter/extensions/password/
-%{_libdir}/gdm/simple-greeter/extensions/libpassword.so
-%endif
-
-%if %{enable_split_authentication}
-
-%files simple-greeter-extensions
-%defattr(-,root,root)
-# fingerprint
-%{_datadir}/gdm/simple-greeter/extensions/fingerprint/
-%{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
-# smartcard
-%{_datadir}/gdm/simple-greeter/extensions/smartcard/
-%{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
-%endif
-
 %files devel
 %defattr(-,root,root)
 %{_includedir}/gdm/
 %{_libdir}/libgdm.so
-%{_libdir}/libgdmsimplegreeter.so
 %{_libdir}/pkgconfig/gdm.pc
-%{_libdir}/pkgconfig/gdmsimplegreeter.pc
 %{_datadir}/gir-1.0/Gdm-1.0.gir
 
 %files branding-upstream