From 66c0a301378fa4a5057b953d0ec23204821cc30f9619be2b876fb60d705d7201 Mon Sep 17 00:00:00 2001 From: Yifan Jiang Date: Sat, 28 Jan 2023 02:49:03 +0000 Subject: [PATCH] Accepting request 1058728 from home:schubi2:pam_usr_etc - Migration of PAM settings to /usr/lib/pam.d. OBS-URL: https://build.opensuse.org/request/show/1058728 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=108 --- xrdp.changes | 5 +++++ xrdp.spec | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/xrdp.changes b/xrdp.changes index 12bafd6..26e953d 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 16 14:49:33 UTC 2023 - Stefan Schubert + +- Migration of PAM settings to /usr/lib/pam.d. + ------------------------------------------------------------------- Tue Jan 10 02:08:45 UTC 2023 - Daike Yu diff --git a/xrdp.spec b/xrdp.spec index eae6218..a121a37 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -172,11 +172,28 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp-sesman # use certification file created at the post phase rm -f %{buildroot}/%{_sysconfdir}/xrdp/{cert,key}.pem +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_pam_vendordir} +mv %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman %{buildroot}%{_pam_vendordir} +%endif + %fdupes -s %{buildroot} %pre %service_add_pre xrdp-sesman.service %service_add_pre xrdp.service +%if 0%{?suse_version} > 1500 +# Prepare for migration to /usr/lib; save any old .rpmsave +for i in pam.d/xrdp-sesam ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: +done + +%posttrans +# Migration to /usr/lib, restore just created .rpmsave +for i in pam.d/xrdp-sesman ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: +done +%endif %post /sbin/ldconfig @@ -215,7 +232,11 @@ exit 0 %dir %{_datadir}/xrdp %dir %{_libdir}/xrdp +%if 0%{?suse_version} > 1500 +%{_pam_vendordir}/xrdp-sesman +%else %config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman +%endif %license COPYING %{_bindir}/xrdp* %{_datadir}/xrdp/*