SHA256
1
0
forked from jengelh/sssd

Accepting request 1046555 from network:ldap

- Migration of PAM settings to /usr/lib/pam.d. (forwarded request 1046514 from schubi2)

OBS-URL: https://build.opensuse.org/request/show/1046555
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sssd?expand=0&rev=125
This commit is contained in:
Dominique Leuenberger 2023-01-04 17:10:28 +00:00 committed by Git OBS Bridge
commit 70d566c15c
2 changed files with 17 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 3 12:01:41 UTC 2023 - Stefan Schubert <schubi@suse.com>
- Migration of PAM settings to /usr/lib/pam.d.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 21 19:29:45 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Wed Dec 21 19:29:45 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package sssd # spec file for package sssd
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -408,6 +408,8 @@ install -d "$b/%_unitdir"
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
install -d "$b/%_distconfdir/logrotate.d" install -d "$b/%_distconfdir/logrotate.d"
install -m644 src/examples/logrotate "$b/%_distconfdir/logrotate.d/sssd" install -m644 src/examples/logrotate "$b/%_distconfdir/logrotate.d/sssd"
install -d "$b/%_pam_vendordir"
mv "$b/%_pam_confdir/sssd-shadowutils" "$b/%_pam_vendordir"
%else %else
install -d "$b/%_sysconfdir/logrotate.d" install -d "$b/%_sysconfdir/logrotate.d"
install -m644 src/examples/logrotate "$b/%_sysconfdir/logrotate.d/sssd" install -m644 src/examples/logrotate "$b/%_sysconfdir/logrotate.d/sssd"
@ -428,6 +430,12 @@ ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
%pre %pre
%service_add_pre sssd.service %service_add_pre sssd.service
%if 0%{?suse_version} > 1500
# Prepare for migration to /usr/etc; save any old .rpmsave
for i in pam.d/sssd-shadowutils ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -497,7 +505,7 @@ done
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
%posttrans %posttrans
# Migration to /usr/etc, restore just created .rpmsave # Migration to /usr/etc, restore just created .rpmsave
for i in logrotate.d/sssd ; do for i in logrotate.d/sssd pam.d/sssd-shadowutils ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done done
%endif %endif
@ -595,11 +603,12 @@ done
%config(noreplace) %_sysconfdir/sssd/sssd.conf %config(noreplace) %_sysconfdir/sssd/sssd.conf
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
%_distconfdir/logrotate.d/sssd %_distconfdir/logrotate.d/sssd
%_pam_vendordir/sssd-shadowutils
%else %else
%config(noreplace) %_sysconfdir/logrotate.d/sssd %config(noreplace) %_sysconfdir/logrotate.d/sssd
%config(noreplace) %_pam_confdir/sssd-shadowutils
%endif %endif
%dir %_sysconfdir/sssd/conf.d %dir %_sysconfdir/sssd/conf.d
%config(noreplace) %_pam_confdir/sssd-shadowutils
%dir %_datadir/%name/ %dir %_datadir/%name/
%_datadir/%name/cfg_rules.ini %_datadir/%name/cfg_rules.ini
%_datadir/%name/sssd.api.conf %_datadir/%name/sssd.api.conf