Compare commits
10 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
d86b0e6701 | ||
|
fbb9662fbc | ||
|
d7d2d5b065 | ||
|
4b55e8bec3 | ||
2a837063b4 | |||
|
4ba4938fe8 | ||
|
3fd3832981 | ||
75c9ecde1e | |||
8ef9d54958 | |||
fd5a3e89d6 |
4
_scmsync.obsinfo
Normal file
4
_scmsync.obsinfo
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
mtime: 1727778278
|
||||||
|
commit: 3a2bee3ebf6e89af81880d7927649117d782a0ba9f98f06213bb4744f044b7fb
|
||||||
|
url: https://src.opensuse.org/jengelh/sssd
|
||||||
|
revision: master
|
BIN
build.specials.obscpio
(Stored with Git LFS)
Normal file
BIN
build.specials.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
22
sssd.changes
22
sssd.changes
@ -1,3 +1,25 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 1 10:15:07 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Update filelists involving memberof.so and idmap/sss.so to
|
||||||
|
avoid gobbling up one file into multiple sssd subpackages.
|
||||||
|
(Between samba-4.20 and 4.21, %ldbdir changes from
|
||||||
|
/usr/lib64/ldb2/modules/ldb to /usr/lib64/samba/ldb, so now
|
||||||
|
`%_libdir/samba` is a bit too broad.)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 17 09:19:20 UTC 2024 - Samuel Cabrero <scabrero@suse.de>
|
||||||
|
|
||||||
|
- Fix spec file for openSUSE ALP and SUSE SLFO, where the
|
||||||
|
python3_fix_shebang_path RPM macro is not available
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 11 09:41:21 UTC 2024 - Samuel Cabrero <scabrero@suse.de>
|
||||||
|
|
||||||
|
- Revert the change dropping the default configuration file. If
|
||||||
|
/usr/etc exists will be installed there, otherwise in /etc.
|
||||||
|
(bsc#1226157);
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 16 12:13:02 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
Thu May 16 12:13:02 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
43
sssd.spec
43
sssd.spec
@ -86,6 +86,13 @@ BuildRequires: pkgconfig(talloc)
|
|||||||
BuildRequires: pkgconfig(tdb) >= 1.1.3
|
BuildRequires: pkgconfig(tdb) >= 1.1.3
|
||||||
BuildRequires: pkgconfig(tevent)
|
BuildRequires: pkgconfig(tevent)
|
||||||
BuildRequires: pkgconfig(uuid)
|
BuildRequires: pkgconfig(uuid)
|
||||||
|
%if 0%{?suse_version} && 0%{?suse_version} < 1600
|
||||||
|
# samba-client-devel pulls samba-client-libs pulls libldap-2_4-2 wants libldap-data(-2.4);
|
||||||
|
# this conflicts with
|
||||||
|
# openldap2-devel pulls libldap2 wants libldap-data(-2.6)
|
||||||
|
# Package contains just config files, not needed for build.
|
||||||
|
#!BuildIgnore: libldap-data
|
||||||
|
%endif
|
||||||
%{?systemd_ordering}
|
%{?systemd_ordering}
|
||||||
Requires: sssd-ldap = %version-%release
|
Requires: sssd-ldap = %version-%release
|
||||||
Requires(postun): pam-config
|
Requires(postun): pam-config
|
||||||
@ -104,7 +111,7 @@ Obsoletes: sssd-common < %version-%release
|
|||||||
%define ldbdir %(pkg-config ldb --variable=modulesdir)
|
%define ldbdir %(pkg-config ldb --variable=modulesdir)
|
||||||
|
|
||||||
# Both SSSD and cifs-utils provide an idmap plugin for cifs.ko
|
# Both SSSD and cifs-utils provide an idmap plugin for cifs.ko
|
||||||
# %_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins
|
# %%_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins
|
||||||
# * cifs-utils one is the default (priority 20)
|
# * cifs-utils one is the default (priority 20)
|
||||||
# * installing SSSD should NOT switch to SSSD plugin (priority 10)
|
# * installing SSSD should NOT switch to SSSD plugin (priority 10)
|
||||||
%define cifs_idmap_plugin %_sysconfdir/cifs-utils/idmap-plugin
|
%define cifs_idmap_plugin %_sysconfdir/cifs-utils/idmap-plugin
|
||||||
@ -420,6 +427,13 @@ perl -i -lpe 's{%_bindir/python\b}{%_bindir/python3}' src/tools/sss_obfuscate
|
|||||||
b="%buildroot"
|
b="%buildroot"
|
||||||
|
|
||||||
# Copy some defaults
|
# Copy some defaults
|
||||||
|
%if "%{?_distconfdir}" != ""
|
||||||
|
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"
|
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"
|
||||||
@ -444,8 +458,11 @@ find "$b" -type f -name "*.la" -print -delete
|
|||||||
mkdir -pv %buildroot/%_sysconfdir/alternatives %buildroot/%_sysconfdir/cifs-utils
|
mkdir -pv %buildroot/%_sysconfdir/alternatives %buildroot/%_sysconfdir/cifs-utils
|
||||||
ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
|
ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
|
||||||
%python3_fix_shebang
|
%python3_fix_shebang
|
||||||
%if %{suse_version} >= 1600
|
%if 0%{?suse_version} > 1600
|
||||||
%python3_fix_shebang_path %{buildroot}/%{_libexecdir}/%{name}/
|
%python3_fix_shebang_path %buildroot/%_libexecdir/%name/
|
||||||
|
%elif 0%{?suse_version} == 1600
|
||||||
|
# python3_fix_shebang_path macro does not exist in < 1600, was added in python-rom-macros 20231204
|
||||||
|
sed -i '1s@#!.*python.*@#!%{_bindir}/python3.11@' %{buildroot}/%{_libexecdir}/%{name}/sss_analyze
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -454,10 +471,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 "%{?_distconfdir}" != ""
|
||||||
# Prepare for migration to /usr/etc; save any old .rpmsave
|
# Prepare for migration to /usr/etc; save any old .rpmsave
|
||||||
for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do
|
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
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
@ -545,10 +564,12 @@ touch /run/systemd/rpm/sssd-was-active
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
|
%if "%{?_distconfdir}" != ""
|
||||||
# Migration to /usr/etc, restore just created .rpmsave
|
# Migration to /usr/etc, restore just created .rpmsave
|
||||||
for i in sssd/sssd.conf logrotate.d/sssd pam.d/sssd-shadowutils ; do
|
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
|
done
|
||||||
|
%endif
|
||||||
# Migrate sssd.service from sssd-common to sssd
|
# Migrate sssd.service from sssd-common to sssd
|
||||||
if [ -e /run/systemd/rpm/sssd-was-enabled ]; then
|
if [ -e /run/systemd/rpm/sssd-was-enabled ]; then
|
||||||
systemctl is-enabled sssd.service > /dev/null
|
systemctl is-enabled sssd.service > /dev/null
|
||||||
@ -657,6 +678,15 @@ fi
|
|||||||
%attr(755,root,root) %dir %sssdstatedir/mc/
|
%attr(755,root,root) %dir %sssdstatedir/mc/
|
||||||
%attr(700,root,root) %dir %sssdstatedir/keytabs/
|
%attr(700,root,root) %dir %sssdstatedir/keytabs/
|
||||||
%attr(750,root,root) %dir %_localstatedir/log/%name/
|
%attr(750,root,root) %dir %_localstatedir/log/%name/
|
||||||
|
%if "%{?_distconfdir}" != ""
|
||||||
|
%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
|
%if 0%{?suse_version} > 1500
|
||||||
%_distconfdir/logrotate.d/sssd
|
%_distconfdir/logrotate.d/sssd
|
||||||
%_pam_vendordir/sssd-shadowutils
|
%_pam_vendordir/sssd-shadowutils
|
||||||
@ -802,7 +832,8 @@ fi
|
|||||||
%python3_sitelib/sssd/
|
%python3_sitelib/sssd/
|
||||||
|
|
||||||
%files winbind-idmap
|
%files winbind-idmap
|
||||||
%_libdir/samba/
|
%dir %_libdir/samba/
|
||||||
|
%_libdir/samba/idmap/
|
||||||
%_mandir/man8/idmap_sss.8*
|
%_mandir/man8/idmap_sss.8*
|
||||||
|
|
||||||
%files -n libipa_hbac0
|
%files -n libipa_hbac0
|
||||||
|
Loading…
Reference in New Issue
Block a user