gentoo resync : 13.11.2021

6 files changed, 83 insertions, 95 deletions

diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index e6a048a897b5..0152bd69a718 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,13 +1,12 @@
 AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f
-AUX musl-1.2.2.patch 656 BLAKE2B 73abdd679bfb99f8085e3341a80059f62e836622c765c89d4d0e8123f8ad391eca5a0eacf006f1a92bcfce278e806bc565972c2cf2b0c08862a4bcda4799d7f1 SHA512 a72ebb54d7f7b2ba9fbfcae1a6d03ff5bc0511923429502e1dd1c19bb57b06b184e0c762a5b9a9d824a72c2a3e293f7805b7f0cd7be9b8b4d9be676b39c7604d
 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
+AUX systemd-tmpfiles-249.2-meson-0.60.patch 867 BLAKE2B 9bc6279989dabcef766da3b46113d29547c4146a38e52c440093229462bf781e431cb8770ab1808c13fd81a196df913da6eaf1abb6bf127439237228b5af6d1d SHA512 9b690693e003f30d30d4341a395bb7c28d0c0cf0117ae1bb0844f52aef3937723eb8a42120d4f4777dbad2243e49b2e771892e6157d0e930831982ff96ccffa3
 DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
-DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4822 BLAKE2B 26d1a3b13c66b8cada48736564bc834c403f94c7a76cd9806eff5f0013d727315f8e5aadd3d05468ac0c24124275065cb8b43af1002910adaf21e32c2d921df7 SHA512 0f10d4604791bd20fed0816ae6560db3d04ed2a447f2735606934d479c979389b199c9609d9401a517974e78e7d8b2d8591d547e0b9a8708636e7156dc3e6f16
-EBUILD systemd-tmpfiles-249.2.ebuild 6075 BLAKE2B 380ff032064d6890f5bc98345f8f94ad2abe73ada324ba163e59dd7ba9c25d7a8c1bedd3b2b3e6865fa7519af93a71d2dc0adba268c92f02f0694cc895a3be71 SHA512 45154a06b18612995465302836817a8a16ab65eddbde752ca2d4c8d9f6e5f705caad14442123a48702cfaffb6d4de1e328f9f13fbb8e78e871b12b03f8579c58
+DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
+EBUILD systemd-tmpfiles-249.2.ebuild 6112 BLAKE2B fbb96ea7d801712fdfccdbb5dff9c9a834b62b4cfa89b768f62552786b3bb4ce6f4cb41aa222959f4ac19c08728c1af25908e7de48ea781140a7eaefff0ac826 SHA512 dba3880866c5eb033a38fbff1728f4a327cf5e0e737ad20d9cbb4d3305ad39122dcfca243b9024bc16c6f06a47c1fb13072505d34d8bfe02288a3b29b65b97be
+EBUILD systemd-tmpfiles-249.5.ebuild 5975 BLAKE2B 8ef548ba4bab67dcce2d36c3375a15adb7e3418bfc57c3836500a5c89b04ae6315af9efc5be9333313740227979fc3da81df0b6962079f83c08c9ec506b90fa0 SHA512 9989518772b4fb4edd3c212e4a850575f4588928f68624d08dde126ac9a2afd4a73d9a6e1739f77c564532bca3fff382aff524652bf3314b4e8c45e64a904c41
 MISC metadata.xml 361 BLAKE2B 51c4e3dcb18cea86f9508c51e534a670e92e81aefe8e04af436f279d3158999d6dd8836dd53abcd4b35cacfeffff829a4157d2a63ce08d4eea62791b6761feb4 SHA512 6645f474e642a386927ae353561fadda273327321705500ddb8de14ed53f94788d782680b4b765c5da0151395a9f3f3c9bea2726c05cb79e52ee26a6e033c63f
diff --git a/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch b/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch
deleted file mode 100644
index dc8905d5aabc..000000000000
--- a/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index bea9935..03b40f2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -510,7 +510,8 @@ foreach ident : [
-                                  #include <sys/stat.h>
-                                  #include <unistd.h>'''],
-         ['explicit_bzero' ,   '''#include <string.h>'''],
--        ['reallocarray',      '''#include <malloc.h>'''],
-+        ['reallocarray',      '''#include <malloc.h>
-+                                 #include <stdlib.h>'''],
-         ['set_mempolicy',     '''#include <stdlib.h>
-                                  #include <unistd.h>'''],
-         ['get_mempolicy',     '''#include <stdlib.h>
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
deleted file mode 100644
index ea97b909022e..000000000000
--- a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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/files/systemd-tmpfiles-249.2-meson-0.60.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch
new file mode 100644
index 000000000000..b931912be23e
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch
@@ -0,0 +1,26 @@
+https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f
+https://bugs.gentoo.org/821547
+
+From: Dan Streetman <ddstreet@canonical.com>
+Date: Fri, 3 Sep 2021 12:43:33 -0400
+Subject: [PATCH] meson.build: change operator combining bools from + to and
+
+upstream meson stopped allowing combining boolean with the plus
+operator, and now requires using the logical and operator
+
+reference:
+https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c
+
+Fixes: #20632
+--- a/meson.build
++++ b/meson.build
+@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
+ 
+ want_ossfuzz = get_option('oss-fuzz')
+ want_libfuzzer = get_option('llvm-fuzz')
+-if want_ossfuzz + want_libfuzzer > 1
++if want_ossfuzz and want_libfuzzer
+         error('only one of oss-fuzz or llvm-fuzz can be specified')
+ endif
+ 
+
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
index a651892d8e0b..ad80dc82cf86 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
@@ -62,6 +62,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=(
 	# backport from 250 to silence musl warnings
 	"${FILESDIR}/249-sys-include-posix.patch"
+	"${FILESDIR}/${P}-meson-0.60.patch"
 )
 
 python_check_deps() {
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
index e88b531fdb79..68d31c3828ba 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
@@ -3,18 +3,28 @@
 
 EAPI=7
 
+if [[ ${PV} == *.* ]]; then
+	MY_PN=systemd-stable
+else
+	 MY_PN=systemd
+fi
+
 MINKV="3.11"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit meson python-any-r1
+MUSL_PATCHSET="${PV}-r1"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic meson python-any-r1
 
 DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz
-	elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/${P}-musl.tar.xz )"
+SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
+	elibc_musl? (
+		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+	)"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
@@ -35,19 +45,29 @@ DEPEND="
 
 BDEPEND="
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
+	dev-libs/libxslt
 	dev-util/gperf
 	>=dev-util/meson-0.46
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
-	sys-devel/m4
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/systemd-${PV}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${EPREFIX} ]]; then
+		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
+	fi
+}
 
 pkg_setup() {
 	python-any-r1_pkg_setup
@@ -56,20 +76,32 @@ pkg_setup() {
 src_prepare() {
 	# musl patchset from:
 	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
+	# we share patch tarball with sys-fs/udev
 	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
+		einfo "applying musl patches and workarounds"
+		eapply "${WORKDIR}/musl-patches"
+
+		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
+		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
+
+		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
+		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
+		# not a nice workaround, but it comes from debug messages and we don't really use this component.
+		append-cflags '-Wno-error=format'
 	fi
+
 	default
 
 	# https://bugs.gentoo.org/767403
 	python_fix_shebang src/test/*.py
+	python_fix_shebang test/*.py
 	python_fix_shebang tools/*.py
 }
 
 src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles"
+	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
+	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
 	local systemd_disable_options=(
 		adm-group
 		analyze
@@ -115,9 +147,11 @@ src_configure() {
 		machined
 		microhttpd
 		networkd
+		nscd
 		nss-myhostname
 		nss-resolve
 		nss-systemd
+		oomd
 		openssl
 		p11kit
 		pam
@@ -131,6 +165,7 @@ src_configure() {
 		rfkill
 		seccomp
 		smack
+		sysext
 		sysusers
 		timedated
 		timesyncd
@@ -153,6 +188,7 @@ src_configure() {
 	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
 
 	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
 		-Dacl=true
 		-Dtmpfiles=true
 		-Dstandalone-binaries=true # this and below option does the magic
@@ -165,7 +201,7 @@ src_configure() {
 }
 
 src_compile() {
-	# tmpfiles and sysusers can be built as standalone, link systemd-shared in statically.
+	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
 	# https://github.com/systemd/systemd/pull/16061 original implementation
 	# we just need to pass -Dstandalone-binaries=true and
 	# use <name>.standalone target below.
@@ -199,11 +235,11 @@ src_install() {
 
 src_test() {
 	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" src/test/test-systemd-tmpfiles.py \
+	"${EPYTHON}" test/test-systemd-tmpfiles.py \
 		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
 }
 
-# adapted from opentmpfiles ebuild
+# stolen from opentmpfiles ebuild
 add_service() {
 	local initd=$1
 	local runlevel=$2