[gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/

["Sam James" <sam@gentoo.org>]

commit:     1ff341e1ea9d350b75ee98b8475cbb9f23d97019
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  6 05:30:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 14:02:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff341e1

sys-auth/sssd: make keyutils optional

keyutils fails tests on several niche arches.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-auth/sssd/Manifest                                    | 1 +
 sys-auth/sssd/metadata.xml                                | 1 +
 sys-auth/sssd/{sssd-2.9.1.ebuild => sssd-2.6.0-r3.ebuild} | 7 +++++--
 sys-auth/sssd/{sssd-2.9.1.ebuild => sssd-2.9.1-r1.ebuild} | 7 +++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 9bb94d8d1af3..e2f173e39988 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1 +1,2 @@
+DIST sssd-2.6.0.tar.gz 7440969 BLAKE2B 6b05fcea09ef10a5b2f373dc6a66032edc4c4f46f65f42fdc9ffb5b676025095e16de4a86b3088351c22746e062829d1d68fa7e960cccb7c5a77d960e6d38e2a SHA512 0b9e169424cbadfa6132a3e5e9789facf82f04cce94cb5344b8ff49370ae8817c2cb16cf21caddf6a7cd42e661d5ff5bf97843d79681683aacff0053ff93f64b
 DIST sssd-2.9.1.tar.gz 7943540 BLAKE2B 9113b63d54beb40ba85c5b5c75068197317b3b8088119cf6557c6b4aed113d2d67f0bc64fc68fb34f4dbef54cccdb8b32ef44112115930751fdec5ec92e0a09b SHA512 eb7345dcfbbd51f005f67ee5032364d369d24589111ded60701e2dbe09563f0b862d343f231dd2e9d548acd8c560a036c8b88a0601f9aa048a7202da8202cd9b

diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index e719d6e332fd..a4f6c50a3f9e 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -15,6 +15,7 @@
 	</maintainer>
 	<use>
 		<flag name="acl"> Build and use the cifsidmap plugin</flag>
+		<flag name="keyutils">Controls whether the kernel keyring should be used via <pkg>sys-apps/keyutils</pkg></flag>
 		<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-fs/nfs-utils</pkg></flag>
 		<flag name="samba">Add Privileged Attribute Certificate Support for Kerberos</flag>

diff --git a/sys-auth/sssd/sssd-2.9.1.ebuild b/sys-auth/sssd/sssd-2.6.0-r3.ebuild
similarity index 97%
copy from sys-auth/sssd/sssd-2.9.1.ebuild
copy to sys-auth/sssd/sssd-2.6.0-r3.ebuild
index 416554744465..0f782032dec8 100644
--- a/sys-auth/sssd/sssd-2.9.1.ebuild
+++ b/sys-auth/sssd/sssd-2.6.0-r3.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
+IUSE="acl doc +netlink keyutils nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( sudo )"
@@ -44,7 +44,6 @@ DEPEND="
 	>=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.30:=[sasl,experimental]
 	>=sys-apps/dbus-1.6
-	>=sys-apps/keyutils-1.5:=
 	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
 	>=sys-libs/talloc-2.0.7
 	>=sys-libs/tdb-1.2.9
@@ -52,6 +51,7 @@ DEPEND="
 	>=sys-libs/ldb-1.1.17-r1:=
 	virtual/libintl
 	acl? ( net-fs/cifs-utils[acl] )
+	keyutils? ( >=sys-apps/keyutils-1.5:= )
 	netlink? ( dev-libs/libnl:3 )
 	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
@@ -172,6 +172,9 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
+	export ac_cv_header_keyutils_h=$(usex keyutils)
+	export ac_cv_lib_keyutils_add_key=$(usex keyutils)
+
 	myconf+=(
 		--libexecdir="${EPREFIX}"/usr/libexec
 		--localstatedir="${EPREFIX}"/var

diff --git a/sys-auth/sssd/sssd-2.9.1.ebuild b/sys-auth/sssd/sssd-2.9.1-r1.ebuild
similarity index 97%
rename from sys-auth/sssd/sssd-2.9.1.ebuild
rename to sys-auth/sssd/sssd-2.9.1-r1.ebuild
index 416554744465..a8949592e303 100644
--- a/sys-auth/sssd/sssd-2.9.1.ebuild
+++ b/sys-auth/sssd/sssd-2.9.1-r1.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
+IUSE="acl doc keyutils +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( sudo )"
@@ -44,7 +44,6 @@ DEPEND="
 	>=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.30:=[sasl,experimental]
 	>=sys-apps/dbus-1.6
-	>=sys-apps/keyutils-1.5:=
 	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
 	>=sys-libs/talloc-2.0.7
 	>=sys-libs/tdb-1.2.9
@@ -52,6 +51,7 @@ DEPEND="
 	>=sys-libs/ldb-1.1.17-r1:=
 	virtual/libintl
 	acl? ( net-fs/cifs-utils[acl] )
+	keyutils? ( >=sys-apps/keyutils-1.5:= )
 	netlink? ( dev-libs/libnl:3 )
 	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
@@ -172,6 +172,9 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
+	export ac_cv_header_keyutils_h=$(usex keyutils)
+	export ac_cv_lib_keyutils_add_key=$(usex keyutils)
+
 	myconf+=(
 		--libexecdir="${EPREFIX}"/usr/libexec
 		--localstatedir="${EPREFIX}"/var