Accepting request 1207137 from network:ldap
Please stage together with: #1206308 #1206309 OBS-URL: https://build.opensuse.org/request/show/1207137 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sssd?expand=0&rev=140
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
d86b0e6701
@ -1,4 +1,4 @@
|
||||
mtime: 1721128452
|
||||
commit: 747483e6173b31472d61e166a581bb9c9034cf6a690a8bc476176dd5b5befaba
|
||||
mtime: 1727778278
|
||||
commit: 3a2bee3ebf6e89af81880d7927649117d782a0ba9f98f06213bb4744f044b7fb
|
||||
url: https://src.opensuse.org/jengelh/sssd
|
||||
revision: master
|
||||
|
||||
BIN
build.specials.obscpio
(Stored with Git LFS)
BIN
build.specials.obscpio
(Stored with Git LFS)
Binary file not shown.
15
sssd.changes
15
sssd.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
25
sssd.spec
25
sssd.spec
@ -86,6 +86,13 @@ BuildRequires: pkgconfig(talloc)
|
||||
BuildRequires: pkgconfig(tdb) >= 1.1.3
|
||||
BuildRequires: pkgconfig(tevent)
|
||||
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}
|
||||
Requires: sssd-ldap = %version-%release
|
||||
Requires(postun): pam-config
|
||||
@ -104,7 +111,7 @@ Obsoletes: sssd-common < %version-%release
|
||||
%define ldbdir %(pkg-config ldb --variable=modulesdir)
|
||||
|
||||
# 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)
|
||||
# * installing SSSD should NOT switch to SSSD plugin (priority 10)
|
||||
%define cifs_idmap_plugin %_sysconfdir/cifs-utils/idmap-plugin
|
||||
@ -420,7 +427,7 @@ perl -i -lpe 's{%_bindir/python\b}{%_bindir/python3}' src/tools/sss_obfuscate
|
||||
b="%buildroot"
|
||||
|
||||
# Copy some defaults
|
||||
%if %{?_distconfdir:1}
|
||||
%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
|
||||
@ -451,8 +458,11 @@ find "$b" -type f -name "*.la" -print -delete
|
||||
mkdir -pv %buildroot/%_sysconfdir/alternatives %buildroot/%_sysconfdir/cifs-utils
|
||||
ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
|
||||
%python3_fix_shebang
|
||||
%if 0%{?suse_version} >= 1600
|
||||
%if 0%{?suse_version} > 1600
|
||||
%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
|
||||
|
||||
%check
|
||||
@ -461,7 +471,7 @@ ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
|
||||
|
||||
%pre
|
||||
%service_add_pre sssd.service
|
||||
%if %{?_distconfdir:1}
|
||||
%if "%{?_distconfdir}" != ""
|
||||
# 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" || :
|
||||
@ -554,7 +564,7 @@ touch /run/systemd/rpm/sssd-was-active
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
%if %{?_distconfdir:1}
|
||||
%if "%{?_distconfdir}" != ""
|
||||
# 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" || :
|
||||
@ -668,7 +678,7 @@ fi
|
||||
%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}
|
||||
%if "%{?_distconfdir}" != ""
|
||||
%dir %_distconfdir/sssd/
|
||||
%%dir %_distconfdir/sssd/conf.d
|
||||
%config(noreplace) %_distconfdir/sssd/sssd.conf
|
||||
@ -822,7 +832,8 @@ fi
|
||||
%python3_sitelib/sssd/
|
||||
|
||||
%files winbind-idmap
|
||||
%_libdir/samba/
|
||||
%dir %_libdir/samba/
|
||||
%_libdir/samba/idmap/
|
||||
%_mandir/man8/idmap_sss.8*
|
||||
|
||||
%files -n libipa_hbac0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user