gentoo resync : 29.06.2021

15 files changed, 281 insertions, 10 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a035a8d5498a..e7e3c50469b8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 6a502344b6b0..d00deb819f44 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,8 +1,10 @@
 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
+AUX file-5.40-revert-char-count.patch 1241 BLAKE2B 911d67cd51e6fc0a18075aed01ad79d240e4c7c556a58fb484781ba9e7bc4843f30ea008ff921a47434a8905bc04e25f3104f86a9942f80a5241f768a4de7494 SHA512 6341f85315c2f19d3714a0ef6e8cdbe3bdd1c84cbbef8d9c64597c27307c822b367298b63f313ccdebed6f84964c6f7411768ab1b578c1441e6dee4477f56175
 AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb639744f11f2fb094f0870d10071a472dc3e6036cfe6cce4a1570a0876fd6c7c3f8f7f4e1ae39aa46f7cc39ee7e49ea1c9c1b22a SHA512 a475835fac9556ef4a799a5b406acdbbdb7bd09233a5563a386f110355a8e5a4581eed69bcc968df12985f6e910ea7da0deec9f510dd891b633b369afd816ff8
 AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65
+EBUILD file-5.40-r3.ebuild 3484 BLAKE2B 0e9953c405e53804314695ee959735f39dbad689dff151db7001c4430fc7c196954f216b594ba24f644e2c100792fd3b444dd5b34bd254b7cd3bdb816d62536b SHA512 5d7ae0c9b636eb46d1e0b98679a2a6a8dbb1651f6e7cb3e0988e0a09a13b31c2e3aa329a5e45e009646ffc61bf4e7b406d4bcffa99789874a234bceb9d49bf2d
 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild
new file mode 100644
index 000000000000..7fd5ac3b71b9
--- /dev/null
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.40-xz_magic.patch" #784773
+	"${FILESDIR}/file-5.40-seccomp-faccessat.patch"
+	"${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
+	"${FILESDIR}/file-5.40-revert-char-count.patch" #799188
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE="${S}"
+
+	if need_build_file ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/files/file-5.40-revert-char-count.patch b/sys-apps/file/files/file-5.40-revert-char-count.patch
new file mode 100644
index 000000000000..9d6f5be60fac
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-revert-char-count.patch
@@ -0,0 +1,49 @@
+From c07e242e766242a44ff720c149b1bdd4924ec247 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Tue, 27 Apr 2021 19:37:14 +0000
+Subject: [PATCH] Revert the fix for PR/180. It lead to PR/261. Using character
+ count heuristics ends up with confusing behavior, the following should not be
+ producing different results:     echo -n xx | ./file -     echo -n xy |
+ ./file -
+
+---
+[patch backported to 5.40 release -- ulm]
+
+ src/encoding.c | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/src/encoding.c b/src/encoding.c
+index 31d4d125..3647a481 100644
+--- a/src/encoding.c
++++ b/src/encoding.c
+@@ -265,9 +265,7 @@ private int \
+ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
+     size_t *ulen) \
+ { \
+-	size_t i, u; \
+-	unsigned char dist[256]; \
+-	memset(dist, 0, sizeof(dist)); \
++	size_t i; \
+ \
+ 	*ulen = 0; \
+ \
+@@ -278,16 +276,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
+ 			return 0; \
+ \
+ 		ubuf[(*ulen)++] = buf[i]; \
+-		dist[buf[i]]++; \
+ 	} \
+-	u = 0; \
+-	for (i = 0; i < __arraycount(dist); i++) { \
+-		if (dist[i]) \
+-			u++; \
+-	} \
+-	if (u < 3) \
+-		return 0; \
+-\
+ 	return 1; \
+ }
+ 
+-- 
+2.32.0
+
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index a40d76bc1b7f..f7912af2d2d5 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,5 @@
 DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3
 DIST hwinfo-21.74-1.1.src.rpm 967046 BLAKE2B 305db6eb3184de0e84d166f0e32988ea2a0ec65eceb322c8c451f33ab8656c38a21a74f416ff08442bcbc5fa91fb4fa8439d907c2c244fe62a2048be7f84b181 SHA512 1a681b51934fbed229b7daa96b5e4e0d8fc62d480927034d0c95ae8c89dc2ae43214c63cca273379162353aeb2bf81883e7c02006c4f45fd1deab0d74f8a2988
 EBUILD hwinfo-21.72.ebuild 1377 BLAKE2B dd5ca41d5f58ef3149c13490b6ba9f1b0a3583cf6a3ea839e5af6c80f9990cd6fbf921847ce2a9468306e176108c93131a0d60aba9378cba01e007c49cbd26c7 SHA512 973c96a71d3701e726d1c121a4ce375e84a914478ce74616d7eea666ecf6f1c33434841d831528817f4bf33fb0ba29f51e96bb9b903d52ded6a343536b662e14
-EBUILD hwinfo-21.74.ebuild 1549 BLAKE2B a99c8e0c59f645fe5dd982913071326303305bc34299dd62ab36d6e126c3397da18e73d565bf6ccfa25fc9373b27d2f8c23b034b245a07190fa8907df8deb361 SHA512 65f5c677c51035ab83b35724f39872a0bdc0e4368e710f26000c48c892973f58ccdb1246201ffbbcf4a710d1c536f1cb248423c79e48b917678dd98b4225003c
+EBUILD hwinfo-21.74.ebuild 1546 BLAKE2B c9dfb7a7d72ba0e2d64bd2d1073decdf1c84a011d8e1924bda302b31f4f837d3566b2c43fcfac34205a13597dbaf81262d5f746e06f705a93ed2e58f29e241cc SHA512 26e7c91ad4cb94548e82dbf3d64c0441a2ead9f2006423cb625655832dabe4248b68bf34fbe1109ddf03a6a2385f7f097085a93e0397fab36f7252a25ee60d11
 MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405
diff --git a/sys-apps/hwinfo/hwinfo-21.74.ebuild b/sys-apps/hwinfo/hwinfo-21.74.ebuild
index b4051eb59a5d..344dcb48ecc4 100644
--- a/sys-apps/hwinfo/hwinfo-21.74.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.74.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index bfdc6be6bce5..1728a3e35ee8 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -2,10 +2,11 @@ AUX musl-1.2.2.patch 656 BLAKE2B 73abdd679bfb99f8085e3341a80059f62e836622c765c89
 AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475
 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
+AUX systemd-tmpfiles-246-musl-mallinfo.patch 2317 BLAKE2B b2d7d82fadfb42273ae37cf57da569421c0ac3334d27e404035fccc0fe70e4bc6b44dc4b5d19c5d95cc9f5761a384497606653a94c8951df9353600da174d989 SHA512 c008e2f6b6a63b36bd582e09c35109093a2883f3fc8b784e15990f5ccdb17f3922d5a6468a89b61ad530bdaed1c667c5c0a6554b23cf80e2bd01812d068d4a59
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940
-EBUILD systemd-tmpfiles-246.ebuild 4706 BLAKE2B 9cdf5cea7dc7e3984c81f2b706b078e5b3a0354d70e387b7df5df413ebf1c5fd6b60ba56b3cf202ca07b4c2e62733e522cfcfe23012216c0c092be5e1c6e7707 SHA512 6fd016811da2db42a7c7a418cc5c5807c84ac1b5b8a8f538c3810d1225d4a9de03a3c435b5f3b9dba7a7730a147b7efba8ca25a0d6e83818de877254e20eedea
+EBUILD systemd-tmpfiles-246.ebuild 4806 BLAKE2B 631d8fe0eff04de317fbfb1455347a681b15c1ab1dfcba6f253f97c5ae99aec175ca96fdf22a410baf4a2faf72d55799943c8a7457128a0a94e62e08b75b9d18 SHA512 027e2c0929fea96074cb9e767d286defc681f789e02644994b659d9a8a5c17cb60fc47282b379d013473641eecdcb14780141d0e10527291e8ae598d4eae33be
 EBUILD systemd-tmpfiles-248.3.ebuild 5457 BLAKE2B ec6217051a2c813e739f2f740e4eb970c28b5efb46a6836dd738bae4abd596c9eb16fc496028589f741b4fd892508b716f31e67deb89364d8def309cb4aa5dac SHA512 3f112d52e5d3c4343d645769e6e79d9d33231e042493b21fdc3d86bc2dfa55962387aa3d20b8619016973b751a14a7fb60bcf667efbe4ba63fa43fa92d1f3f4d
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch
new file mode 100644
index 000000000000..ea97b909022e
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch
@@ -0,0 +1,60 @@
+--- a/meson.build	2021-05-13 20:47:21.487670275 +0000
++++ b/meson.build	2021-05-13 20:53:12.977688147 +0000
+@@ -542,6 +542,12 @@ else
+         conf.set10('HAVE_GETRANDOM', have)
+ endif
+ 
++if cc.has_function('mallinfo', prefix : '''#include <malloc.h>''')
++        conf.set10('HAVE_MALLINFO', true)
++else
++        conf.set10('HAVE_MALLINFO', false)
++endif
++
+ #####################################################################
+ 
+ vcs_tagger = [project_source_root + '/tools/meson-vcs-tag.sh',
+--- a/src/basic/selinux-util.c	2021-05-13 20:17:47.044246714 +0000
++++ b/src/basic/selinux-util.c	2021-05-13 21:00:56.591045053 +0000
+@@ -75,9 +75,13 @@ void mac_selinux_retest(void) {
+ int mac_selinux_init(void) {
+ #if HAVE_SELINUX
+         usec_t before_timestamp, after_timestamp;
++#if defined (__GLIBC__) && defined (HAVE_MALLINFO)
+         struct mallinfo before_mallinfo, after_mallinfo;
++#endif
+         char timespan[FORMAT_TIMESPAN_MAX];
++#ifdef HAVE_MALLINFO
+         int l;
++#endif
+ 
+         selinux_set_callback(SELINUX_CB_POLICYLOAD, (union selinux_callback) mac_selinux_reload);
+ 
+@@ -87,7 +91,9 @@ int mac_selinux_init(void) {
+         if (!mac_selinux_use())
+                 return 0;
+ 
++#if defined (__GLIBC__) && defined (HAVE_MALLINFO)
+         before_mallinfo = mallinfo();
++#endif
+         before_timestamp = now(CLOCK_MONOTONIC);
+ 
+         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+@@ -95,6 +101,7 @@ int mac_selinux_init(void) {
+                 return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
+ 
+         after_timestamp = now(CLOCK_MONOTONIC);
++#if defined (__GLIBC__) && defined (HAVE_MALLINFO)
+         after_mallinfo = mallinfo();
+ 
+         l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
+@@ -102,6 +109,10 @@ int mac_selinux_init(void) {
+         log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
+                   format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
+                   (l+1023)/1024);
++#else
++        log_debug("Successfully loaded SELinux database in %s",
++                  format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
++#endif
+ 
+ #endif
+         return 0;
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 7bce5591c7b9..74e8fd428879 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -53,8 +53,11 @@ pkg_setup() {
 src_prepare() {
 	# musl patchset from:
 	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-	use elibc_musl && eapply "${WORKDIR}/${P}-musl"
-	use elibc_musl && eapply "${FILESDIR}/musl-1.2.2.patch" # https://bugs.gentoo.org/766833
+	if use elibc_musl; then
+		eapply "${WORKDIR}/${P}-musl"
+		eapply "${FILESDIR}/musl-1.2.2.patch" # https://bugs.gentoo.org/766833
+		use selinux && eapply "${FILESDIR}/${P}-musl-mallinfo.patch" # https://github.com/gentoo/musl/pull/433
+	fi
 	default
 
 	# https://bugs.gentoo.org/767403
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e10390dd95a1..e21aa7b10cac 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,9 +4,9 @@ AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-249-rc1.tar.gz 10562205 BLAKE2B c1bc18d3980efdf0bd8ce0ebf5cdeab392793bbe788bc858de47a66b0ef698c9aa94cefb1ac297f991a9ad5e3c2e267b531b48990d27c604adac0636d2722001 SHA512 dd75fd6a2f63ce296973c7052ebd199619c99805935e9e04a65b58b0de6053f51157233070f32a4731c43cb65e8d232051a0b5c26508256218ae63f11cd24f1b
+DIST systemd-249-rc2.tar.gz 10576295 BLAKE2B 4eb750dc3649f723c6b88185ad59ce1c7bf06d57982d0a85eba702a38b4031e21f61860f9f39f272b24fedf865a9a38cfef6844db6cee39e4cc9083d6b1f0ec8 SHA512 97570607fb3262cbcf9c956eb6a05d83877de411b6de90d2b359e85fa4cc0e14fe7efd6e71e135f9922374fb69ee7f328c3d2240bf736d0016b8fbb68e3f0725
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 EBUILD systemd-248.3-r1.ebuild 15199 BLAKE2B 9b9803595b04d9b1cb43f4e0bacd6f42b51c371d4d0e554aec40f3cf33006cc6863039dbd00d7a8672990e9074ad674c41b371240589c4108a259ec4911c3037 SHA512 94747763be930f606395c933a0050ff46d6996c75cf8acff4fe728efe1e5b1156754e04dab2572763154ea62f60d98d3d526f548af5f5451828122db92c6e24a
-EBUILD systemd-249_rc1-r1.ebuild 14879 BLAKE2B 40d794320467f5a82b19186d178637621410b3b6895b635b15056cc80ab9fb981eb2b9cac646fc6a7838dd4903b68d6473b39f71b8b8b34f20a71302cb3e39f6 SHA512 a398fbebf7be6625fa5c5025660787fefe978ff6166b16020df99f05e8a1a5e233760ea0d67b43ec321819dfdf14b39accffbb115d2b07bfaa96ecffd2c726cf
+EBUILD systemd-249_rc2.ebuild 14879 BLAKE2B 40d794320467f5a82b19186d178637621410b3b6895b635b15056cc80ab9fb981eb2b9cac646fc6a7838dd4903b68d6473b39f71b8b8b34f20a71302cb3e39f6 SHA512 a398fbebf7be6625fa5c5025660787fefe978ff6166b16020df99f05e8a1a5e233760ea0d67b43ec321819dfdf14b39accffbb115d2b07bfaa96ecffd2c726cf
 EBUILD systemd-9999.ebuild 14878 BLAKE2B d3c9b5a208993f8ebdbb111f5d99a1781f54e4cd1de27b95fc81a0b7a982ebd5593dc8dfab651067dd4aed7b3be1868bc71f454cfe50c6a5c9556ba28006f324 SHA512 7835f35a23c59a51903b23528b20b98bb7b973dbda7c4dc98e1fc9f38fda18043e55e71892987279fe2f84dd4b3e88f36d66ee53f9801afd381505a90c203be7
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-249_rc1-r1.ebuild b/sys-apps/systemd/systemd-249_rc2.ebuild
index a9e94af56ef5..a9e94af56ef5 100644
--- a/sys-apps/systemd/systemd-249_rc1-r1.ebuild
+++ b/sys-apps/systemd/systemd-249_rc2.ebuild
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 98077b438e9f..f92c788cf7cc 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,6 +1,6 @@
 DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
 DIST toybox-0.8.5.tar.gz 2378469 BLAKE2B 9054c07fd8bd477a4995b14fcea091a1602b039216ec9acb4f60e39eb10bba88924c19084c7e28d4c0b7cd72b0e0ab46a892cd427909e073dfad3e2f7416d600 SHA512 deb3743a10278ba236e95a1f3995555c745c2909381d2692a42920615c002a5cc6f9cccffee84ec2fcf1188d8f8c0a11e2b7f6a7798f0b7f5d33a0c1c3149237
-EBUILD toybox-0.8.4.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
-EBUILD toybox-0.8.5.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
-EBUILD toybox-9999.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
+EBUILD toybox-0.8.4-r1.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
+EBUILD toybox-0.8.5-r1.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
+EBUILD toybox-9999.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.8.4.ebuild b/sys-apps/toybox/toybox-0.8.4-r1.ebuild
index ca78edf8b366..888ca615d7a4 100644
--- a/sys-apps/toybox/toybox-0.8.4.ebuild
+++ b/sys-apps/toybox/toybox-0.8.4-r1.ebuild
@@ -19,6 +19,9 @@ HOMEPAGE="https://landley.net/code/toybox/"
 LICENSE="0BSD"
 SLOT="0"
 
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 	default
 	restore_config .config
diff --git a/sys-apps/toybox/toybox-0.8.5.ebuild b/sys-apps/toybox/toybox-0.8.5-r1.ebuild
index ca78edf8b366..888ca615d7a4 100644
--- a/sys-apps/toybox/toybox-0.8.5.ebuild
+++ b/sys-apps/toybox/toybox-0.8.5-r1.ebuild
@@ -19,6 +19,9 @@ HOMEPAGE="https://landley.net/code/toybox/"
 LICENSE="0BSD"
 SLOT="0"
 
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 	default
 	restore_config .config
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index ca78edf8b366..888ca615d7a4 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -19,6 +19,9 @@ HOMEPAGE="https://landley.net/code/toybox/"
 LICENSE="0BSD"
 SLOT="0"
 
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 	default
 	restore_config .config