Accepting request 1178274 from GNOME:Next

- Update to version 46.2:
  + Block suspend when remote displays are active.
  + Support S0ix suspend when deciding if nvidia should use
    wayland.
  + Misc fixes.
  + Updated translations.
- Rebase gdm-initial-setup-hardening.patch.

OBS-URL: https://build.opensuse.org/request/show/1178274
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=547

_service

@@ -3,7 +3,7 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/gdm.git</param>
-    <param name="revision">46.0</param>
+    <param name="revision">46.2</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>

gdm-46.0.obscpio

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

gdm-46.2.obscpio

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

gdm-initial-setup-hardening.patch

@@ -1,8 +1,8 @@
-Index: gdm-45.beta/daemon/gdm-display.c
+Index: gdm-46.2/daemon/gdm-display.c
 ===================================================================
---- gdm-45.beta.orig/daemon/gdm-display.c
+--- gdm-46.2.orig/daemon/gdm-display.c
-+++ gdm-45.beta/daemon/gdm-display.c
++++ gdm-46.2/daemon/gdm-display.c
-@@ -1537,12 +1537,12 @@ can_create_environment (const char *sess
+@@ -1538,12 +1538,12 @@ can_create_environment (const char *sess
          return session_exists;
  }
  
@@ -18,7 +18,7 @@ Index: gdm-45.beta/daemon/gdm-display.c
                  return TRUE;
  
          return FALSE;
-@@ -1624,7 +1624,7 @@ wants_initial_setup (GdmDisplay *self)
+@@ -1625,7 +1625,7 @@ wants_initial_setup (GdmDisplay *self)
  
          priv = gdm_display_get_instance_private (self);
  
@@ -27,11 +27,11 @@ Index: gdm-45.beta/daemon/gdm-display.c
                  return FALSE;
          }
  
-Index: gdm-45.beta/daemon/gdm-manager.c
+Index: gdm-46.2/daemon/gdm-manager.c
 ===================================================================
---- gdm-45.beta.orig/daemon/gdm-manager.c
+--- gdm-46.2.orig/daemon/gdm-manager.c
-+++ gdm-45.beta/daemon/gdm-manager.c
++++ gdm-46.2/daemon/gdm-manager.c
-@@ -60,7 +60,7 @@
+@@ -62,7 +62,7 @@
  #define GDM_MANAGER_DISPLAYS_PATH GDM_DBUS_PATH "/Displays"
  
  #define INITIAL_SETUP_USERNAME "gnome-initial-setup"
@@ -40,32 +40,28 @@ Index: gdm-45.beta/daemon/gdm-manager.c
  
  typedef struct
  {
-@@ -1789,6 +1789,7 @@ on_start_user_session (StartUserSessionO
+@@ -1847,6 +1847,7 @@ on_start_user_session (StartUserSessionO
-         gboolean doing_initial_setup = FALSE;
+         gboolean fail_if_already_switched = TRUE;
          GdmDisplay *display;
          const char *session_id;
 +        int fd = -1;
  
          g_debug ("GdmManager: start or jump to session");
  
-@@ -1815,6 +1816,15 @@ on_start_user_session (StartUserSessionO
+@@ -1889,22 +1890,21 @@ on_start_user_session (StartUserSessionO
-                       "doing-initial-setup", &doing_initial_setup,
+                               "doing-initial-setup", &doing_initial_setup,
-                       NULL);
+                               NULL);
- 
-+        fd = open(BLOCK_INITIAL_SETUP, O_RDONLY|O_CREAT|O_EXCL|O_NOFOLLOW|O_CLOEXEC, 0644);
-+        if (fd == -1 && errno != EEXIST) {
-+                g_warning ("GdmDisplay: Could not write initial-setup-done marker to %s: %s",
-+                           BLOCK_INITIAL_SETUP,
-+                           strerror(errno));
-+        }
-+        else {
-+                close(fd);
-+        }
-         if (doing_initial_setup)
-                 chown_initial_setup_home_dir ();
- 
-@@ -1835,20 +1845,9 @@ on_start_user_session (StartUserSessionO
  
++                fd = open(BLOCK_INITIAL_SETUP, O_RDONLY|O_CREAT|O_EXCL|O_NOFOLLOW|O_CLOEXEC, 0644);
++                if (fd == -1 && errno != EEXIST) {
++                      g_warning ("GdmDisplay: Could not write initial-setup-done marker to %s: %s",
++                                 BLOCK_INITIAL_SETUP,
++                                 strerror(errno));
++                }
++                else {
++                        close(fd);
++                }
++
                  g_object_ref (display);
                  if (doing_initial_setup) {
 -                        g_autoptr(GError) error = NULL;
@@ -85,11 +81,11 @@ Index: gdm-45.beta/daemon/gdm-manager.c
                  } else {
                          g_debug ("GdmManager: session has its display server, reusing our server for another login screen");
                  }
-Index: gdm-45.beta/daemon/meson.build
+Index: gdm-46.2/daemon/meson.build
 ===================================================================
---- gdm-45.beta.orig/daemon/meson.build
+--- gdm-46.2.orig/daemon/meson.build
-+++ gdm-45.beta/daemon/meson.build
++++ gdm-46.2/daemon/meson.build
-@@ -210,6 +210,7 @@ endif
+@@ -227,6 +227,7 @@ endif
  
  gdm_daemon = executable('gdm',
    [ gdm_daemon_sources, gdm_daemon_gen_sources ],

gdm.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jun  3 09:50:14 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 46.2:
+  + Block suspend when remote displays are active.
+  + Support S0ix suspend when deciding if nvidia should use
+    wayland.
+  + Misc fixes.
+  + Updated translations.
+- Rebase gdm-initial-setup-hardening.patch.
+
 -------------------------------------------------------------------
 Tue Mar 19 07:49:19 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

gdm.obsinfo

@@ -1,4 +1,4 @@
 name: gdm
-version: 46.0
+version: 46.2
-mtime: 1710790580
+mtime: 1716997827
-commit: a5b591cd8d1db5c5d1ebe67d10ec3fe57b9bbded
+commit: fe66f25999e329212193559972fb23dd096889f2

gdm.spec

@@ -27,7 +27,7 @@
 %endif
 
 Name:           gdm
-Version:        46.0
+Version:        46.2
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0-or-later