From 3ea8aed7a3e356affa0c925872e365e005db76a4 Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Fri, 18 Dec 2020 15:50:19 +0800 Subject: [PATCH] Gdm should recover automatically when killed --- gdm-should-recover-automatically.patch | 24 ++++++++++++++++++++++++ gdm.spec | 10 +++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 gdm-should-recover-automatically.patch diff --git a/gdm-should-recover-automatically.patch b/gdm-should-recover-automatically.patch new file mode 100644 index 0000000..0d58831 --- /dev/null +++ b/gdm-should-recover-automatically.patch @@ -0,0 +1,24 @@ +From 10f8add3b6f75113676812ef52e32823f91afb44 Mon Sep 17 00:00:00 2001 +From: si-gui <245140120@qq.com> +Date: Fri, 18 Dec 2020 15:18:09 +0800 +Subject: [PATCH] gdm should recover automatically + +--- + data/gdm.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/gdm.service.in b/data/gdm.service.in +index 72201c1..d2892b8 100644 +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -20,6 +20,7 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service + OnFailure=plymouth-quit.service + + [Service] ++ExecStartPre=/bin/sh -c "systemctl stop session-c*.scope" + ExecStart=@sbindir@/gdm + KillMode=mixed + Restart=always +-- +2.23.0 + diff --git a/gdm.spec b/gdm.spec index 0e2de67..6504eff 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,13 +1,14 @@ Name: gdm Epoch: 1 Version: 3.30.1 -Release: 8 +Release: 9 Summary: A graphical display manager License: GPLv2+ URL: https://wiki.gnome.org/Projects/GDM Source0: http://download.gnome.org/sources/gdm/3.30/gdm-%{version}.tar.xz Patch0: 9000-add-openeuler-pam-config.patch -Patch1: display-Use-autoptr-to-handle-errors-in-look-for-exi.patch +Patch1: display-Use-autoptr-to-handle-errors-in-look-for-exi.patch +Patch2: gdm-should-recover-automatically.patch BuildRequires: pam-devel >= 0:0.99.8.1-11 desktop-file-utils >= 0.2.90 BuildRequires: libtool automake autoconf libattr-devel gettext-devel libdmx-devel @@ -162,7 +163,10 @@ fi %{_libdir}/pkgconfig/*.pc %changelog -* Tue Jan 14 2020 openEuler Buildteam - 1:3.30.1-8 +* Fri Dec 18 2020 Guoshuai Sun - 1:3.30.1-9 +- Gdm should recover automatically when killed + +* Thu Nov 19 2020 openEuler Buildteam - 1:3.30.1-8 - fix CVE-2020-16125 * Tue Jan 14 2020 openEuler Buildteam - 1:3.30.1-7 -- Gitee