Accepting request 1239477 from network:ldap
- Drop build dependency on ncsd, which has been deprecated (boo#1239262). - Migrate away from update-alternatives, replaced by package conflicts; (bsc#1235789); (bsc#1216739); OBS-URL: https://build.opensuse.org/request/show/1239477 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sssd?expand=0&rev=142
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6a343e865f
@ -1,4 +1,4 @@
|
||||
mtime: 1736538796
|
||||
commit: e9bed7037d80b1a2f8f6599da3e1d34aee9e5b250cf5642ba8f8e1c6ea438517
|
||||
mtime: 1737540774
|
||||
commit: 24b0354b14a71a7f013d2f8aed5051f5418b44f1879804a1f4fd45fd4d790c6e
|
||||
url: https://src.opensuse.org/jengelh/sssd
|
||||
revision: master
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c125f3492f8f3631e79acbaf633c871c2e3afe7c0e9ce5e0da888e0ba4cbd104
|
||||
oid sha256:c06fc81ad2d5d68d2f6ad068570e2430ae05ca786714d5abdfb7df9db9fc5d40
|
||||
size 256
|
||||
|
||||
12
sssd.changes
12
sssd.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 22 09:21:43 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop build dependency on ncsd, which has been deprecated
|
||||
(boo#1239262).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 16:33:00 UTC 2025 - Samuel Cabrero <scabrero@suse.de>
|
||||
|
||||
- Migrate away from update-alternatives, replaced by package
|
||||
conflicts; (bsc#1235789); (bsc#1216739);
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 10 20:17:10 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
55
sssd.spec
55
sssd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package sssd
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -50,7 +50,6 @@ BuildRequires: libunistring-devel
|
||||
BuildRequires: libxml2-tools
|
||||
BuildRequires: libxslt-tools
|
||||
BuildRequires: libopenssl-3-devel
|
||||
BuildRequires: nscd
|
||||
BuildRequires: nss_wrapper
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: pam-devel
|
||||
@ -130,16 +129,8 @@ Obsoletes: sssd-common < %version-%release
|
||||
%define permissions_path %_sysconfdir/permissions.d/
|
||||
%endif
|
||||
|
||||
# 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
|
||||
# * 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
|
||||
%define cifs_idmap_lib %_libdir/cifs-utils/cifs_idmap_sss.so
|
||||
%define cifs_idmap_name cifs-idmap-plugin
|
||||
%define cifs_idmap_priority 10
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
|
||||
%description
|
||||
A set of daemons to manage access to remote directories and
|
||||
@ -253,6 +244,23 @@ Group: System/Libraries
|
||||
The idmap_sss module provides a way for Winbind to call SSSD to map
|
||||
UIDs/GIDs and SIDs.
|
||||
|
||||
%package cifs-idmap-plugin
|
||||
Summary: The sssd idmap plugin for cifs.idmap
|
||||
Group: System/Libraries
|
||||
# Conflict as per https://bugzilla.suse.com/1235789
|
||||
Provides: cifs-idmap-plugin
|
||||
Conflicts: cifs-idmap-plugin
|
||||
|
||||
%description cifs-idmap-plugin
|
||||
The cifs.idmap(8) userspace helper relies on a plugin to handle the
|
||||
ID mapping. This package contains the ID mapping plugin that will use
|
||||
sssd.
|
||||
|
||||
In SUSE systems, only one such plugin can be installed at a time
|
||||
(either the one from sssd, or from cifs-utils).
|
||||
Without the plugin, file objects in a mounted share have UID/GID of
|
||||
the original mounting process.
|
||||
|
||||
%package -n libsss_certmap0
|
||||
Summary: FreeIPA ID mapping library
|
||||
License: LGPL-3.0-or-later
|
||||
@ -408,9 +416,6 @@ Security Services Daemon (sssd).
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# help configure find nscd
|
||||
export PATH="$PATH:/usr/sbin"
|
||||
|
||||
autoreconf -fiv
|
||||
%configure \
|
||||
--with-db-path="%dbpath" \
|
||||
@ -473,8 +478,9 @@ find "$b" -type f -name "*.la" -print -delete
|
||||
%find_lang %name --all-name
|
||||
|
||||
# dummy target for cifs-idmap-plugin
|
||||
mkdir -pv "$b/%_sysconfdir/alternatives" "$b/%_sysconfdir/cifs-utils"
|
||||
ln -sfv "%_sysconfdir/alternatives/%cifs_idmap_name" "$b/%cifs_idmap_plugin"
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/cifs-utils
|
||||
ln -s -f %{cifs_idmap_lib} %{buildroot}%{cifs_idmap_plugin}
|
||||
|
||||
%python3_fix_shebang
|
||||
%if 0%{?suse_version} > 1600
|
||||
%python3_fix_shebang_path %buildroot/%_libexecdir/%name/sss_analyze
|
||||
@ -530,9 +536,6 @@ fi
|
||||
%tmpfiles_create %name.conf
|
||||
%set_permissions %_libexecdir/%name/selinux_child %_libexecdir/%name/sssd_pam
|
||||
|
||||
# install SSSD cifs-idmap plugin as an alternative
|
||||
update-alternatives --install %cifs_idmap_plugin %cifs_idmap_name %cifs_idmap_lib %cifs_idmap_priority
|
||||
|
||||
%preun
|
||||
%service_del_preun sssd.service sssd-autofs.service sssd-autofs.socket sssd-nss.service sssd-nss.socket sssd-pac.service sssd-pac.socket sssd-pam.service sssd-pam.socket sssd-ssh.service sssd-ssh.socket sssd-sudo.service sssd-sudo.socket
|
||||
|
||||
@ -544,9 +547,6 @@ fi
|
||||
# del_postun includes a try-restart
|
||||
%service_del_postun sssd.service sssd-autofs.service sssd-autofs.socket sssd-nss.service sssd-nss.socket sssd-pac.service sssd-pac.socket sssd-pam.service sssd-pam.socket sssd-ssh.service sssd-ssh.socket sssd-sudo.service sssd-sudo.socket
|
||||
|
||||
if [ ! -f "%cifs_idmap_lib" ]; then
|
||||
update-alternatives --remove %cifs_idmap_name %cifs_idmap_lib
|
||||
fi
|
||||
|
||||
%ldconfig_scriptlets -n libsss_certmap0
|
||||
%ldconfig_scriptlets -n libipa_hbac0
|
||||
@ -781,12 +781,7 @@ fi
|
||||
%_mandir/man8/sssd_krb5_localauth_plugin.8*
|
||||
%_mandir/??/man8/sssd_krb5_localauth_plugin.8*
|
||||
%_mandir/man8/sssd_krb5_locator_plugin.8*
|
||||
# cifs idmap plugin
|
||||
%dir %_sysconfdir/cifs-utils
|
||||
%cifs_idmap_plugin
|
||||
%dir %_libdir/cifs-utils
|
||||
%cifs_idmap_lib
|
||||
%ghost %_sysconfdir/alternatives/%cifs_idmap_name
|
||||
|
||||
|
||||
%files ad
|
||||
%dir %_libdir/%name/
|
||||
@ -892,6 +887,12 @@ fi
|
||||
%_libdir/samba/idmap/
|
||||
%_mandir/man8/idmap_sss.8*
|
||||
|
||||
%files cifs-idmap-plugin
|
||||
%dir %_sysconfdir/cifs-utils
|
||||
%cifs_idmap_plugin
|
||||
%dir %_libdir/cifs-utils
|
||||
%cifs_idmap_lib
|
||||
|
||||
%files -n libipa_hbac0
|
||||
%_libdir/libipa_hbac.so.0*
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user