gentoo resync : 07.08.2021

5 files changed, 132 insertions, 11 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 319b0f2a6d56..c6a796dd507e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,8 +1,10 @@
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
+AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-EBUILD udev-248.ebuild 5475 BLAKE2B 70b628ed25d8f5b39c556e680bece42604ba30ff083fe7e0f2e77a677dc8f89a7aafcea7fadfec4f756aad03c0f9b19dae34f1a43bff724444fa429d55ab183d SHA512 1954e732be787b8a9b9454ae0987bbc2276de6b7e71ec8d260d5e1c835bb9a1f68c04843709f42c791e58ad43c70f5146f5faeaf1e776353119b5ad15404d901
-EBUILD udev-249-r1.ebuild 5776 BLAKE2B 909f1699e70b77b0347f35fa3353cc16021870aea15fbdf4faca6623327a22237ca78a9891e4e141cf72ae682023611155234cac4fb6008e6ccc1cfb97d9eef5 SHA512 1ec11b20403555deb4d7725289af1a214550aa92d3aea2d39807a1d26a73764e499eed1b3b8deec9300e406c5eb9efab24ae01d365fb9055728660b2c74bacba
-EBUILD udev-9999.ebuild 5735 BLAKE2B 7847f1af44dd1dd3b85b9144c690066260297ab2beba5cc86be946838f3a07b7976b108629f8d50424b6cc3bfe37e60c3ed87262a44465d42c68c689fb70db16 SHA512 68ee2e626625d6fbd7c7747b0e6788329b3a81015ebe3f6db1d65bc3bca8cbe8e56792ffe2a9acb736395c2549d0f6969f1fadd2cd00eec950ed5726674c05dd
+DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
+EBUILD udev-248-r1.ebuild 5468 BLAKE2B 65d07077600d16deb4970920dd728698f3d4b8c58f457e8df7167a2fe3c31ae4b8ad2a45b4d3fac4480c1a3a90e4376c22996d94909463df018543af09333fef SHA512 f73fefbcca00081271756322c19fe959cf2548a4e4a27af88e5b6eece368e0760b98465659106c884f8c16cba3f7a337e7b8c22c82ff575eebd7a6c38f5e0ab9
+EBUILD udev-249-r2.ebuild 7289 BLAKE2B 2a67bb851bbf65c6b99dd5fed6d7926e6ae83e0ff0574cb2919afb1c0bc8dee874d52aa0719235fc6ce0ee63ffb1b3e507d51696e62d7a6d8a1b35be27148ad9 SHA512 1e8bd32d7590bfcf90e9aaf1758776e906477f747848d7d99c6aa28797fcfb3ae60d9fc9e238c46d1713f1b2fe76cfbbb550b175e3be8c010e29cc18e25d0e4c
+EBUILD udev-9999.ebuild 5728 BLAKE2B f46125da6569e41064abe7a6e2e0bbdd53d112bf1a6f1894e9682952c68df60cf2b81ea262c21d52e7abd45f0a6ee95af157d15dcc621ab03d902a00b0d5c452 SHA512 46c5ec30be014a9d2b27fba94af74c500e506f6b4a813f8195b622ce702711a70e7c0706be5f1607ccc61f94e2bd2e4776c4277d035982a8352cb07cf889fa33
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/files/249-sys-include-posix.patch b/sys-fs/udev/files/249-sys-include-posix.patch
new file mode 100644
index 000000000000..6d9e0039b9c9
--- /dev/null
+++ b/sys-fs/udev/files/249-sys-include-posix.patch
@@ -0,0 +1,67 @@
+Silence annoying #warning's on musl
+
+https://github.com/systemd/systemd/pull/20362
+https://github.com/systemd/systemd/pull/20364
+
+From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 2 Aug 2021 12:41:38 +0200
+Subject: [PATCH] Use correct `<fcntl.h>` include
+
+* `<sys/fcntl.h>` is not specified in POSIX
+---
+ src/basic/fileio.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/fileio.h b/src/basic/fileio.h
+index af797cfafdbf..4295b84a85c5 100644
+--- a/src/basic/fileio.h
++++ b/src/basic/fileio.h
+@@ -2,11 +2,11 @@
+ #pragma once
+ 
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+-#include <sys/fcntl.h>
+ #include <sys/types.h>
+ 
+ #include "macro.h"
+From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 2 Aug 2021 16:09:10 +0200
+Subject: [PATCH] Use correct `<poll.h>` include
+
+* `<sys/poll.h>` is not specified in POSIX
+---
+ src/shared/nscd-flush.c | 2 +-
+ src/shared/varlink.c    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c
+index dfc47c423441..19e16d93455c 100644
+--- a/src/shared/nscd-flush.c
++++ b/src/shared/nscd-flush.c
+@@ -1,5 +1,5 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "fd-util.h"
+ #include "io-util.h"
+diff --git a/src/shared/varlink.c b/src/shared/varlink.c
+index 3a53c16a7242..4033947d3b8c 100644
+--- a/src/shared/varlink.c
++++ b/src/shared/varlink.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
+ #include <malloc.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "alloc-util.h"
+ #include "errno-util.h"
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248-r1.ebuild
index 090111f3ac0d..f8a443b31f96 100644
--- a/sys-fs/udev/udev-248.ebuild
+++ b/sys-fs/udev/udev-248-r1.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test"
 
 BDEPEND="
 	dev-util/gperf
-	>=dev-util/intltool-0.50
+	sys-devel/gettext
 	>=sys-apps/coreutils-8.16
 	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r2.ebuild
index 4b808e917a4d..e6d857dcefb5 100644
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ b/sys-fs/udev/udev-249-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
-inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
 
 if [[ ${PV} = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -22,18 +22,25 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
+# musl patches taken from:
+# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+SRC_URI+="
+	elibc_musl? (
+		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
+		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
+	)"
+
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
+IUSE="acl +kmod selinux static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/gperf
-	>=dev-util/intltool-0.50
+	sys-devel/gettext
 	>=sys-apps/coreutils-8.16
 	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2
@@ -42,6 +49,10 @@ BDEPEND="
 	dev-libs/libxslt
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	test? (
+		app-text/tree
+		dev-lang/perl
+	)
 "
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -100,8 +111,11 @@ pkg_setup() {
 
 src_prepare() {
 	local PATCHES=(
+		# backport from 250 to silence musl warnings
+		"${FILESDIR}/249-sys-include-posix.patch"
 		"${FILESDIR}/249-libudev-static.patch"
 	)
+	use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches )
 
 	default
 }
@@ -120,6 +134,7 @@ multilib_src_configure() {
 		# Prevent automagic deps
 		-Dgcrypt=false
 		-Dlibcryptsetup=false
+		-Didn=false
 		-Dlibidn=false
 		-Dlibidn2=false
 		-Dlibiptc=false
@@ -128,6 +143,12 @@ multilib_src_configure() {
 		-Dlz4=false
 		-Dxz=false
 	)
+	use elibc_musl && emesonargs+=(
+		-Dgshadow=false
+		-Dsmack=false
+		-Dutmp=false
+	)
+
 	meson_src_configure
 }
 
@@ -135,6 +156,9 @@ src_configure() {
 	# Prevent conflicts with i686 cross toolchain, bug 559726
 	tc-export AR CC NM OBJCOPY RANLIB
 	python_setup
+
+	use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0
+
 	multilib-minimal_src_configure
 }
 
@@ -172,6 +196,34 @@ multilib_src_compile() {
 	eninja "${targets[@]}"
 }
 
+multilib_src_test() {
+	# The testsuite is *very* finicky. Don't try running it in
+	# containers or anything but a full VM or on bare metal.
+	# udev calls 'mknod' a number of times, and this interacts
+	# badly with kernel namespaces.
+
+	if [[ ${EUID} -ne 0 ]]; then
+		ewarn "udev tests need to run under uid 0"
+		ewarn "Skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "udev tests needs full access to /dev"
+		ewarn "Skipping tests"
+	else
+		einfo Running tests
+
+		# two binaries required by udev-test.pl
+		eninja systemd-detect-virt test-udev
+		local -x PATH="${PWD}:${PATH}"
+
+		# prepare ${BUILD_DIR}/test/sys, required by udev-test.pl
+		"${EPYTHON}" "${S}"/test/sys-script.py test || die
+
+		# the perl script contains all the udev tests
+		"${S}"/test/udev-test.pl || die
+	fi
+}
+
 multilib_src_install() {
 	local libudev=$(readlink libudev.so.1)
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 9cb8cd5f731a..8cc1075e8be7 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test"
 
 BDEPEND="
 	dev-util/gperf
-	>=dev-util/intltool-0.50
+	sys-devel/gettext
 	>=sys-apps/coreutils-8.16
 	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2