Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2020-04-27 23:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdm" Mon Apr 27 23:29:00 2020 rev:227 rq:798354 version:3.34.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2020-04-23 18:26:14.035604993 +0200 +++ /work/SRC/openSUSE:Factory/.gdm.new.2738/gdm.changes 2020-04-27 23:29:08.562441611 +0200 @@ -1,0 +2,20 @@ +Sun Apr 26 09:42:29 UTC 2020 - Yifan Jiang <[email protected]> + +- Burnish gdm-look-for-session-based-on-pid-first.patch according + to the upstream change (bsc#1159950, glgo#GNOME/gdm#526). + +------------------------------------------------------------------- +Wed Apr 22 01:32:07 UTC 2020 - Yifan Jiang <[email protected]> + +- Disable gnome-initial-setup under gdm mode in Leap and SLE + (jsc#SLE-11856). + +------------------------------------------------------------------- +Sat Apr 18 16:12:21 UTC 2020 - Bjørn Lie <[email protected]> + +- Add gdm-Use-pkg-config-for-keyutils.patch: configure: Use + pkg-config to look for keyutils. Following this, replace + keyutils-devel pkgconfig(libkeyutils) BuildRequires. +- Rebase/refresh patches with quilt. + +------------------------------------------------------------------- New: ---- gdm-Use-pkg-config-for-keyutils.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.418443282 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.418443282 +0200 @@ -67,6 +67,9 @@ Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch # PATCH-FIX-UPSTREAM gdm-look-for-session-based-on-pid-first.patch bsc#1159950 glgo#GNOME/gdm#526 [email protected] -- Look for session based on pid first, then fall back to the uid based approach Patch16: gdm-look-for-session-based-on-pid-first.patch +# PATCH-FIX-UPSTREAM gdm-Use-pkg-config-for-keyutils.patch -- configure: Use pkg-config to look for keyutils +Patch17: gdm-Use-pkg-config-for-keyutils.patch + ### NOTE: Keep please SLE-only patches at bottom (starting on 1000). # 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. Patch1000: gdm-disable-gnome-initial-setup.patch @@ -76,7 +79,6 @@ BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-session-core -BuildRequires: keyutils-devel BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: pwdutils @@ -96,6 +98,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 2.91.1 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.4 +BuildRequires: pkgconfig(libkeyutils) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(ply-boot-client) BuildRequires: pkgconfig(x11) @@ -224,9 +227,10 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 -# SLE-only patches start at 1000 -%if !0%{?is_opensuse} +# SLE and Leap only patches start at 1000 +%if 0%{?sle_version} %patch1000 -p1 %endif ++++++ gdm-Use-pkg-config-for-keyutils.patch ++++++ >From 141f8bc24401db636c4b1a9dd991c68d7b3282f0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <[email protected]> Date: Fri, 31 Jan 2020 19:27:02 +0100 Subject: [PATCH] configure: Use pkg-config to look for keyutils Support for pkg-config was added to keyutils somewhat recently in November 2018 [1], whereas the keyutils dependency was originally added in August 2016 in commit 31ed6f2b3f1ab45ae07aad41c13a51ba91fd159d. [1] Keyutils commit d4d758a04616b770 https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=d4d758a04616b770 https://gitlab.gnome.org/GNOME/gdm/merge_requests/91 --- configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: gdm-3.34.1/configure.ac =================================================================== --- gdm-3.34.1.orig/configure.ac +++ gdm-3.34.1/configure.ac @@ -532,11 +532,10 @@ if test "x$supports_pam_extensions" = "x AC_DEFINE(SUPPORTS_PAM_EXTENSIONS, 1, [Define if PAM supports GDMs custom extensions]) fi -AC_CHECK_LIB(keyutils, keyctl_read, [ - AC_DEFINE(HAVE_KEYUTILS, 1, [Define if have keyutils]) - KEYUTILS_LIBS="-lkeyutils" - KEYUTILS_CFLAGS="" -]) +PKG_CHECK_MODULES([KEYUTILS], + [libkeyutils], + [AC_DEFINE([HAVE_KEYUTILS], [1], [Define if have keyutils])], + [true]) AC_SUBST(KEYUTILS_LIBS) AC_SUBST(KEYUTILS_CFLAGS) ++++++ gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.482443407 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.482443407 +0200 @@ -9,10 +9,10 @@ This allows system to run X server under root if and only-if necessary. --- -Index: gdm-3.32.0+2/daemon/gdm-local-display-factory.c +Index: gdm-3.34.1/daemon/gdm-local-display-factory.c =================================================================== ---- gdm-3.32.0+2.orig/daemon/gdm-local-display-factory.c -+++ gdm-3.32.0+2/daemon/gdm-local-display-factory.c +--- gdm-3.34.1.orig/daemon/gdm-local-display-factory.c ++++ gdm-3.34.1/daemon/gdm-local-display-factory.c @@ -231,11 +231,12 @@ gdm_local_display_factory_create_transie g_debug ("GdmLocalDisplayFactory: Creating transient display"); @@ -39,7 +39,7 @@ g_object_set (display, "seat-id", "seat0", -@@ -468,7 +468,7 @@ create_display (GdmLocalDisplayFactory * +@@ -502,7 +502,7 @@ create_display (GdmLocalDisplayFactory * g_debug ("GdmLocalDisplayFactory: Adding display on seat %s", seat_id); #ifdef ENABLE_USER_DISPLAY_SERVER @@ -48,10 +48,10 @@ display = gdm_local_display_new (); if (session_type != NULL) { g_object_set (G_OBJECT (display), "session-type", session_type, NULL); -Index: gdm-3.32.0+2/daemon/gdm-session.c +Index: gdm-3.34.1/daemon/gdm-session.c =================================================================== ---- gdm-3.32.0+2.orig/daemon/gdm-session.c -+++ gdm-3.32.0+2/daemon/gdm-session.c +--- gdm-3.34.1.orig/daemon/gdm-session.c ++++ gdm-3.34.1/daemon/gdm-session.c @@ -373,7 +373,11 @@ get_system_session_dirs (GdmSession *sel #ifdef ENABLE_WAYLAND_SUPPORT if (!self->ignore_wayland) { @@ -65,7 +65,7 @@ for (i = 0; system_data_dirs[i]; i++) { gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); -@@ -3276,8 +3280,10 @@ gdm_session_get_display_mode (GdmSession +@@ -3315,8 +3319,10 @@ gdm_session_get_display_mode (GdmSession * right now. It will die with an error if logind devices * are paused when handed out. */ @@ -78,7 +78,7 @@ #ifdef ENABLE_WAYLAND_SUPPORT /* Wayland sessions are for now assumed to run in a -@@ -3288,7 +3294,6 @@ gdm_session_get_display_mode (GdmSession +@@ -3327,7 +3333,6 @@ gdm_session_get_display_mode (GdmSession } #endif return GDM_SESSION_DISPLAY_MODE_REUSE_VT; ++++++ gdm-disable-wayland-on-mgag200-chipsets.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.506443454 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.510443461 +0200 @@ -1,8 +1,8 @@ -diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in -index ad5b87d..f964259 100644 ---- a/data/61-gdm.rules.in -+++ b/data/61-gdm.rules.in -@@ -4,3 +4,12 @@ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4" +Index: gdm-3.34.1/data/61-gdm.rules.in +=================================================================== +--- gdm-3.34.1.orig/data/61-gdm.rules.in ++++ gdm-3.34.1/data/61-gdm.rules.in +@@ -4,3 +4,12 @@ ATTR{vendor}=="0x1013", ATTR{device}=="0 ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland" # disable Wayland when using the proprietary nvidia driver DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland" ++++++ gdm-look-for-session-based-on-pid-first.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.538443516 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.538443516 +0200 @@ -1,4 +1,4 @@ -From 82c3c9bbe924c43e93e74cd622207a54bc44962c Mon Sep 17 00:00:00 2001 +From 32646105196ed7a687f3684b69ea544dd01d2ade Mon Sep 17 00:00:00 2001 From: Benjamin Berg <[email protected]> Date: Thu, 23 Jan 2020 14:32:38 +0100 Subject: [PATCH] manager: Try looking up session based on PID first @@ -22,7 +22,7 @@ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/common/gdm-common.c b/common/gdm-common.c -index 41bdb389..d13cf618 100644 +index 41bdb389..b8de7555 100644 --- a/common/gdm-common.c +++ b/common/gdm-common.c @@ -497,7 +497,7 @@ goto_login_session (GDBusConnection *connection, @@ -41,7 +41,7 @@ -gdm_find_display_session_for_uid (const uid_t uid, - char **out_session_id, - GError **error) -+gdm_find_display_session (int pid, ++gdm_find_display_session (GPid pid, + const uid_t uid, + char **out_session_id, + GError **error) @@ -61,15 +61,15 @@ + */ + res = sd_pid_get_session (pid, &local_session_id); + if (res >= 0) { -+ g_debug ("Found session %s for PID %d, using", local_session_id, pid); ++ g_debug ("GdmCommon: Found session %s for PID %d, using", local_session_id, pid); + + *out_session_id = g_strdup (local_session_id); -+ g_free (local_session_id); ++ free (local_session_id); + + return TRUE; + } else { + if (res != -ENODATA) -+ g_warning ("Failed to retrieve session information for pid %d: %s", ++ g_warning ("GdmCommon: Failed to retrieve session information for pid %d: %s", + pid, strerror (-res)); + } + @@ -77,7 +77,7 @@ n_sessions = sd_uid_get_sessions (uid, diff --git a/common/gdm-common.h b/common/gdm-common.h -index 5c3fe137..3d037d68 100644 +index 5c3fe137..001b70c1 100644 --- a/common/gdm-common.h +++ b/common/gdm-common.h @@ -51,9 +51,10 @@ int gdm_wait_on_and_disown_pid (int pid, @@ -87,7 +87,7 @@ -gboolean gdm_find_display_session_for_uid (const uid_t uid, - char **out_session_id, - GError **error); -+gboolean gdm_find_display_session (int pid, ++gboolean gdm_find_display_session (GPid pid, + const uid_t uid, + char **out_session_id, + GError **error); @@ -121,5 +121,4 @@ return FALSE; -- -2.24.1 - +2.26.2 ++++++ gdm-suse-xsession.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.562443563 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.562443563 +0200 @@ -1,7 +1,7 @@ -Index: gdm-3.31.91/data/Init.in +Index: gdm-3.34.1/data/Init.in =================================================================== ---- gdm-3.31.91.orig/data/Init.in 2019-02-21 20:44:14.000000000 +0100 -+++ gdm-3.31.91/data/Init.in 2019-02-27 07:46:21.401932235 +0100 +--- gdm-3.34.1.orig/data/Init.in ++++ gdm-3.34.1/data/Init.in @@ -1,4 +1,9 @@ #!/bin/sh + @@ -12,10 +12,10 @@ # Stolen from the debian kdm setup, aren't I sneaky # Plus a lot of fun stuff added # -George -Index: gdm-3.31.91/data/PostSession.in +Index: gdm-3.34.1/data/PostSession.in =================================================================== ---- gdm-3.31.91.orig/data/PostSession.in 2018-10-12 23:05:26.000000000 +0200 -+++ gdm-3.31.91/data/PostSession.in 2019-02-27 07:46:21.401932235 +0100 +--- gdm-3.34.1.orig/data/PostSession.in ++++ gdm-3.34.1/data/PostSession.in @@ -1,3 +1,7 @@ #!/bin/sh @@ -24,10 +24,10 @@ +fi + exit 0 -Index: gdm-3.31.91/data/Xsession.in +Index: gdm-3.34.1/data/Xsession.in =================================================================== ---- gdm-3.31.91.orig/data/Xsession.in 2019-02-21 20:44:14.000000000 +0100 -+++ gdm-3.31.91/data/Xsession.in 2019-02-27 07:46:21.401932235 +0100 +--- gdm-3.34.1.orig/data/Xsession.in ++++ gdm-3.34.1/data/Xsession.in @@ -1,4 +1,9 @@ #!@XSESSION_SHELL@ + @@ -38,10 +38,10 @@ # # This is SORT OF LIKE an X session, but not quite. You get a command as the # first argument (it could be multiple words, so run it with "eval"). As a -Index: gdm-3.31.91/data/PreSession.in +Index: gdm-3.34.1/data/PreSession.in =================================================================== ---- gdm-3.31.91.orig/data/PreSession.in 2018-10-12 23:05:26.000000000 +0200 -+++ gdm-3.31.91/data/PreSession.in 2019-02-27 07:46:21.401932235 +0100 +--- gdm-3.34.1.orig/data/PreSession.in ++++ gdm-3.34.1/data/PreSession.in @@ -6,4 +6,8 @@ # # Note that output goes into the .xsession-errors file for easy debugging ++++++ gdm-switch-to-tty1.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.574443586 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.574443586 +0200 @@ -1,7 +1,7 @@ -Index: gdm-3.32.0+2/daemon/main.c +Index: gdm-3.34.1/daemon/main.c =================================================================== ---- gdm-3.32.0+2.orig/daemon/main.c -+++ gdm-3.32.0+2/daemon/main.c +--- gdm-3.34.1.orig/daemon/main.c ++++ gdm-3.34.1/daemon/main.c @@ -61,6 +61,31 @@ static GdmSettings *settings = static uid_t gdm_uid = -1; static gid_t gdm_gid = -1; ++++++ gdm-switch-user-tty7.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.586443609 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.586443609 +0200 @@ -8,11 +8,11 @@ daemon/gdm-session-worker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index 1319907e..0ca3dd0c 100644 ---- a/daemon/gdm-session-worker.c -+++ b/daemon/gdm-session-worker.c -@@ -2201,7 +2201,7 @@ set_up_for_new_vt (GdmSessionWorker *worker) +Index: gdm-3.34.1/daemon/gdm-session-worker.c +=================================================================== +--- gdm-3.34.1.orig/daemon/gdm-session-worker.c ++++ gdm-3.34.1/daemon/gdm-session-worker.c +@@ -2201,7 +2201,7 @@ set_up_for_new_vt (GdmSessionWorker *wor return FALSE; } @@ -21,6 +21,3 @@ session_vt = GDM_INITIAL_VT; } else { if (ioctl(fd, VT_OPENQRY, &session_vt) < 0) { --- -2.16.4 - ++++++ gdm-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.J7GbBg/_old 2020-04-27 23:29:09.598443632 +0200 +++ /var/tmp/diff_new_pack.J7GbBg/_new 2020-04-27 23:29:09.598443632 +0200 @@ -1,8 +1,8 @@ -Index: gdm-3.31.91/common/Makefile.am +Index: gdm-3.34.1/common/Makefile.am =================================================================== ---- gdm-3.31.91.orig/common/Makefile.am 2019-02-21 20:44:14.000000000 +0100 -+++ gdm-3.31.91/common/Makefile.am 2019-02-27 07:44:47.645367708 +0100 -@@ -46,11 +46,15 @@ libgdmcommon_la_SOURCES = \ +--- gdm-3.34.1.orig/common/Makefile.am ++++ gdm-3.34.1/common/Makefile.am +@@ -45,11 +45,15 @@ libgdmcommon_la_SOURCES = \ gdm-settings-backend.h \ gdm-settings-desktop-backend.c \ gdm-settings-desktop-backend.h \ @@ -18,10 +18,10 @@ gdm-log.h \ gdm-log.c \ $(NULL) -Index: gdm-3.31.91/common/gdm-settings-system-backend.c +Index: gdm-3.34.1/common/gdm-settings-system-backend.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-3.31.91/common/gdm-settings-system-backend.c 2019-02-27 07:44:47.645367708 +0100 +--- /dev/null ++++ gdm-3.34.1/common/gdm-settings-system-backend.c @@ -0,0 +1,369 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -392,10 +392,10 @@ + + return GDM_SETTINGS_BACKEND (object); +} -Index: gdm-3.31.91/common/gdm-settings-system-backend.h +Index: gdm-3.34.1/common/gdm-settings-system-backend.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-3.31.91/common/gdm-settings-system-backend.h 2019-02-27 07:44:47.645367708 +0100 +--- /dev/null ++++ gdm-3.34.1/common/gdm-settings-system-backend.h @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -453,10 +453,10 @@ +G_END_DECLS + +#endif /* __GDM_SETTINGS_SYSTEM_BACKEND_H */ -Index: gdm-3.31.91/common/gdm-settings.c +Index: gdm-3.34.1/common/gdm-settings.c =================================================================== ---- gdm-3.31.91.orig/common/gdm-settings.c 2019-02-21 20:44:14.000000000 +0100 -+++ gdm-3.31.91/common/gdm-settings.c 2019-02-27 07:44:47.645367708 +0100 +--- gdm-3.34.1.orig/common/gdm-settings.c ++++ gdm-3.34.1/common/gdm-settings.c @@ -38,6 +38,7 @@ #include "gdm-settings.h" @@ -474,10 +474,10 @@ backend = gdm_settings_desktop_backend_new (GDM_RUNTIME_CONF); if (backend) settings->backends = g_list_prepend (settings->backends, backend); -Index: gdm-3.31.91/common/gdm-sysconfig.c +Index: gdm-3.34.1/common/gdm-sysconfig.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-3.31.91/common/gdm-sysconfig.c 2019-02-27 07:44:47.645367708 +0100 +--- /dev/null ++++ gdm-3.34.1/common/gdm-sysconfig.c @@ -0,0 +1,484 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -963,10 +963,10 @@ + g_strfreev (lines); + return result; +} -Index: gdm-3.31.91/common/gdm-sysconfig.h +Index: gdm-3.34.1/common/gdm-sysconfig.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-3.31.91/common/gdm-sysconfig.h 2019-02-27 07:44:47.645367708 +0100 +--- /dev/null ++++ gdm-3.34.1/common/gdm-sysconfig.h @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -1011,10 +1011,10 @@ +G_END_DECLS + +#endif /* __GDM_SYSCONFIG_H */ -Index: gdm-3.31.91/data/gdm.conf-custom.in +Index: gdm-3.34.1/data/gdm.conf-custom.in =================================================================== ---- gdm-3.31.91.orig/data/gdm.conf-custom.in 2019-02-21 20:44:14.000000000 +0100 -+++ gdm-3.31.91/data/gdm.conf-custom.in 2019-02-27 07:44:47.649367731 +0100 +--- gdm-3.34.1.orig/data/gdm.conf-custom.in ++++ gdm-3.34.1/data/gdm.conf-custom.in @@ -1,4 +1,7 @@ # GDM configuration storage +#
