Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked
in at 2020-10-07 14:16:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
and /work/SRC/openSUSE:Factory/.lightdm.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm"
Wed Oct 7 14:16:17 2020 rev:103 rq:838819 version:1.30.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2020-07-15
11:25:05.229600568 +0200
+++ /work/SRC/openSUSE:Factory/.lightdm.new.4249/lightdm.changes
2020-10-07 14:16:19.589382620 +0200
@@ -1,0 +2,20 @@
+Tue Sep 29 09:35:19 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Fixup pam stack a bit more (boo#1176338):
+ + Do not create hardlinks between lightdm pam files and xdm's pam
+ files, but install explicit lightdm pam stack that @includes
+ xdm. This has the advantage that, if an admin creates
+ /etc/pam.d/xdm, we will follow this right away. With the
+ hardlinks, the /usr/etc/pam.d/xdm would still be used, which
+ might not be the expected outcome.
+
+-------------------------------------------------------------------
+Thu Sep 17 12:12:31 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Follow XDM's change of moving the default pam config file to
+ /usr/etc (boo#1176338).
+- Add pre/posttrans scripts to ensure user modified
+ /etc/pam.d/lightdm* survives our move to /usr/etc (and user
+ modification in /etc/pam.d wins over /usr/etc/pam.d).
+
+-------------------------------------------------------------------
New:
----
lightdm-autologin.pam
lightdm.pam
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.L8hsVv/_old 2020-10-07 14:16:20.857383629 +0200
+++ /var/tmp/diff_new_pack.L8hsVv/_new 2020-10-07 14:16:20.861383632 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lightdm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2011 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -41,6 +41,8 @@
Source5: gdmflexiserver
Source6: 50-suse-defaults.conf
Source7: users.conf
+Source8: lightdm.pam
+Source9: lightdm-autologin.pam
# PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch g...@opensuse.org --
Adds support for reading configuration options from
/etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager
Patch0: lightdm-sysconfig-support.patch
# PATCH-FEATURE-OPENSUSE lightdm-xauthlocalhostname-support.patch boo#796230
g...@opensuse.org -- Set XAUTHLOCALHOSTNAME to the hostname for local logins to
avoid issues in the session in case the hostname changes
@@ -218,9 +220,18 @@
# xdm and xdm-np are used instead.
rm %{buildroot}%{_sysconfdir}/pam.d/lightdm \
- %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
-ln -sf %{_sysconfdir}/pam.d/xdm %{buildroot}%{_sysconfdir}/pam.d/lightdm
-ln -sf %{_sysconfdir}/pam.d/xdm-np
%{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
+ %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin \
+ %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
+%if 0%{?suse_version} >= 1550
+ mkdir -p %{buildroot}%{_distconfdir}/pam.d
+ install %{SOURCE8} %{buildroot}%{_distconfdir}/pam.d/lightdm
+ install %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/lightdm-autologin
+ install -Dpm 0644 %{SOURCE3}
%{buildroot}%{_distconfdir}/pam.d/lightdm-greeter
+%else
+ install %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/lightdm
+ install %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
+ install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
+%endif
ln data/lightdm.conf data/lightdm.conf.example
@@ -236,7 +247,6 @@
install -d %{buildroot}%{_localstatedir}/log/lightdm
install -d %{buildroot}%{rundir}/lightdm
-install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
install -Dpm 0644 %{SOURCE4}
%{buildroot}%{_prefix}/lib/X11/displaymanagers/lightdm
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
@@ -253,6 +263,15 @@
%{_sbindir}/groupadd -r lightdm 2> /dev/null || :
%{_sbindir}/useradd -r -g lightdm -s /bin/false -c "LightDM daemon" \
-d %{_localstatedir}/lib/lightdm lightdm 2> /dev/null || :
+for i in pam.d/lightdm pam.d/lightdm-autologin pam.d/lightdm-greeter; do
+ test -f /etc/${i}.rpmsave && mv -v /etc/${i}.rpmsave /etc/${i}.rpmsave.old
||:
+done
+
+%posttrans
+# Migration to /usr/etc.
+for i in pam.d/lightdm pam.d/lightdm-autologin pam.d/lightdm-greeter; do
+ test -f /etc/${i}.rpmsave && mv -v /etc/${i}.rpmsave /etc/${i} ||:
+done
%post
# Special trick: migrate users from lxdm to lightdm
@@ -300,9 +319,15 @@
%dir %{_sysconfdir}/lightdm/
%config(noreplace) %{_sysconfdir}/lightdm/users.conf
%config(noreplace) %{_sysconfdir}/lightdm/keys.conf
+%if 0%{?suse_version} >= 1550
+%{_distconfdir}/pam.d/lightdm
+%{_distconfdir}/pam.d/lightdm-autologin
+%{_distconfdir}/pam.d/lightdm-greeter
+%else
%config %{_sysconfdir}/pam.d/lightdm
%config %{_sysconfdir}/pam.d/lightdm-autologin
%config %{_sysconfdir}/pam.d/lightdm-greeter
+%endif
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%dir %{_prefix}/lib/X11/displaymanagers/
%{_prefix}/lib/X11/displaymanagers/lightdm
++++++ lightdm-autologin.pam ++++++
#%PAM-1.0
auth include xdm-np
account include xdm-np
password include xdm-np
session include xdm-np
++++++ lightdm.pam ++++++
#%PAM-1.0
auth include xdm
account include xdm
password include xdm
session include xdm
