From 93a901cd4e090c32b80476c5a53b27d74876b994 Mon Sep 17 00:00:00 2001 From: wangyoukang Date: Mon, 24 Apr 2023 16:26:37 +0800 Subject: [PATCH] fix gdm.service may kill user service during startup Signed-off-by: wangyoukang --- gdm-should-recover-automatically.patch | 24 ------------------------ gdm.spec | 14 ++++++++------ 2 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 gdm-should-recover-automatically.patch diff --git a/gdm-should-recover-automatically.patch b/gdm-should-recover-automatically.patch deleted file mode 100644 index 0d58831..0000000 --- a/gdm-should-recover-automatically.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 ed1dc97..6cae42f 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,18 +1,17 @@ Name: gdm Epoch: 1 Version: 3.30.1 -Release: 10 +Release: 11 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 -Patch2: gdm-should-recover-automatically.patch -Patch3: CVE-2019-3825-1.patch -Patch4: CVE-2019-3825-2.patch -Patch5: CVE-2019-3825-3.patch -Patch6: CVE-2019-3825-4.patch +Patch2: CVE-2019-3825-1.patch +Patch3: CVE-2019-3825-2.patch +Patch4: CVE-2019-3825-3.patch +Patch5: CVE-2019-3825-4.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 @@ -167,6 +166,9 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Mon Apr 24 2023 wangyoukang - 1:3.30.1-11 +- fix gdm.service may kill user service during startup + * Fri Feb 5 2021 wangxiao - 1:3.30.1-10 - fix CVE-2019-3825 -- Gitee