dirkmueller/sssd
SHA256
1
0
Fork 0
forked from pool/sssd
Code Pull Requests Activity

Accepting request 1127298 from home:scabrero:jsc-ped6714

Browse Source 
- /usr/etc migration, restore /etc/sssd/sssd.conf.rpmsave after
  update (bsc#1216865)
- Do not install the KRB5 IDP plugin, it is useless without the
  OIDC child
- Drop no longer valid --without-secrets configure switch

OBS-URL: https://build.opensuse.org/request/show/1127298
OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=300
This commit is contained in:
Jan Engelhardt 2023-11-17 14:14:26 +00:00 committed by Git OBS Bridge
parent e40d980a52
commit 523577d0c6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sssd.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Nov 17 12:30:33 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
- /usr/etc migration, restore /etc/sssd/sssd.conf.rpmsave after
update (bsc#1216865)
- Do not install the KRB5 IDP plugin, it is useless without the
OIDC child
- Drop no longer valid --without-secrets configure switch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 13 12:48:09 UTC 2023 - Jan Engelhardt <jengelh@inai.de> Mon Nov 13 12:48:09 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

19
sssd.spec
View File

@ -369,7 +369,6 @@ autoreconf -fiv
--with-subid \ --with-subid \
--with-os=suse \ --with-os=suse \
--disable-ldb-version-check \ --disable-ldb-version-check \
--without-secrets \
--without-python2-bindings \ --without-python2-bindings \
--without-oidc-child --without-oidc-child
%make_build all %make_build all
@ -407,14 +406,10 @@ 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 # Prepare for migration to /usr/etc; save any old .rpmsave
for i in pam.d/sssd-shadowutils logrotate.d/sssd ; do for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do
if [ -f "%_sysconfdir/$i.rpmsave" ]; then test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
mv -v "%_sysconfdir/$i.rpmsave" "%_sysconfdir/$i.rpmsave.old" || :
fi
done done
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -484,15 +479,11 @@ fi
%postun kcm %postun kcm
%service_del_postun sssd-kcm.service sssd-kcm.socket %service_del_postun sssd-kcm.service sssd-kcm.socket
%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 pam.d/sssd-shadowutils ; do for i in sssd/sssd.conf logrotate.d/sssd pam.d/sssd-shadowutils ; do
if [ -f "%_sysconfdir/$i.rpmsave" ]; then test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
mv -v "%_sysconfdir/$i.rpmsave" "%_sysconfdir/$i.rpmsave.old" || :
fi
done done
%endif
%files -f sssd.lang %files -f sssd.lang
%license COPYING %license COPYING
@ -658,7 +649,7 @@ done
%dir %_libdir/%name/ %dir %_libdir/%name/
%_libdir/%name/libsss_krb5.so %_libdir/%name/libsss_krb5.so
%dir %_datadir/%name/ %dir %_datadir/%name/
%_datadir/%name/krb5-snippets/ %exclude %_datadir/%name/krb5-snippets/
%dir %_datadir/%name/sssd.api.d/ %dir %_datadir/%name/sssd.api.d/
%_datadir/%name/sssd.api.d/sssd-krb5.conf %_datadir/%name/sssd.api.d/sssd-krb5.conf
%dir %_mandir/??/ %dir %_mandir/??/