diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 8865846..10a17ec 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1 +1 @@
-DIST sssd-2.4.2.tar.gz 7402483 BLAKE2B e25fce29a7e4d544fed821c6c8238846083bd65caef5abd2944c3ac670f7b404cfcbe5321870ca9ded0c78f93f4503d61e7e5821726d1640d127bde63e2444a7 SHA512 871435cd82db38eef36988bae84a6d28220839ee16b600c3dab17523c18b295e65ff62e86c095ea67e652be661248b45720a5106e01179190ff3852b1c0e7a33
+DIST sssd-2.5.0.tar.gz 7474851 BLAKE2B 835ca53a7910f457666a92be62fe047dbcf52c56560dad60d6c6275dccca917b4349d053586c8c88da49f900d570c890faa7372783be35940ccd49d1fd4ec09d SHA512 80b5e81cedacdf0bbe724af20d69b918bb6cc353976c6c65421afcd5809d1723f523bc3c1be294b9e01cfda9617c2df5c6ceb007837f195eb1abc2abdab9858c
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index b8a45b6..4d3fd47 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -11,14 +11,12 @@
diff --git a/sys-auth/sssd/sssd-2.4.2.ebuild b/sys-auth/sssd/sssd-2.5.0.ebuild
similarity index 90%
rename from sys-auth/sssd/sssd-2.4.2.ebuild
rename to sys-auth/sssd/sssd-2.5.0.ebuild
index a055531..1b4fe7c 100644
--- a/sys-auth/sssd/sssd-2.4.2.ebuild
+++ b/sys-auth/sssd/sssd-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
@@ -14,15 +14,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE="GPL-3"
SLOT="0"
-IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind"
+IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
RESTRICT="!test? ( test )"
REQUIRED_USE="pac? ( samba )
python? ( ${PYTHON_REQUIRED_USE} )
- test? ( sudo )"
+ test? ( sudo )
+ valgrind? ( test )"
DEPEND="
- >=app-crypt/mit-krb5-1.10.3
+ >=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
app-crypt/p11-kit
>=dev-libs/ding-libs-0.2
dev-libs/glib:2
@@ -42,7 +43,6 @@ DEPEND="
>=sys-libs/ldb-1.1.17-r1:=
virtual/libintl
locator? (
- >=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
)
acl? ( net-fs/cifs-utils[acl] )
@@ -50,7 +50,6 @@ DEPEND="
nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
nls? ( >=sys-devel/gettext-0.18 )
pac? (
- app-crypt/mit-krb5[${MULTILIB_USEDEP}]
net-fs/samba
)
python? ( ${PYTHON_DEPS} )
@@ -64,14 +63,12 @@ DEPEND="
net-libs/http-parser:0=
net-misc/curl:0=
)
- "
-
+ systemtap? ( dev-util/systemtap )"
RDEPEND="${DEPEND}
>=sys-libs/glibc-2.17[nscd]
- selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
- "
-BDEPEND="${DEPEND}
- >=sys-devel/autoconf-2.69-r5
+ selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+ virtual/pkgconfig
doc? ( app-doc/doxygen )
test? (
dev-libs/check
@@ -108,12 +105,23 @@ pkg_setup() {
}
src_prepare() {
- sed -i 's:/var/run:/run:' \
- "${S}"/src/examples/logrotate || die
-
default
+
+ sed -i \
+ -e 's:/var/run:/run:' \
+ "${S}"/src/examples/logrotate \
+ || die
+
+ # disable flaky test, see https://github.com/SSSD/sssd/issues/5631
+ sed -i \
+ -e '/^\s*pam-srv-tests[ \\]*$/d' \
+ "${S}"/Makefile.am \
+ || die
+
eautoreconf
+
multilib_copy_sources
+
if use python && multilib_is_native_abi; then
python_setup
fi
@@ -146,6 +154,7 @@ multilib_src_configure() {
--with-nscd="${EPREFIX}"/usr/sbin/nscd
--with-unicode-lib="glib2"
--disable-rpath
+ --disable-static
--sbindir=/usr/sbin
--enable-local-provider
$(multilib_native_use_with systemd kcm)
@@ -164,6 +173,7 @@ multilib_src_configure() {
$(multilib_native_use_with sudo)
$(multilib_native_with autofs)
$(multilib_native_with ssh)
+ $(use_enable systemtap)
$(use_enable valgrind)
--without-python2-bindings
$(multilib_native_use_with python python3-bindings)
@@ -216,6 +226,13 @@ multilib_src_compile() {
fi
}
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ local -x CK_TIMEOUT_MULTIPLIER=10
+ emake check VERBOSE=yes
+ fi
+}
+
multilib_src_install() {
if multilib_is_native_abi; then
emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
@@ -223,7 +240,6 @@ multilib_src_install() {
python_optimize
python_fix_shebang "${ED}"
fi
-
else
# easier than playing with automake...
dopammod .libs/pam_sss.so
@@ -269,7 +285,7 @@ multilib_src_install_all() {
keepdir /var/log/sssd
# strip empty dirs
- if ! use doc ; then
+ if ! use doc; then
rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
fi
@@ -277,10 +293,6 @@ multilib_src_install_all() {
rm -r "${ED}"/run || die
}
-multilib_src_test() {
- multilib_is_native_abi && emake check
-}
-
pkg_postinst() {
elog "You must set up sssd.conf (default installed into /etc/sssd)"
elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"