Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sssd for openSUSE:Factory checked in at 2024-07-17 15:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sssd (Old) and /work/SRC/openSUSE:Factory/.sssd.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sssd" Wed Jul 17 15:14:17 2024 rev:139 rq:1187905 version:2.9.5 Changes: -------- --- /work/SRC/openSUSE:Factory/sssd/sssd.changes 2024-05-17 20:05:25.803961791 +0200 +++ /work/SRC/openSUSE:Factory/.sssd.new.17339/sssd.changes 2024-07-17 15:14:51.433422042 +0200 @@ -1,0 +2,7 @@ +Thu Jul 11 09:41:21 UTC 2024 - Samuel Cabrero <[email protected]> + +- Revert the change dropping the default configuration file. If + /usr/etc exists will be installed there, otherwise in /etc. + (bsc#1226157); + +------------------------------------------------------------------- New: ---- _scmsync.obsinfo build.specials.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sssd.spec ++++++ --- /var/tmp/diff_new_pack.kUpWyr/_old 2024-07-17 15:14:52.261452365 +0200 +++ /var/tmp/diff_new_pack.kUpWyr/_new 2024-07-17 15:14:52.261452365 +0200 @@ -420,6 +420,13 @@ b="%buildroot" # Copy some defaults +%if %{?_distconfdir:1} +install -D -p -m 0600 src/examples/sssd-example.conf "$b/%_distconfdir/sssd/sssd.conf" +install -d -m 0755 "$b/%_distconfdir/sssd/conf.d" +%else +install -D -p -m 0600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf" +install -d -m 0755 "$b/%_sysconfdir/sssd/conf.d" +%endif install -d "$b/%_unitdir" %if 0%{?suse_version} > 1500 install -d "$b/%_distconfdir/logrotate.d" @@ -444,8 +451,8 @@ mkdir -pv %buildroot/%_sysconfdir/alternatives %buildroot/%_sysconfdir/cifs-utils ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin %python3_fix_shebang -%if %{suse_version} >= 1600 -%python3_fix_shebang_path %{buildroot}/%{_libexecdir}/%{name}/ +%if 0%{?suse_version} >= 1600 +%python3_fix_shebang_path %buildroot/%_libexecdir/%name/ %endif %check @@ -454,10 +461,12 @@ %pre %service_add_pre sssd.service +%if %{?_distconfdir:1} # Prepare for migration to /usr/etc; save any old .rpmsave for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do - test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: + test -f "%_sysconfdir/$i.rpmsave" && mv -v "%_sysconfdir/$i.rpmsave" "%_sysconfdir/$i.rpmsave.old" || : done +%endif %post /sbin/ldconfig @@ -545,10 +554,12 @@ fi %posttrans +%if %{?_distconfdir:1} # Migration to /usr/etc, restore just created .rpmsave for i in sssd/sssd.conf 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 +%endif # Migrate sssd.service from sssd-common to sssd if [ -e /run/systemd/rpm/sssd-was-enabled ]; then systemctl is-enabled sssd.service > /dev/null @@ -657,6 +668,15 @@ %attr(755,root,root) %dir %sssdstatedir/mc/ %attr(700,root,root) %dir %sssdstatedir/keytabs/ %attr(750,root,root) %dir %_localstatedir/log/%name/ +%if %{?_distconfdir:1} +%dir %_distconfdir/sssd/ +%%dir %_distconfdir/sssd/conf.d +%config(noreplace) %_distconfdir/sssd/sssd.conf +%else +%dir %_sysconfdir/sssd/ +%%dir %_sysconfdir/sssd/conf.d +%config(noreplace) %_sysconfdir/sssd/sssd.conf +%endif %if 0%{?suse_version} > 1500 %_distconfdir/logrotate.d/sssd %_pam_vendordir/sssd-shadowutils ++++++ _scmsync.obsinfo ++++++ mtime: 1721128452 commit: 747483e6173b31472d61e166a581bb9c9034cf6a690a8bc476176dd5b5befaba url: https://src.opensuse.org/jengelh/sssd revision: master
