diff --git a/gdm-fingerprint.pamd b/gdm-fingerprint.pamd index e6a2e8f..67c1d31 100644 --- a/gdm-fingerprint.pamd +++ b/gdm-fingerprint.pamd @@ -9,7 +9,7 @@ auth [success=ok default=1] pam_gdm.so auth optional pam_gnome_keyring.so account substack common-account -account include common-account +account include postlogin-account password required pam_deny.so diff --git a/gdm-plymouth-quit-wait.patch b/gdm-plymouth-quit-wait.patch new file mode 100644 index 0000000..338426a --- /dev/null +++ b/gdm-plymouth-quit-wait.patch @@ -0,0 +1,13 @@ +diff --git a/data/meson.build b/data/meson.build +index de8edd6..7a24d30 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -158,7 +158,7 @@ service_config.set('sbindir', gdm_prefix / get_option('sbindir')) + service_config.set('GDM_INITIAL_VT', get_option('initial-vt')) + service_config.set('LANG_CONFIG_FILE', lang_config_file) + if plymouth_dep.found() +- service_config.set('PLYMOUTH_QUIT_SERVICE', 'plymouth-quit.service') ++ service_config.set('PLYMOUTH_QUIT_SERVICE', 'plymouth-quit.service plymouth-quit-wait.service') + else + service_config.set('PLYMOUTH_QUIT_SERVICE', '') + endif diff --git a/gdm.changes b/gdm.changes index c1735b0..b28d7b2 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,8 +1,36 @@ ------------------------------------------------------------------- -Thu Jul 31 08:19:39 UTC 2025 - Max Lin +Fri Dec 12 10:13:12 UTC 2025 - Max Lin -- Create a migrate_to_gdm hook at the pre stage, bsc#1247418 -- Add gdm-rpmlintrc in order to rebuild gdm in Leap 16.0, bsc#1247418 +- Use a particular version number to the forked gdm in Leap 16.0 + +------------------------------------------------------------------- +Mon Sep 1 11:02:31 UTC 2025 - Dominique Leuenberger + +- Move migration marker from /var/tmp to /run/gdm (boo#1249017). + +------------------------------------------------------------------- +Fri Aug 29 10:18:55 UTC 2025 - Dominique Leuenberger + +- Fix syntax error in gdm's %pre script. + +------------------------------------------------------------------- +Tue Aug 6 06:55:48 UTC 2025 - Xiaoguang Wang + +- Add gdm-plymouth-quit-wait.patch: Disable plymouth-quit-wait.service + (bsc#1243439). + +------------------------------------------------------------------- +Tue Aug 5 07:10:40 UTC 2025 - Dominique Leuenberger + +- Ensure migration to gdm.service also happens during upgrade when + gdm is installed first and we thus lose the updte-alternative + link which would be part of tgdm-xdm-integration (boo#1247418). + +------------------------------------------------------------------- +Wed Jul 16 14:53:57 UTC 2025 - Fabian Vogt + +- gdm-fingerprint.pamd: Fix inclusion of common-account instead + of postlogin-account ------------------------------------------------------------------- Wed Jun 18 09:43:19 UTC 2025 - Valentin Lefebvre diff --git a/gdm.spec b/gdm.spec index e5db3b2..3bec623 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ # # spec file for package gdm # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,15 +26,18 @@ %define _config_norepl %config(noreplace) %endif +%define theme_ver +leap +%define pure_ver 48.0 + Name: gdm -Version: 48.0 +Version: 48.0%{theme_ver} Release: 0 Summary: The GNOME Display Manager License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Projects/GDM -Source0: %{name}-%{version}.tar.zst +Source0: %{name}-%{pure_ver}.tar.zst Source1: gdm.pamd Source2: gdm-autologin.pamd Source3: gdm-launch-environment.pamd @@ -75,6 +78,8 @@ Patch6: gdm-initial-setup-hardening.patch Patch7: gdm-settings-utils_rename-variable.patch # PATCH-FIX-UPSTREAM gdm-fix-wrong-path-gdm-config.patch bsc#1232669, glgo#GNOME/gdm!282 alynx.zhou@suse.com -- Add missing slash when gdm-config building dconf database path Patch8: gdm-fix-wrong-path-gdm-config.patch +# PATCH-FIX-UPSTREAM gdm-plymouth-quit-wait.patch bsc#1243439 xwang@suse.com -- Disable plymouth-quit-wait.service +Patch9: gdm-plymouth-quit-wait.patch ### NOTE: Keep please SLE-only patches at bottom (starting on 1000). # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. @@ -249,7 +254,7 @@ running display manager. %lang_package %prep -%autosetup -N +%setup -q -n %{name}-%{pure_ver} ### NON-SLE patches start from 0 to 999 %autopatch -p1 -m 1 -M 999 @@ -361,10 +366,10 @@ install -D -m 644 %{SOURCE20} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/. %meson_test %pre -f gdm.pre -if [ "$(systemctl is-enabled display-manager-legacy)" = "enabled" ]; then - if [ -x /usr/sbin/update-alternatives ]; then +if [ $1 -gt 1 ]; then + if [ "$(systemctl is-enabled display-manager-legacy)" = "enabled" -a -x /usr/sbin/update-alternatives ]; then if [ "$(update-alternatives --query default-displaymanager | awk '/Value:/ {print $2}')" = "/usr/lib/X11/displaymanagers/gdm" ]; then - touch /var/tmp/migrate_to_gdm + touch /run/gdm/migrate_to_gdm fi fi fi @@ -404,11 +409,11 @@ if [ "$(systemctl is-enabled display-manager-legacy)" = "enabled" ]; then # display-manager is currently 'legacy mode' - if migration has already occured # the above command would return 'disabled' if [ -x /usr/sbin/update-alternatives ]; then - if [ "$(update-alternatives --query default-displaymanager | awk '/Value:/ {print $2}')" = "/usr/lib/X11/displaymanagers/gdm" ] || [ -f /var/tmp/migrate_to_gdm ]; then + if [ "$(update-alternatives --query default-displaymanager | awk '/Value:/ {print $2}')" = "/usr/lib/X11/displaymanagers/gdm" ] || [ -f /run/gdm/migrate_to_gdm ]; then # the display-manager started by xdm is currently gdm - let's switch to the native service # this only force-enables gdm whenever xdm was enabled AND it was uses as wrapper to start gdm systemctl enable --force gdm.service - unlink /var/tmp/migrate_to_gdm + unlink /run/gdm/migrate_to_gdm || : fi fi fi