From 7927f1eadb9af61e55f5cec3c97ab2a8992ad1e809aa249f0d9f9046f766d5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 16 Dec 2020 09:58:20 +0000 Subject: [PATCH 1/4] Accepting request 856325 from GNOME:Next New stable rel OBS-URL: https://build.opensuse.org/request/show/856325 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=469 --- gdm-3.38.2.1.tar.xz | 3 +++ gdm-3.38.2.tar.xz | 3 --- gdm.changes | 7 +++++++ gdm.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 gdm-3.38.2.1.tar.xz delete mode 100644 gdm-3.38.2.tar.xz diff --git a/gdm-3.38.2.1.tar.xz b/gdm-3.38.2.1.tar.xz new file mode 100644 index 0000000..3e87356 --- /dev/null +++ b/gdm-3.38.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da +size 789036 diff --git a/gdm-3.38.2.tar.xz b/gdm-3.38.2.tar.xz deleted file mode 100644 index 8b7f1c8..0000000 --- a/gdm-3.38.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25a26666c3dd4bb6a545decbbe0678439b2b227ee63b67eebd2d7910761e53cc -size 787024 diff --git a/gdm.changes b/gdm.changes index e93c9d5..ba4637b 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 16 09:43:01 UTC 2020 - Bjørn Lie + +- Update to version 3.38.2.1: + + Address autologin unlock bug issue (CVE-2020-27837). + + Updated translations. + ------------------------------------------------------------------- Wed Nov 4 10:05:13 UTC 2020 - Dominique Leuenberger diff --git a/gdm.spec b/gdm.spec index 056c569..6a96ccd 100644 --- a/gdm.spec +++ b/gdm.spec @@ -21,7 +21,7 @@ %define enable_split_authentication 0 Name: gdm -Version: 3.38.2 +Version: 3.38.2.1 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0-or-later From bd6669694ec5f034f3fc3521b309414f3f96bf2978451b25fde696b209f21561 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Jan 2021 09:07:30 +0000 Subject: [PATCH 2/4] Accepting request 865414 from home:kukuk:branches:GNOME:Factory - Use sysusers config file to generate gdm user OBS-URL: https://build.opensuse.org/request/show/865414 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=470 --- gdm.changes | 5 +++++ gdm.spec | 22 ++++++++++++---------- gdm.sysusers | 3 +++ 3 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 gdm.sysusers diff --git a/gdm.changes b/gdm.changes index ba4637b..01cc9f1 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 21 12:57:09 UTC 2021 - Thorsten Kukuk + +- Use sysusers config file to generate gdm user + ------------------------------------------------------------------- Wed Dec 16 09:43:01 UTC 2020 - Bjørn Lie diff --git a/gdm.spec b/gdm.spec index 6a96ccd..8852846 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ # # spec file for package gdm # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,6 +42,8 @@ Source7: X11-displaymanager-gdm Source9: gdm.tmpfiles # Use reserveVT.conf to make autologin user session not to select tty1 Source10: reserveVT.conf +# Use sysusers to create gdm system user +Source11: gdm.sysusers # WARNING: do not remove/significantly change patch0 without updating the relevant patch in accountsservice too # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 bsc#919723 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch) Patch0: gdm-sysconfig-settings.patch @@ -76,7 +78,8 @@ BuildRequires: gnome-session-core BuildRequires: meson >= 0.50.0 BuildRequires: pam-devel BuildRequires: pkgconfig -BuildRequires: pwdutils +BuildRequires: sysuser-shadow +BuildRequires: sysuser-tools BuildRequires: tcpd-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -113,9 +116,6 @@ Requires: gnome-shell # xdm package ships systemd display-manager service and other common scripts # between display managers (bsc#1084655) Requires: xdm -# FIXME: use proper Requires(pre/post/preun/...) -# For groupadd, useradd, usermod -PreReq: pwdutils Requires(post): dconf Requires(pre): group(video) Recommends: iso-codes @@ -129,6 +129,7 @@ DocDir: %{_defaultdocdir} %ifnarch s390 s390x BuildRequires: pkgconfig(xorg-server) %endif +%sysusers_requires %description The GNOME Display Manager is a system service that is responsible for @@ -248,6 +249,7 @@ running display manager. -Dwayland-support=true \ %nil %meson_build +%sysusers_generate_pre %{SOURCE11} gdm %install %meson_install @@ -295,17 +297,16 @@ install -m 644 %{SOURCE9} %{buildroot}%{_tmpfilesdir}/gdm.conf mkdir -p %{buildroot}%{_prefix}/lib/systemd/logind.conf.d install -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/systemd/logind.conf.d/reserveVT.conf +mkdir -p %{buildroot}%{_sysusersdir} +install -m 644 %{SOURCE11} %{buildroot}%{_sysusersdir}/gdm.conf + %find_lang %{name} %{?no_lang_C} %fdupes -s %{buildroot}%{_datadir}/help %check %meson_test -%pre -%{_sbindir}/groupadd -r gdm 2> /dev/null || : -%{_sbindir}/useradd -r -g gdm -G video -s /bin/false \ --c "Gnome Display Manager daemon" -d %{_localstatedir}/lib/gdm gdm 2> /dev/null || : -%{_sbindir}/usermod -g gdm -G video -s /bin/false gdm 2> /dev/null +%pre -f gdm.pre %post %tmpfiles_create gdm.conf @@ -362,6 +363,7 @@ dconf update %ghost %{_sysconfdir}/alternatives/default-displaymanager %{_udevrulesdir}/61-gdm.rules %{_tmpfilesdir}/gdm.conf +%{_sysusersdir}/gdm.conf %dir %{_prefix}/lib/systemd/logind.conf.d %{_prefix}/lib/systemd/logind.conf.d/reserveVT.conf %dir %{_userunitdir}/gnome-session@gnome-login.target.d diff --git a/gdm.sysusers b/gdm.sysusers new file mode 100644 index 0000000..6840558 --- /dev/null +++ b/gdm.sysusers @@ -0,0 +1,3 @@ +# Type Name ID GECOS Home +u gdm - Gnome Display Manager daemon /var/lib/gdm +m gdm video From 5ec7ecea3c96237344147d195cb5320b24daea13797c96b1e376649aa468b982 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Jan 2021 11:05:05 +0000 Subject: [PATCH 3/4] Revert back to 3.38.2 - let's confirm this really passing QA OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=471 --- gdm-3.38.2.1.tar.xz | 3 --- gdm-3.38.2.tar.xz | 3 +++ gdm.changes | 7 ------- gdm.spec | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 gdm-3.38.2.1.tar.xz create mode 100644 gdm-3.38.2.tar.xz diff --git a/gdm-3.38.2.1.tar.xz b/gdm-3.38.2.1.tar.xz deleted file mode 100644 index 3e87356..0000000 --- a/gdm-3.38.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da -size 789036 diff --git a/gdm-3.38.2.tar.xz b/gdm-3.38.2.tar.xz new file mode 100644 index 0000000..8b7f1c8 --- /dev/null +++ b/gdm-3.38.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a26666c3dd4bb6a545decbbe0678439b2b227ee63b67eebd2d7910761e53cc +size 787024 diff --git a/gdm.changes b/gdm.changes index 01cc9f1..e8b5d8a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -3,13 +3,6 @@ Thu Jan 21 12:57:09 UTC 2021 - Thorsten Kukuk - Use sysusers config file to generate gdm user -------------------------------------------------------------------- -Wed Dec 16 09:43:01 UTC 2020 - Bjørn Lie - -- Update to version 3.38.2.1: - + Address autologin unlock bug issue (CVE-2020-27837). - + Updated translations. - ------------------------------------------------------------------- Wed Nov 4 10:05:13 UTC 2020 - Dominique Leuenberger diff --git a/gdm.spec b/gdm.spec index 8852846..25d0497 100644 --- a/gdm.spec +++ b/gdm.spec @@ -21,7 +21,7 @@ %define enable_split_authentication 0 Name: gdm -Version: 3.38.2.1 +Version: 3.38.2 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0-or-later From b780cb64ffda7cc8634e7dc647f8a8ef72dc5cf197ec7807f16c37eb1c02dfc7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 29 Jan 2021 09:48:49 +0000 Subject: [PATCH 4/4] - Fixup gdm.sysyers: gecos field needs to be quoted for multi-word value. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=472 --- gdm.changes | 6 ++++++ gdm.sysusers | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdm.changes b/gdm.changes index e8b5d8a..dbcfd40 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 29 09:46:20 UTC 2021 - Dominique Leuenberger + +- Fixup gdm.sysyers: gecos field needs to be quoted for multi-word + value. + ------------------------------------------------------------------- Thu Jan 21 12:57:09 UTC 2021 - Thorsten Kukuk diff --git a/gdm.sysusers b/gdm.sysusers index 6840558..a6dbd04 100644 --- a/gdm.sysusers +++ b/gdm.sysusers @@ -1,3 +1,3 @@ # Type Name ID GECOS Home -u gdm - Gnome Display Manager daemon /var/lib/gdm +u gdm - "Gnome Display Manager daemon" /var/lib/gdm m gdm video