gentoo resync : 25.09.2021

10 files changed, 603 insertions, 7 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 1a7ee42e9a39..e2ca8e5cea29 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pam_krb5/Manifest b/sys-auth/pam_krb5/Manifest
index f90c68aefe99..72308f2aa06b 100644
--- a/sys-auth/pam_krb5/Manifest
+++ b/sys-auth/pam_krb5/Manifest
@@ -1,5 +1,5 @@
 DIST pam-krb5-4.10.tar.gz 619678 BLAKE2B c69e77c0a9f2c96b73af21d95ceb0f8e35e01d6886a2de6b9fb845d0236c4abba30e68f343166bc2c37eaac5bea11d0f1a6d64bfcd481792150bb93ae8ef8eb5 SHA512 6c05352726bdb1463509e6ff4746460ee4f9c6302241dfda94c35b218198f38e40d409cc81e7c8ee8cdcd5291b1ee121f79ae32bd63ea8871462beec70076448
 DIST pam-krb5-4.9.tar.gz 630425 BLAKE2B dc4a539c25c72c50c07ca3359d1dcdcb58b36ec48fc8fa40600c2fece2de8f3cc6af583fce2640ef2d515c342487f9398ed9153abb734ee2dd73b3d440bd00ab SHA512 0e93fbfacf56f9935902ead000dc46732c8a11cc2689c00b68cbaaf6519108a4ce53bb943479d01e439fb92bcc5c1a219d2b816a5ade2af54ea093bb78907201
 EBUILD pam_krb5-4.10.ebuild 784 BLAKE2B 624579c8d9dcdba01fa173787fc3e32af1b52877e988ffd602aff1e79125bb1c0a220346b462de6fc247d551db1bbff2688bcc3a2c4a4c644fcb2c7eeb6e7b54 SHA512 efaa06c7969b132300295a918991c7762522102f96f4630119e2818f847d24d32cebfef98404cba9b41b64adf7205484d6d4411de530af9d9d1e4b0b252334f7
-EBUILD pam_krb5-4.9.ebuild 777 BLAKE2B a567bdc16a2d35eb4ca4a31e480d8f30ad51a28663ebaa0d4657796da3c02010206efaa757abfbffc05877cd2fca80002347ae833374a879c3ffd8dc28df2e20 SHA512 4249514e4ca4b95919e320c9ef758600877f18f5867dad5dfa9bc16b225232fd1e5b63f26ffd507c07a5dbbdce2011a52b698852de829011c33a307c086968ab
+EBUILD pam_krb5-4.9-r1.ebuild 777 BLAKE2B a567bdc16a2d35eb4ca4a31e480d8f30ad51a28663ebaa0d4657796da3c02010206efaa757abfbffc05877cd2fca80002347ae833374a879c3ffd8dc28df2e20 SHA512 4249514e4ca4b95919e320c9ef758600877f18f5867dad5dfa9bc16b225232fd1e5b63f26ffd507c07a5dbbdce2011a52b698852de829011c33a307c086968ab
 MISC metadata.xml 359 BLAKE2B f97a4424e1c39a7c2f489b807428c945122d584417e173a4a5952d2aca466a330ad674531e7a5889829c20701b09745b296c7f4acb979a99d18c301d2cfdc35a SHA512 49c36884526ffa7bfeaf272da47b143493b4e1bcef1a4999c044b276276fb1f6c768f814fe3e61b575d598e6de9af7b9a33553b01567e5704877692db6500dd8
diff --git a/sys-auth/pam_krb5/pam_krb5-4.9.ebuild b/sys-auth/pam_krb5/pam_krb5-4.9-r1.ebuild
index 15056eb4fa08..15056eb4fa08 100644
--- a/sys-auth/pam_krb5/pam_krb5-4.9.ebuild
+++ b/sys-auth/pam_krb5/pam_krb5-4.9-r1.ebuild
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index c3dbb79e74c6..32276ca36e14 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,8 +1,8 @@
 AUX seatd.initd 87 BLAKE2B e88a8c353191ad9b69c0ee263aee7a050333d43e8dd26c8b3ee40cfbcb17f9b7a9391720ac34d19f375a880fae8178cd7dfc0b45cc9565b4b073bbe43cadf5ce SHA512 a19171b55e6650a9237f89258d92aba18508684412fe8a072387c505945b8e54557bd52261de76230553a572d627f40e00770087040111a7473fadfe3c33c931
 DIST seatd-0.5.0.tar.gz 34762 BLAKE2B 054bd64800b734f6092f856540217e5ea4872c5a363960bac6c5aa7dac5355bdbd982232efd2f8078ad326ec0e6257f3ee7643384c88a3bbe15255d65f02540c SHA512 a6b1f11313411fe99e8bdd64aa493fc19bde7b0b927f21e2c3ec8a7fadc6cf2f04fcefa73fa033d971d1dc482665d3dc927ec168026289fe88b2593a45adbc0f
-DIST seatd-0.6.0.tar.gz 37418 BLAKE2B 0598191cd5988ec24506a5b70f2011b1ec1691f5e32108c4c44e79d5527527cae4da8bfbe934ca64efbb1a1dd8471b35589c33399cf85dc89b4cec92d2ef1192 SHA512 9b0b67a028cf9bba63a6c4630c66b21dd2cb87de0d290bfc51245727cda72964fbd0ffee709eded1e81c28f403db6bae8926a257fdd9267e154fbe8697d22a2b
+DIST seatd-0.6.2.tar.gz 37713 BLAKE2B 001c6269bcc83488099f9237a3412b61f89cf653fcb5b0d1ada3f5fbdb17ec604d881ce3d835ff1ea3bc683bb143bab75de88d67b55f508e6a9dd2e958347567 SHA512 47e3aec819f43e72913be1cac2c0db26287f1ef8ecc738845d3591b3e2b4fee3441ac50ea45ac75a5da774e5305a18a02b8375f76f71644c8c07e95bcad52762
 EBUILD seatd-0.5.0-r1.ebuild 1149 BLAKE2B 5d2dea641973020351e6eceda0c32c6d91d8548406cee5b3713cd64a850c08975c2e1bd8be7a2b4f09581d4b88ed11b8fd103e81c30b70c3b101f70d7437f29e SHA512 d60e0a835c74ccd649dc41011d26b4fb5d0a7241b3a5ec17cca3ba1461510bfb2635f5a70a564648de54697625ab6b66d0edbe03ce69a60554b919bb45d31145
 EBUILD seatd-0.5.0.ebuild 1049 BLAKE2B d3e8166eb298e7b7cc6c2263bc95b011a2eaf02957a2e0af9fec7cfcdd71d0275e3ec7576a817e8a4acf022cfe7ec3231be532cf6205ef0941b0b3ca68a795a0 SHA512 609f6607bbad760600413e46a69aa0a349b139e7f6c7cff461b77a676b00561241da9cb31fd1debcdb48b65c23dee1e0c8ae5e0c3b0fff2e89ed5647568fbb2a
-EBUILD seatd-0.6.0-r1.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
+EBUILD seatd-0.6.2.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
 EBUILD seatd-9999.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
 MISC metadata.xml 537 BLAKE2B 470177aa653458ce1a00df3640bd16932a0b7d71b6fef66e853edbc04b7d483a878bcdb395255068b9971753ec1335bfb467aca1be5e3e34ee676f636d087441 SHA512 8695c2958e8ebcb3c7f593815691bfab7c3198c85793f8039ed2cd5b8760546d1ac9929cc5ef6f8ba0a84add2c1b078868a9f19cc454ea379cfedecf7087cbcd
diff --git a/sys-auth/seatd/seatd-0.6.0-r1.ebuild b/sys-auth/seatd/seatd-0.6.2.ebuild
index 8513ea785669..8513ea785669 100644
--- a/sys-auth/seatd/seatd-0.6.0-r1.ebuild
+++ b/sys-auth/seatd/seatd-0.6.2.ebuild
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index ccf1a54bc3a7..1213b945e995 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,7 +1,11 @@
 AUX sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch 1180 BLAKE2B 22b12936b8a4256af39396ce31a90742bc93331b2adb9c44442ddd1285ee19e03c24f99b899dfe35768d4383f7e46a241a0fa3975cc3cf4b32e93f1dd0805915 SHA512 d4519c7d9a63d6902da028584379457fda0be7b4e3b882498586504543e944462d93a3fe804f307562d75cd15257a1595c09bc1e804a41f47f1d2ff9999c7973
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
+DIST sssd-2.3.1-CVE-2021-3621.patch.bz2 3174 BLAKE2B 201c51fff92dd17d9517834e59a12422850ee3c5aab1efff51bcdc5b82521516589271222b6be36d12da2a388d122d37e9f455d593f22551ba9ea58ead694b49 SHA512 faffe46b710e3f8b2db54fc4f637b176b72f6bc31a2d5d1cae7a5ffc81609c4faa5decee1d6db4b2bf87451677c8eda068e153e38755f013afbce982daf58f65
 DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
+DIST sssd-2.5.2-CVE-2021-3621.patch.bz2 3155 BLAKE2B c50e331f0f1acbb9ef8e6d54a63219da44df5e565608c24635d85a110fcc024f7d5293c4412bca64831a9a3a14e2c1188be1a802c76575ad6d7a83243d3d89c2 SHA512 650af7c67b3a807935c0875ee877d366facdf818492fb4244757448ad351454a279968ea5414e6b3cd116e873abe4f1aef2ccdaf790a4df0cf7f2a0078a41860
 DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd48458d742285b60e7beb6d48af865f3415e11ce89e187f4643bbecf15bbb321859ec80cfe458eb781cea6c9 SHA512 a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48
-EBUILD sssd-2.3.1-r2.ebuild 7563 BLAKE2B b7dd8d9487bf8081aff7a20866e63ea37f97c12f4c6075af8080cf120d060c3075d9f0fa87234f5db6d9aa74ab58d0d53b21f059133975a819ee1b963d7e888a SHA512 3980637d2480a2247b897c0412a18c53536481eaf624089f5d697353688b13181d3928e8d665829f411d7bcf3e7da95b51a6407072a5c9548c7f66b47e92b30c
-EBUILD sssd-2.5.2.ebuild 7680 BLAKE2B 0b2dd1baa1329a4a1783acec57bd72f12b5455d97bae3f1f527e12c6caff201c1c41c006bb5de114ef4749608651d4eb5a2c078abecec16036e06f98e0ea6c08 SHA512 c0a1e683a6593681eb8de8f2b1459b4bf40e08f5085087cac6bc98c7bfef77f0e13433ec2fb8fcfa620b2b1666e24ac5d6371bc5092ae477b6cb86b3bee47703
+EBUILD sssd-2.3.1-r2.ebuild 7550 BLAKE2B bb7148a163aafe86d6efbcb29a48829ceed64ddbd328aa68e0d279478dcad70e77027647d4d38a9b56d317d76b024edfeb2d30656f50fd71414cecc25a1f91c9 SHA512 9ebb400f5bf139c18b04501c3b5ae4d74ce6dd4926f76f0b385d8f4b08d1e02b4f0d72cf7765bc30ddcfec50936954812b8522857d7c2b3d3859b12d6db9acb8
+EBUILD sssd-2.3.1-r3.ebuild 7688 BLAKE2B b6c5ef15a1fd5a38a7db69cd012a58674ba3bca3765dc2729a22655c087ee04323d688b07b6c62933b746e84b10ecc76c14516b422a0d35375b96eff4e0e302b SHA512 bd188adc0b8b027c5009d61d9a63b0b80e08633a65ab06bf4480ea7b58f0d6db87aedad5a28974500652fdce6aa20937e98e43f9778a22f10f78fa6fa7e8a501
+EBUILD sssd-2.5.2-r1.ebuild 7816 BLAKE2B f1420eabf6d2fe23695658eb3edb7736a233ad88e398b8088478836ba821eebb4db426710a1a459701560151a3e5dc18ab88a09a1d9cddb89849fbc38e658746 SHA512 ed3823463c6ee321c70b2585882c788e082f397984fb370007ab64dcfc805820e87cb8d6d64341f857a0d8f948d0e3c41562704269dc55e2816d1aa97387216c
+EBUILD sssd-2.5.2.ebuild 7667 BLAKE2B 23b845dba05d2e799a20a02e670759271e17bf6ac214de3a65a8628231490c305b2320d760b621b940bb4c3817a8a80c1efd254b9131a026d31ae0e599b31c84 SHA512 ad2472a15541dd78357b5a7ad42bf60bb0073dd770365ec77f5f0e7c9128941fed72ee9e1f4723d4cdb19e7d5e7d492746e75aff0b182a3b1108c7e65d35bf14
 MISC metadata.xml 1182 BLAKE2B 8667ff4514a6cf81e044c53492760a20b4af07a345f75b48707587ce38903a5b5837e8aea5dec119a5f26cb0a5b7ce4577936cf6d4e666894bc5014ec6fd0c51 SHA512 e375a25d8dc8ccd1ec13e7b4bdf3782441b01ff15a0f0a213dbbb27ff9d30ff455e1efe1711096973b5c814dcb7f269af61cb455290b8948b06451e754b40912
diff --git a/sys-auth/sssd/sssd-2.3.1-r2.ebuild b/sys-auth/sssd/sssd-2.3.1-r2.ebuild
index 776c078d1d34..6ecd0e166c35 100644
--- a/sys-auth/sssd/sssd-2.3.1-r2.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
+inherit autotools linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://github.com/SSSD/sssd"
diff --git a/sys-auth/sssd/sssd-2.3.1-r3.ebuild b/sys-auth/sssd/sssd-2.3.1-r3.ebuild
new file mode 100644
index 000000000000..3f70659ea8f5
--- /dev/null
+++ b/sys-auth/sssd/sssd-2.3.1-r3.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://github.com/SSSD/sssd"
+SRC_URI="https://github.com/SSSD/sssd/releases/download/${PN}-${PV//./_}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-3621.patch.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd test valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="pac? ( samba )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=app-crypt/mit-krb5-1.10.3
+	app-crypt/p11-kit
+	>=dev-libs/ding-libs-0.2
+	dev-libs/glib:2
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=dev-libs/libpcre-8.30:=
+	>=dev-libs/popt-1.16
+	>=dev-libs/openssl-1.0.2:0=
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=net-dns/c-ares-1.7.4
+	>=net-nds/openldap-2.4.30[sasl]
+	>=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
+	>=sys-libs/tevent-0.9.16
+	>=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] )
+	netlink? ( dev-libs/libnl:3 )
+	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} )
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	systemd? (
+		dev-libs/jansson:0=
+		net-libs/http-parser:0=
+		net-misc/curl:0=
+	)"
+RDEPEND="${DEPEND}
+	>=sys-libs/glibc-2.17[nscd]
+	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
+		dev-libs/softhsm:2
+		dev-util/cmocka
+		net-libs/gnutls[pkcs11,tools]
+		sys-libs/libfaketime
+		sys-libs/nss_wrapper
+		sys-libs/pam_wrapper
+		sys-libs/uid_wrapper
+		valgrind? ( dev-util/valgrind )
+	)
+	man? (
+		app-text/docbook-xml-dtd:4.4
+		>=dev-libs/libxslt-1.1.26
+		nls? ( app-text/po4a )
+	)"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch
+	"${WORKDIR}"/${P}-CVE-2021-3621.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's:/var/run:/run:' \
+		"${S}"/src/examples/logrotate || die
+
+	default
+	eautoreconf
+	multilib_copy_sources
+	if use python && multilib_is_native_abi; then
+		python_setup
+	fi
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		--with-pid-path="${EPREFIX}"/run
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-db-path="${EPREFIX}"/var/lib/sss/db
+		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
+		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
+		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
+		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
+		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
+		--with-log-path="${EPREFIX}"/var/log/sssd
+		--with-os=gentoo
+		--with-nscd="${EPREFIX}"/usr/sbin/nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--sbindir=/usr/sbin
+		--with-crypto="libcrypto"
+		--enable-local-provider
+		$(multilib_native_use_with systemd kcm)
+		$(multilib_native_use_with systemd secrets)
+		$(use_with samba)
+		--with-smb-idmap-interface-version=6
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(use_enable pac pac-responder)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls)
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with man manpages)
+		$(multilib_native_use_with sudo)
+		$(multilib_native_with autofs)
+		$(multilib_native_with ssh)
+		$(use_enable valgrind)
+		--without-python2-bindings
+		$(multilib_native_use_with python python3-bindings)
+	)
+
+	# Annoyingly configure requires that you pick systemd XOR sysv
+	if use systemd; then
+		myconf+=(
+			--with-initscript="systemd"
+			--with-systemdunitdir=$(systemd_get_systemunitdir)
+		)
+	else
+		myconf+=(--with-initscript="sysv")
+	fi
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
+			{NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-secrets
+			--without-kcm
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+		use doc && emake docs
+		if use man || use nls; then
+			emake update-po
+		fi
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+		use pac && emake sssd_pac_plugin.la
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
+		if use python; then
+			python_optimize
+			python_fix_shebang "${ED}"
+		fi
+
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib.so .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+
+		if use pac; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
+			doexe .libs/sssd_pac_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	# strip empty dirs
+	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
+
+	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"
+	elog "features. Please see howto in	https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
+}
diff --git a/sys-auth/sssd/sssd-2.5.2-r1.ebuild b/sys-auth/sssd/sssd-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..6f4a3307f99b
--- /dev/null
+++ b/sys-auth/sssd/sssd-2.5.2-r1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://github.com/SSSD/sssd"
+SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-3621.patch.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	pac? ( samba )
+	test? ( sudo )
+	valgrind? ( test )"
+
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/check
+		dev-libs/softhsm:2
+		dev-util/cmocka
+		net-libs/gnutls[pkcs11,tools]
+		sys-libs/libfaketime
+		sys-libs/nss_wrapper
+		sys-libs/pam_wrapper
+		sys-libs/uid_wrapper
+		valgrind? ( dev-util/valgrind )
+	)
+	man? (
+		app-text/docbook-xml-dtd:4.4
+		>=dev-libs/libxslt-1.1.26
+		nls? ( app-text/po4a )
+	)"
+
+DEPEND=">=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
+	app-crypt/p11-kit
+	>=dev-libs/ding-libs-0.2
+	dev-libs/glib:2
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=dev-libs/libpcre-8.30:=
+	>=dev-libs/popt-1.16
+	>=dev-libs/openssl-1.0.2:0=
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=net-dns/c-ares-1.7.4
+	>=net-nds/openldap-2.4.30[sasl]
+	>=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
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.17-r1:=
+	virtual/libintl
+	locator? (
+		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
+	)
+	acl? ( net-fs/cifs-utils[acl] )
+	netlink? ( dev-libs/libnl:3 )
+	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nls? ( >=sys-devel/gettext-0.18 )
+	pac? (
+		net-fs/samba
+	)
+	python? ( ${PYTHON_DEPS} )
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	systemd? (
+		dev-libs/jansson:0=
+		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 )"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+PATCHES=(
+	"${WORKDIR}"/${P}-CVE-2021-3621.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	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
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		--with-pid-path="${EPREFIX}"/run
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-db-path="${EPREFIX}"/var/lib/sss/db
+		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
+		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
+		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
+		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
+		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
+		--with-log-path="${EPREFIX}"/var/log/sssd
+		--with-os=gentoo
+		--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)
+		$(multilib_native_use_with systemd secrets)
+		$(use_with samba)
+		--with-smb-idmap-interface-version=6
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(use_enable pac pac-responder)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls)
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with man manpages)
+		$(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)
+	)
+
+	# Annoyingly configure requires that you pick systemd XOR sysv
+	if use systemd; then
+		myconf+=(
+			--with-initscript="systemd"
+			--with-systemdunitdir=$(systemd_get_systemunitdir)
+		)
+	else
+		myconf+=(--with-initscript="sysv")
+	fi
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
+			{NDR_NBT,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-secrets
+			--without-kcm
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+		use doc && emake docs
+		if use man || use nls; then
+			emake update-po
+		fi
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+		use pac && emake sssd_pac_plugin.la
+	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
+		if use python; then
+			python_optimize
+			python_fix_shebang "${ED}"
+		fi
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib.so .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+
+		if use pac; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
+			doexe .libs/sssd_pac_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	# strip empty dirs
+	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
+
+	rm -r "${ED}"/run || die
+}
+
+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"
+	elog "features. Please see howto in	https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
+}
diff --git a/sys-auth/sssd/sssd-2.5.2.ebuild b/sys-auth/sssd/sssd-2.5.2.ebuild
index 4759c47cccdb..9c003fca8553 100644
--- a/sys-auth/sssd/sssd-2.5.2.ebuild
+++ b/sys-auth/sssd/sssd-2.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
+inherit autotools linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://github.com/SSSD/sssd"