From a412447cb71fdf7e562e289f2aa1d4c37f92b04c Mon Sep 17 00:00:00 2001 From: weijin-deng Date: Wed, 23 Jun 2021 14:12:11 +0800 Subject: [PATCH] Add Omitted Sources1 and Sources5 Add Omitted patches Patch0 and Patch1 Recover Patch2 --- ...tup-being-disabled-by-distro-install.patch | 66 +++++++++++++++++++ ...ystem-dconf-databases-to-gdm-profile.patch | 23 +++++++ default.pa-for-gdm | 10 +++ gdm-should-recover-automatically.patch | 24 +++++++ gdm.spec | 15 ++++- org.gnome.login-screen.gschema.override | 3 + 6 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 0001-Honor-initial-setup-being-disabled-by-distro-install.patch create mode 100644 0001-data-add-system-dconf-databases-to-gdm-profile.patch create mode 100644 default.pa-for-gdm create mode 100644 gdm-should-recover-automatically.patch create mode 100644 org.gnome.login-screen.gschema.override diff --git a/0001-Honor-initial-setup-being-disabled-by-distro-install.patch b/0001-Honor-initial-setup-being-disabled-by-distro-install.patch new file mode 100644 index 0000000..f75609b --- /dev/null +++ b/0001-Honor-initial-setup-being-disabled-by-distro-install.patch @@ -0,0 +1,66 @@ +From 42b18e4c84d470f33cdec5fc1f481cb25c25cf0d Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Mon, 23 Jan 2017 20:19:51 +0100 +Subject: [PATCH] Honor initial setup being disabled by distro installer + +Sysadmins might want to disable any kind of initial setup for their +users, perhaps because they pre-configure their environments. We +already provide a configuration file option for this but distro +installers might have their own way of requesting this. + +At least the anaconda installer provides an option to skip any kind +post-install setup tools so, for now we're only adding support for +that but more might be added in the future. + +https://bugzilla.gnome.org/show_bug.cgi?id=777708 +--- + daemon/gdm-display.c | 29 +++++++++++++++++++++++++++++ + 1 file changed + +diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c +index 687e7da..3785a1b 100644 +--- a/daemon/gdm-display.c ++++ b/daemon/gdm-display.c +@@ -1618,6 +1618,31 @@ kernel_cmdline_initial_setup_force_state (gboolean *force_state) + return TRUE; + } + ++static gboolean ++initial_setup_disabled_by_anaconda (void) ++{ ++ GKeyFile *key_file; ++ const gchar *file_name = SYSCONFDIR "/sysconfig/anaconda"; ++ gboolean disabled = FALSE; ++ GError *error = NULL; ++ ++ key_file = g_key_file_new (); ++ if (!g_key_file_load_from_file (key_file, file_name, G_KEY_FILE_NONE, &error)) { ++ if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT) && ++ !g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND)) { ++ g_warning ("Could not read %s: %s", file_name, error->message); ++ } ++ g_error_free (error); ++ goto out; ++ } ++ ++ disabled = g_key_file_get_boolean (key_file, "General", ++ "post_install_tools_disabled", NULL); ++ out: ++ g_key_file_unref (key_file); ++ return disabled; ++} ++ + static gboolean + wants_initial_setup (GdmDisplay *self) + { +@@ -1661,6 +1686,10 @@ wants_initial_setup (GdmDisplay *self) + return FALSE; + } + ++ if (initial_setup_disabled_by_anaconda ()) { ++ return FALSE; ++ } ++ + return enabled; + } + diff --git a/0001-data-add-system-dconf-databases-to-gdm-profile.patch b/0001-data-add-system-dconf-databases-to-gdm-profile.patch new file mode 100644 index 0000000..f93b94b --- /dev/null +++ b/0001-data-add-system-dconf-databases-to-gdm-profile.patch @@ -0,0 +1,23 @@ +From 2163c715758a87bc1fa629c692b6e47ed74dcae8 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Wed, 31 Jul 2013 17:32:55 -0400 +Subject: [PATCH] data: add system dconf databases to gdm profile + +This way system settings can affect the login screen. +--- + data/dconf/gdm.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/data/dconf/gdm.in b/data/dconf/gdm.in +index 4d8bf1748..510ca311a 100644 +--- a/data/dconf/gdm.in ++++ b/data/dconf/gdm.in +@@ -1,2 +1,5 @@ + user-db:user ++system-db:local ++system-db:site ++system-db:distro + file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults +-- +2.25.1 + diff --git a/default.pa-for-gdm b/default.pa-for-gdm new file mode 100644 index 0000000..d633aee --- /dev/null +++ b/default.pa-for-gdm @@ -0,0 +1,10 @@ +load-module module-device-restore +load-module module-card-restore +load-module module-udev-detect +load-module module-native-protocol-unix +load-module module-default-device-restore +load-module module-rescue-streams +load-module module-always-sink +load-module module-intended-roles +load-module module-suspend-on-idle +load-module module-position-event-sounds diff --git a/gdm-should-recover-automatically.patch b/gdm-should-recover-automatically.patch new file mode 100644 index 0000000..974af8b --- /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 365c161..d9bc4f9 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,11 +1,17 @@ Name: gdm Epoch: 1 Version: 3.38.2.1 -Release: 1 +Release: 2 Summary: A graphical display manager License: GPLv2+ URL: https://wiki.gnome.org/Projects/GDM Source0: http://download.gnome.org/sources/gdm/3.38/gdm-%{version}.tar.xz +Source1: org.gnome.login-screen.gschema.override +Source5: default.pa-for-gdm + +Patch0: 0001-data-add-system-dconf-databases-to-gdm-profile.patch +Patch1: 0001-Honor-initial-setup-being-disabled-by-distro-install.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 @@ -53,7 +59,7 @@ The gdm-devel package contains header files and others for building applications that use GDM. %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 %build %meson -Dpam-prefix=%{_sysconfdir} \ @@ -176,6 +182,11 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jun 23 2021 weijin deng - 3.38.2-2 +- Add Omitted Sources1 and Sources5 +- Add Omitted patches Patch0 and Patch1 +- Recover Patch2 + * Mon May 24 2021 weijin deng - 3.38.2-1 - Upgrade to 3.38.2 - Update Version, Release, Source0, BuildRequires diff --git a/org.gnome.login-screen.gschema.override b/org.gnome.login-screen.gschema.override new file mode 100644 index 0000000..d018c5e --- /dev/null +++ b/org.gnome.login-screen.gschema.override @@ -0,0 +1,3 @@ +[org.gnome.login-screen] +logo='/usr/share/pixmaps/fedora-gdm-logo.png' +enable-smartcard-authentication=false -- Gitee