gentoo auto-resync : 23:01:2024 - 16:46:30

3 files changed, 6 insertions, 12 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index da40113bad9f..a8df116b9d12 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index e00f2377e9fc..6e10232f1e4a 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -4,8 +4,8 @@ AUX sssd-2.9.1-certmap-fix-partial-string-comparison.patch 3182 BLAKE2B 1e4a41d8
 AUX sssd-2.9.1-conditional-python-install.patch 533 BLAKE2B ce076e4e00bd1b3e8a18427fde385b6a65fbbc65f28a542f575d3b77b8e7d277ebc829a7d43fdbced51475b69553de4fd6e564d52d06c6a83edcae7fa8a2a53a SHA512 4348577c16ab96717e0b92dcae00e955e76e9be6c58a6f6c4435f2315c8393336396e7a0ccdd05f50b97233a956ef674fd64589780500159748ac47c65edb623
 AUX sssd-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch 2137 BLAKE2B 58207d28ab800ae880aa7df1ac90055a9750bef31dcdef2a1152c0108797f82419aa3d26b6ab645e52449cff507f946e750ed261cf767b7181217dd979160bec SHA512 ca2794f7484b1b845184acbcb68dfa09dc582e0f6bd9a15b6c9929027414eb6a7fac7b77ba83585c12924dc9c70c3875e43dd6a71d4f83bc7aabef2506685f54
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
-DIST sssd-2.6.0.tar.gz 7440969 BLAKE2B 6b05fcea09ef10a5b2f373dc6a66032edc4c4f46f65f42fdc9ffb5b676025095e16de4a86b3088351c22746e062829d1d68fa7e960cccb7c5a77d960e6d38e2a SHA512 0b9e169424cbadfa6132a3e5e9789facf82f04cce94cb5344b8ff49370ae8817c2cb16cf21caddf6a7cd42e661d5ff5bf97843d79681683aacff0053ff93f64b
 DIST sssd-2.9.1.tar.gz 7943540 BLAKE2B 9113b63d54beb40ba85c5b5c75068197317b3b8088119cf6557c6b4aed113d2d67f0bc64fc68fb34f4dbef54cccdb8b32ef44112115930751fdec5ec92e0a09b SHA512 eb7345dcfbbd51f005f67ee5032364d369d24589111ded60701e2dbe09563f0b862d343f231dd2e9d548acd8c560a036c8b88a0601f9aa048a7202da8202cd9b
-EBUILD sssd-2.6.0-r3.ebuild 8596 BLAKE2B 555d66e05d4d246d4f189fd790dfa71057c3e2bb99db0428d1c23b41ccac41de93f3a0ccfb7ca6ca979b316b2963a2a60f2302732e898c183aaae85f3d55b79c SHA512 71a00585eceeed86f429dee2ee25fff059cd4059b4e311d10fded247c96ad8af46219360744bcb2a948b6bda1dfa31f088a5a07fd28c5c598d1a1d0773eddcd3
+DIST sssd-2.9.4.tar.gz 7982544 BLAKE2B 6ed23787f1c029abc89f2bbe516787ddbe2fa39f052b75b965972b0a3532c66076f16b775258c5ee6f4ac9ef63bd6ab5bad1a3b660bcac135b3af460d0f14748 SHA512 9546cf074628f32137b16ca0c763988785271124244b645d1e786762e8578f10d983793a29bffcc004b064452fe8d465476a3041688d2f3c11c2751fb5bec3e2
 EBUILD sssd-2.9.1-r1.ebuild 8596 BLAKE2B 21a3409023f9f7d96f6aaada2799f9f4aef85f207502d7452448dcf6467f215fc3948af29e15eb012ade772e4e3ad960b100107f1c4f1b24be012b11372f28d4 SHA512 54c07e3943613a0c5247afe593868061a62e9f3701e6f26c2790ca8f73a46a81287fe25f10b9553363934f14a9dec7ef6e037a73337bf0c2510ad2d88999bc6e
+EBUILD sssd-2.9.4.ebuild 8233 BLAKE2B b3ede0cd7105fad41df9f053af5b2dd5d04057e0646e6d1e92584172410c59e37498614f4e9106707b72c70564dcb70553f635a11e70f33ec8c9d59c9959a849 SHA512 b73997fbe399778e227def4c77bd84d4602e80fc2e7e0f0de758f155c7c740c5e82824365b59995cd75aa9a484a3c74aacca71cb442c13f208434c34d9690426
 MISC metadata.xml 1382 BLAKE2B 858581b958e6b5fed53b36447b8b91455e44d097694d4e940292274070e2e8a14a77f8f002db96359145c80502a8e1461e7c5124caa3956dfaf3ede959d2ae51 SHA512 218e910742da465683987e0d6941bdcdb234e3f3d59be4fb7765e2e28c1724c585f55f8fc4398ad0d0ae06a84ec6a29b8ae5190ac044a9bd22c6d50f914547a7
diff --git a/sys-auth/sssd/sssd-2.6.0-r3.ebuild b/sys-auth/sssd/sssd-2.9.4.ebuild
index bb244eceeb6e..351cc7c33633 100644
--- a/sys-auth/sssd/sssd-2.6.0-r3.ebuild
+++ b/sys-auth/sssd/sssd-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,6 +15,7 @@ DESCRIPTION="System Security Services Daemon provides access to identity and aut
 HOMEPAGE="https://github.com/SSSD/sssd"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SSSD/sssd.git"
@@ -23,8 +24,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="acl doc +netlink keyutils nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
+IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( sudo )"
@@ -44,6 +44,7 @@ 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
@@ -51,7 +52,6 @@ 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 )
@@ -102,9 +102,6 @@ CONFIG_CHECK="~KEYS"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.8.2-krb5_pw_locked.patch"
-	"${FILESDIR}/${PN}-2.9.1-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch"
-	"${FILESDIR}/${PN}-2.9.1-certmap-fix-partial-string-comparison.patch"
-	"${FILESDIR}/${PN}-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch"
 	"${FILESDIR}/${PN}-2.9.1-conditional-python-install.patch"
 )
 
@@ -172,9 +169,6 @@ 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