pool/gdm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1005036 from GNOME:Next

Browse Source 
New try, rebased patch

OBS-URL: https://build.opensuse.org/request/show/1005036
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=503
This commit is contained in:
Bjørn Lie 2022-09-20 19:35:51 +00:00 committed by Git OBS Bridge
parent 8ae37122a6
commit 7cf6e98468
13 changed files with 86 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-42.0.tar.xz
View File

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

3
gdm-43.0.tar.xz Normal file
View File

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

28
gdm-Fix-type-of-signal-connection-id.patch
View File

@ -1,28 +0,0 @@
From f0f527ff3815caa091be24168824f74853c0c050 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 22 Mar 2022 10:40:08 -0400
Subject: [PATCH] local-display-factory: Fix type of signal connection id
Signal connection ids are 64-bit not 32-bit.
This commit fixes the type used.
---
daemon/gdm-local-display-factory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 7de7b99c..4a66ad8f 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -78,7 +78,7 @@ struct _GdmLocalDisplayFactory
gboolean seat0_graphics_check_timed_out;
guint seat0_graphics_check_timeout_id;
- guint uevent_handler_id;
+ gulong uevent_handler_id;
#if defined(ENABLE_USER_DISPLAY_SERVER)
unsigned int active_vt;
--
2.35.1

45
gdm-Stop-listening-to-udev-events.patch
View File

@ -1,45 +0,0 @@
From 307c683f00e1711973139837992ca0f6f55314a5 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 22 Mar 2022 10:16:58 -0400
Subject: [PATCH] local-display-factory: Stop listening to udev events when
necessary
At the moment we still listen for udev events after we've determined
the system has settled (or a timeout has happened).
This means if there is a udev event late, the login screen could get
brought back up while the user is using the system.
This commit fixes that.
---
daemon/gdm-local-display-factory.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 4a66ad8f..b3335cd4 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -710,6 +710,10 @@ udev_is_settled (GdmLocalDisplayFactory *factory)
g_debug ("GdmLocalDisplayFactory: udev has %ssettled enough for graphics.", is_settled? "" : "not ");
g_list_free_full (devices, g_object_unref);
+
+ if (is_settled)
+ g_clear_signal_handler (&factory->uevent_handler_id, factory->gudev_client);
+
return is_settled;
}
#endif
@@ -1287,9 +1291,6 @@ on_uevent (GUdevClient *client,
if (!udev_is_settled (factory))
return;
- g_signal_handler_disconnect (factory->gudev_client, factory->uevent_handler_id);
- factory->uevent_handler_id = 0;
-
gdm_settings_direct_reload ();
ensure_display_for_seat (factory, "seat0");
}
--
2.35.1

8
gdm-default-wm.patch
View File

@ -1,7 +1,7 @@
Index: gdm-40.1/daemon/gdm-session.c
Index: gdm-43.0/daemon/gdm-session.c
===================================================================
--- gdm-40.1.orig/daemon/gdm-session.c
+++ gdm-40.1/daemon/gdm-session.c
--- gdm-43.0.orig/daemon/gdm-session.c
+++ gdm-43.0/daemon/gdm-session.c
@@ -43,6 +43,8 @@
#include <glib-object.h>
#include <gio/gio.h>
@ -11,7 +11,7 @@ Index: gdm-40.1/daemon/gdm-session.c
#include "gdm-session.h"
#include "gdm-session-glue.h"
#include "gdm-dbus-util.h"
@@ -578,6 +580,14 @@ get_fallback_session_name (GdmSession *s
@@ -589,6 +591,14 @@ get_fallback_session_name (GdmSession *s
}
}

12
gdm-disable-wayland-on-mgag200-chipsets.patch
View File

@ -1,10 +1,10 @@
Index: gdm-41.3/data/61-gdm.rules.in
Index: gdm-43.0/data/61-gdm.rules.in
===================================================================
--- gdm-41.3.orig/data/61-gdm.rules.in
+++ gdm-41.3/data/61-gdm.rules.in
@@ -1,6 +1,16 @@
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
--- gdm-43.0.orig/data/61-gdm.rules.in
+++ gdm-43.0/data/61-gdm.rules.in
@@ -34,6 +34,16 @@ ATTR{vendor}=="0x1a03", ATTR{device}=="0
LABEL="gdm_pci_device_end"
+# disable Wayland on Matrox Electronics Systems Ltd. MGA G200 server engines
+ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", GOTO="gdm_disable_wayland"

30
gdm-initial-setup-hardening.patch
View File

@ -1,8 +1,8 @@
Index: gdm-3.37.90/daemon/gdm-display.c
Index: gdm-43.0/daemon/gdm-display.c
===================================================================
--- gdm-3.37.90.orig/daemon/gdm-display.c
+++ gdm-3.37.90/daemon/gdm-display.c
@@ -1523,12 +1523,12 @@ can_create_environment (const char *sess
--- gdm-43.0.orig/daemon/gdm-display.c
+++ gdm-43.0/daemon/gdm-display.c
@@ -1556,12 +1556,12 @@ can_create_environment (const char *sess
return session_exists;
}
@ -18,7 +18,7 @@ Index: gdm-3.37.90/daemon/gdm-display.c
return TRUE;
return FALSE;
@@ -1624,7 +1624,7 @@ wants_initial_setup (GdmDisplay *self)
@@ -1657,7 +1657,7 @@ wants_initial_setup (GdmDisplay *self)
priv = gdm_display_get_instance_private (self);
@ -27,10 +27,10 @@ Index: gdm-3.37.90/daemon/gdm-display.c
return FALSE;
}
Index: gdm-3.37.90/daemon/gdm-manager.c
Index: gdm-43.0/daemon/gdm-manager.c
===================================================================
--- gdm-3.37.90.orig/daemon/gdm-manager.c
+++ gdm-3.37.90/daemon/gdm-manager.c
--- gdm-43.0.orig/daemon/gdm-manager.c
+++ gdm-43.0/daemon/gdm-manager.c
@@ -62,7 +62,7 @@
#define GDM_MANAGER_DISPLAYS_PATH GDM_DBUS_PATH "/Displays"
@ -40,7 +40,7 @@ Index: gdm-3.37.90/daemon/gdm-manager.c
typedef struct
{
@@ -1781,6 +1781,7 @@ on_start_user_session (StartUserSessionO
@@ -1786,6 +1786,7 @@ on_start_user_session (StartUserSessionO
gboolean doing_initial_setup = FALSE;
GdmDisplay *display;
const char *session_id;
@ -48,7 +48,7 @@ Index: gdm-3.37.90/daemon/gdm-manager.c
g_debug ("GdmManager: start or jump to session");
@@ -1807,6 +1808,15 @@ on_start_user_session (StartUserSessionO
@@ -1812,6 +1813,15 @@ on_start_user_session (StartUserSessionO
"doing-initial-setup", &doing_initial_setup,
NULL);
@ -64,7 +64,7 @@ Index: gdm-3.37.90/daemon/gdm-manager.c
if (doing_initial_setup)
chown_initial_setup_home_dir ();
@@ -1827,20 +1837,9 @@ on_start_user_session (StartUserSessionO
@@ -1832,20 +1842,9 @@ on_start_user_session (StartUserSessionO
g_object_ref (display);
if (doing_initial_setup) {
@ -85,11 +85,11 @@ Index: gdm-3.37.90/daemon/gdm-manager.c
} else {
g_debug ("GdmManager: session has its display server, reusing our server for another login screen");
}
Index: gdm-3.37.90/daemon/meson.build
Index: gdm-43.0/daemon/meson.build
===================================================================
--- gdm-3.37.90.orig/daemon/meson.build
+++ gdm-3.37.90/daemon/meson.build
@@ -199,6 +199,7 @@ endif
--- gdm-43.0.orig/daemon/meson.build
+++ gdm-43.0/daemon/meson.build
@@ -210,6 +210,7 @@ endif
gdm_daemon = executable('gdm',
[ gdm_daemon_sources, gdm_daemon_gen_sources ],

10
gdm-switch-to-tty1.patch
View File

@ -1,7 +1,7 @@
Index: gdm-3.36.2/daemon/main.c
Index: gdm-43.0/daemon/main.c
===================================================================
--- gdm-3.36.2.orig/daemon/main.c
+++ gdm-3.36.2/daemon/main.c
--- gdm-43.0.orig/daemon/main.c
+++ gdm-43.0/daemon/main.c
@@ -61,6 +61,31 @@ static GdmSettings *settings =
static uid_t gdm_uid = -1;
static gid_t gdm_gid = -1;
@ -47,7 +47,7 @@ Index: gdm-3.36.2/daemon/main.c
static gboolean
on_sighup_cb (gpointer user_data)
{
@@ -395,6 +426,7 @@ main (int argc,
@@ -387,6 +418,7 @@ main (int argc,
g_main_loop_run (main_loop);
g_debug ("GDM finished, cleaning up...");
@ -55,7 +55,7 @@ Index: gdm-3.36.2/daemon/main.c
g_clear_object (&manager);
g_clear_object (&settings);
@@ -402,6 +434,10 @@ main (int argc,
@@ -394,6 +426,10 @@ main (int argc,
gdm_settings_direct_shutdown ();
gdm_log_shutdown ();

8
gdm-switch-user-tty7.patch
View File

@ -8,11 +8,11 @@ Closes #532
daemon/gdm-session-worker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gdm-3.36.2/daemon/gdm-session-worker.c
Index: gdm-43.0/daemon/gdm-session-worker.c
===================================================================
--- gdm-3.36.2.orig/daemon/gdm-session-worker.c
+++ gdm-3.36.2/daemon/gdm-session-worker.c
@@ -2209,7 +2209,7 @@ set_up_for_new_vt (GdmSessionWorker *wor
--- gdm-43.0.orig/daemon/gdm-session-worker.c
+++ gdm-43.0/daemon/gdm-session-worker.c
@@ -2208,7 +2208,7 @@ set_up_for_new_vt (GdmSessionWorker *wor
return FALSE;
}

36
gdm-sysconfig-settings.patch
View File

@ -1,7 +1,7 @@
Index: gdm-3.37.90/common/gdm-settings-system-backend.c
Index: gdm-43.0/common/gdm-settings-system-backend.c
===================================================================
--- /dev/null
+++ gdm-3.37.90/common/gdm-settings-system-backend.c
+++ gdm-43.0/common/gdm-settings-system-backend.c
@@ -0,0 +1,369 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -372,10 +372,10 @@ Index: gdm-3.37.90/common/gdm-settings-system-backend.c
+
+ return GDM_SETTINGS_BACKEND (object);
+}
Index: gdm-3.37.90/common/gdm-settings-system-backend.h
Index: gdm-43.0/common/gdm-settings-system-backend.h
===================================================================
--- /dev/null
+++ gdm-3.37.90/common/gdm-settings-system-backend.h
+++ gdm-43.0/common/gdm-settings-system-backend.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -433,10 +433,10 @@ Index: gdm-3.37.90/common/gdm-settings-system-backend.h
+G_END_DECLS
+
+#endif /* __GDM_SETTINGS_SYSTEM_BACKEND_H */
Index: gdm-3.37.90/common/gdm-settings.c
Index: gdm-43.0/common/gdm-settings.c
===================================================================
--- gdm-3.37.90.orig/common/gdm-settings.c
+++ gdm-3.37.90/common/gdm-settings.c
--- gdm-43.0.orig/common/gdm-settings.c
+++ gdm-43.0/common/gdm-settings.c
@@ -38,6 +38,7 @@
#include "gdm-settings.h"
@ -445,7 +445,7 @@ Index: gdm-3.37.90/common/gdm-settings.c
struct _GdmSettings
{
@@ -194,6 +195,8 @@ gdm_settings_init (GdmSettings *settings
@@ -198,6 +199,8 @@ gdm_settings_reload (GdmSettings *settin
if (backend)
settings->backends = g_list_prepend (NULL, backend);
@ -454,10 +454,10 @@ Index: gdm-3.37.90/common/gdm-settings.c
backend = gdm_settings_desktop_backend_new (GDM_RUNTIME_CONF);
if (backend)
settings->backends = g_list_prepend (settings->backends, backend);
Index: gdm-3.37.90/common/gdm-sysconfig.c
Index: gdm-43.0/common/gdm-sysconfig.c
===================================================================
--- /dev/null
+++ gdm-3.37.90/common/gdm-sysconfig.c
+++ gdm-43.0/common/gdm-sysconfig.c
@@ -0,0 +1,484 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -943,10 +943,10 @@ Index: gdm-3.37.90/common/gdm-sysconfig.c
+ g_strfreev (lines);
+ return result;
+}
Index: gdm-3.37.90/common/gdm-sysconfig.h
Index: gdm-43.0/common/gdm-sysconfig.h
===================================================================
--- /dev/null
+++ gdm-3.37.90/common/gdm-sysconfig.h
+++ gdm-43.0/common/gdm-sysconfig.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -991,10 +991,10 @@ Index: gdm-3.37.90/common/gdm-sysconfig.h
+G_END_DECLS
+
+#endif /* __GDM_SYSCONFIG_H */
Index: gdm-3.37.90/data/gdm.conf-custom.in
Index: gdm-43.0/data/gdm.conf-custom.in
===================================================================
--- gdm-3.37.90.orig/data/gdm.conf-custom.in
+++ gdm-3.37.90/data/gdm.conf-custom.in
--- gdm-43.0.orig/data/gdm.conf-custom.in
+++ gdm-43.0/data/gdm.conf-custom.in
@@ -1,4 +1,7 @@
# GDM configuration storage
+#
@ -1003,10 +1003,10 @@ Index: gdm-3.37.90/data/gdm.conf-custom.in
[daemon]
# Uncomment the line below to force the login screen to use Xorg
Index: gdm-3.37.90/common/meson.build
Index: gdm-43.0/common/meson.build
===================================================================
--- gdm-3.37.90.orig/common/meson.build
+++ gdm-3.37.90/common/meson.build
--- gdm-43.0.orig/common/meson.build
+++ gdm-43.0/common/meson.build
@@ -5,9 +5,11 @@ libgdmcommon_src = files(
'gdm-profile.c',
'gdm-settings-backend.c',

32
gdm-xauthlocalhostname.patch
View File

@ -1,7 +1,7 @@
Index: gdm-40.1/common/gdm-common.c
Index: gdm-43.0/common/gdm-common.c
===================================================================
--- gdm-40.1.orig/common/gdm-common.c
+++ gdm-40.1/common/gdm-common.c
--- gdm-43.0.orig/common/gdm-common.c
+++ gdm-43.0/common/gdm-common.c
@@ -613,6 +613,8 @@ gdm_get_script_environment (const char *
if (display_hostname) {
@ -26,10 +26,10 @@ Index: gdm-40.1/common/gdm-common.c
+ return g_strdup ("localhost");
+ }
+}
Index: gdm-40.1/common/gdm-common.h
Index: gdm-43.0/common/gdm-common.h
===================================================================
--- gdm-40.1.orig/common/gdm-common.h
+++ gdm-40.1/common/gdm-common.h
--- gdm-43.0.orig/common/gdm-common.h
+++ gdm-43.0/common/gdm-common.h
@@ -70,6 +70,7 @@ char *gdm_generate_random_bytes
gboolean gdm_get_login_window_session_id (const char *seat_id,
char **session_id);
@ -38,10 +38,10 @@ Index: gdm-40.1/common/gdm-common.h
GPtrArray *gdm_get_script_environment (const char *username,
const char *display_name,
Index: gdm-40.1/daemon/gdm-display-access-file.c
Index: gdm-43.0/daemon/gdm-display-access-file.c
===================================================================
--- gdm-40.1.orig/daemon/gdm-display-access-file.c
+++ gdm-40.1/daemon/gdm-display-access-file.c
--- gdm-43.0.orig/daemon/gdm-display-access-file.c
+++ gdm-43.0/daemon/gdm-display-access-file.c
@@ -441,13 +441,10 @@ _get_auth_info_for_display (GdmDisplayAc
*
* https://bugs.freedesktop.org/show_bug.cgi?id=43425
@ -59,10 +59,10 @@ Index: gdm-40.1/daemon/gdm-display-access-file.c
} else {
*family = FamilyWild;
gdm_display_get_remote_hostname (display, address, NULL);
Index: gdm-40.1/daemon/gdm-launch-environment.c
Index: gdm-43.0/daemon/gdm-launch-environment.c
===================================================================
--- gdm-40.1.orig/daemon/gdm-launch-environment.c
+++ gdm-40.1/daemon/gdm-launch-environment.c
--- gdm-43.0.orig/daemon/gdm-launch-environment.c
+++ gdm-43.0/daemon/gdm-launch-environment.c
@@ -224,6 +224,11 @@ build_launch_environment (GdmLaunchEnvir
g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
}
@ -75,11 +75,11 @@ Index: gdm-40.1/daemon/gdm-launch-environment.c
g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
/* Now populate XDG_DATA_DIRS from env.d if we're running initial setup; this allows
Index: gdm-40.1/daemon/gdm-session.c
Index: gdm-43.0/daemon/gdm-session.c
===================================================================
--- gdm-40.1.orig/daemon/gdm-session.c
+++ gdm-40.1/daemon/gdm-session.c
@@ -2709,6 +2709,14 @@ set_up_session_environment (GdmSession *
--- gdm-43.0.orig/daemon/gdm-session.c
+++ gdm-43.0/daemon/gdm-session.c
@@ -2739,6 +2739,14 @@ set_up_session_environment (GdmSession *
}
}

13
gdm.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Sep 20 17:49:13 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 43.0:
+ Drop vestigial code.
+ Fixes in GPU detection.
+ Use _GNU_SOURCE again to avoid compile warning.
+ Updated translations.
- Drop patches fixed upstream:
+ gdm-Fix-type-of-signal-connection-id.patch
+ gdm-Stop-listening-to-udev-events.patch
- Rebase patches with quilt.
-------------------------------------------------------------------
Tue Aug 2 01:52:26 UTC 2022 - Yifan Jiang <yfjiang@suse.com>

10
gdm.spec
View File

@ -28,14 +28,14 @@
%endif
Name: gdm
Version: 42.0
Version: 43.0
Release: 0
Summary: The GNOME Display Manager
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://wiki.gnome.org/Projects/GDM
Source0: https://download.gnome.org/sources/gdm/42/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gdm/43/%{name}-%{version}.tar.xz
Source1: gdm.pamd
Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd
@ -70,10 +70,6 @@ Patch13: gdm-s390-not-require-g-s-d_wacom.patch
Patch14: gdm-switch-user-tty7.patch
# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bsc#1162888 glgo#GNOME/mutter#57 qkzhu@suse.com -- Disable Wayland on mgag200 chipsets
Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch
# PATCH-FIX-UPSTREAM gdm-Fix-type-of-signal-connection-id.patch bsc#1197521 xwang@suse.com -- Fix the type of signal connection id
Patch16: gdm-Fix-type-of-signal-connection-id.patch
# PATCH-FIX-UPSTREAM gdm-Stop-listening-to-udev-events.patch bsc#1197521 xwang@suse.com -- Stop listening to udev events
Patch17: gdm-Stop-listening-to-udev-events.patch
### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
# PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
@ -247,8 +243,6 @@ running display manager.
%endif
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
# SLE and Leap only patches start at 1000
%if 0%{?sle_version}