Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2018-03-05 13:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdm" Mon Mar 5 13:33:08 2018 rev:205 rq:581951 version:3.26.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2018-02-03 15:36:39.629743292 +0100 +++ /work/SRC/openSUSE:Factory/.gdm.new/gdm.changes 2018-03-05 13:33:13.989984602 +0100 @@ -1,0 +2,13 @@ +Fri Mar 2 01:56:52 UTC 2018 - [email protected] + +- Add gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch: + fix showing right active session of user in login dialog + (bsc#1082958 bgo#793609). + +------------------------------------------------------------------- +Thu Mar 1 02:41:45 UTC 2018 - [email protected] + +- Remove gdm-default-wm-sle12.patch: default session in SLE15 + becomes 'GNOME', don't need this patch anymore. + +------------------------------------------------------------------- @@ -12,0 +26,9 @@ + +------------------------------------------------------------------- +Fri Jan 26 11:27:50 UTC 2018 - [email protected] + +- Add runtime option to start X under root instead of regular user. + Necessary if no DRI drivers are present. (bnc#1075805) + * gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch + * Updated X11-displaymanager-gdm to set the + GDM_DISABLE_USER_DISPLAY_SERVER variable when needed. Old: ---- gdm-default-wm-sle12.patch New: ---- gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.9LQpmE/_old 2018-03-05 13:33:15.525929016 +0100 +++ /var/tmp/diff_new_pack.9LQpmE/_new 2018-03-05 13:33:15.529928871 +0100 @@ -68,10 +68,12 @@ Patch42: gdm-fails-to-restart-gnome-shell.patch # PATCH-FIX-UPSTREAM gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch bsc#1068016 bgo#792150 [email protected] -- When run PreSession script, don't set DISPLAY and XAUTHORITY environment variable Patch43: gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch -# PATCH-FIX-SLE gdm-default-wm-sle12.patch bnc#881659 [email protected] -- set default/fallback session type to SLE Classic -Patch49: gdm-default-wm-sle12.patch # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 [email protected] -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. Patch52: gdm-disable-gnome-initial-setup.patch +# PATCH-FIX-UPSTREAM gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1075805 bgo#793255 [email protected] -- Add runtime option to start X under root instead of regular user. Necessary if no DRI drivers are present. +Patch53: gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch +# PATCH-FIX-UPSTREAM gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch bsc#1082958 bgo#793609 [email protected] -- Show right active session of user in login dialog. +Patch54: gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -219,9 +221,10 @@ %patch42 -p1 %patch43 -p1 %if !0%{?is_opensuse} -%patch49 -p1 %patch52 -p1 %endif +%patch53 -p1 +%patch54 -p1 %build NOCONFIGURE=1 sh autogen.sh ++++++ X11-displaymanager-gdm ++++++ --- /var/tmp/diff_new_pack.9LQpmE/_old 2018-03-05 13:33:15.581926990 +0100 +++ /var/tmp/diff_new_pack.9LQpmE/_new 2018-03-05 13:33:15.581926990 +0100 @@ -4,6 +4,16 @@ RELOADSIGNAL="-USR1" DISPLAYMANAGER=/usr/sbin/gdm PIDFILE=/run/gdm/gdm.pid + + # let gdm run the Xserver as root if access to /dev/fb* + # is required (bsc#1075805) + # The GDM_DISABLE_USER_DISPLAY_SERVER variable is added by patch + # gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch + if [ ! -c /dev/dri/card0 -a \ + ! -c /dev/nvidiactl ]; then + export GDM_DISABLE_USER_DISPLAY_SERVER=1 + fi + return 0 ;; *) return 1 ;; esac ++++++ gdm-Revert-session-don-t-call-gdm_session_defaults_chang.patch ++++++ >From f4f7b6914ad2b9b0b7da036dde4028751eb49eb7 Mon Sep 17 00:00:00 2001 From: Ray Strode <[email protected]> Date: Wed, 14 Feb 2018 16:07:15 -0500 Subject: [PATCH 01/16] Revert "session: don't call gdm_session_defaults_changed from setup" This reverts commit 572a19324b75cc1f1b2db4908e2d7c9f06e4e335. It turns out we need this call for more than just the session type, we also need to it to inform the greeter about the default session to use. https://bugzilla.gnome.org/show_bug.cgi?id=793609 --- daemon/gdm-session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 610ebcd0..19d26c92 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -2295,6 +2295,7 @@ gdm_session_setup (GdmSession *self, update_session_type (self); initialize (self, service_name, NULL, NULL); + gdm_session_defaults_changed (self); } @@ -2313,6 +2314,7 @@ gdm_session_setup_for_user (GdmSession *self, self->priv->is_program_session = FALSE; initialize (self, service_name, self->priv->selected_user, NULL); + gdm_session_defaults_changed (self); } void -- 2.12.3 ++++++ gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch ++++++ >From a19b51ad9e446948ba60c359641f6c4c14fec1da Mon Sep 17 00:00:00 2001 From: Michal Srb <[email protected]> Date: Fri, 26 Jan 2018 10:49:18 +0100 Subject: [PATCH] Add runtime option to disable starting X server as user If the environmental variable GDM_DISABLE_USER_DISPLAY_SERVER is defined, the X server will be started under root. The same way as if gdm was built with --disable-user-display-server option. This allows system to run X server under root if and only-if necessary. --- daemon/gdm-local-display-factory.c | 10 ++++++---- daemon/gdm-session.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index b29f5ac5..7c687cf6 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -207,8 +207,11 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact g_debug ("GdmLocalDisplayFactory: Creating transient display"); #ifdef ENABLE_USER_DISPLAY_SERVER - display = gdm_local_display_new (); -#else + if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL) { + display = gdm_local_display_new (); + } +#endif + if (display == NULL) { guint32 num; @@ -216,7 +219,6 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact display = gdm_legacy_display_new (num); } -#endif g_object_set (display, "seat-id", "seat0", @@ -369,7 +371,7 @@ create_display (GdmLocalDisplayFactory *factory, g_debug ("GdmLocalDisplayFactory: Adding display on seat %s", seat_id); #ifdef ENABLE_USER_DISPLAY_SERVER - if (g_strcmp0 (seat_id, "seat0") == 0) { + if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL && g_strcmp0 (seat_id, "seat0") == 0) { display = gdm_local_display_new (); if (session_type != NULL) { g_object_set (G_OBJECT (display), "session-type", session_type, NULL); diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 610ebcd0..cb37ed4e 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -360,7 +360,11 @@ get_system_session_dirs (GdmSession *self) #ifdef ENABLE_WAYLAND_SUPPORT if (!self->priv->ignore_wayland) { #ifdef ENABLE_USER_DISPLAY_SERVER - g_array_prepend_val (search_array, wayland_search_dir); + if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL) { + g_array_prepend_val (search_array, wayland_search_dir); + } else { + g_array_append_val (search_array, wayland_search_dir); + } #else g_array_append_val (search_array, wayland_search_dir); #endif @@ -3147,8 +3151,10 @@ gdm_session_get_display_mode (GdmSession *self) * right now. It will die with an error if logind devices * are paused when handed out. */ - return GDM_SESSION_DISPLAY_MODE_NEW_VT; -#else + if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL) { + return GDM_SESSION_DISPLAY_MODE_NEW_VT; + } +#endif #ifdef ENABLE_WAYLAND_SUPPORT /* Wayland sessions are for now assumed to run in a @@ -3159,7 +3165,6 @@ gdm_session_get_display_mode (GdmSession *self) } #endif return GDM_SESSION_DISPLAY_MODE_REUSE_VT; -#endif } void -- 2.13.6
