gentoo resync : 12.07.2021

6 files changed, 83 insertions, 6 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b3fc8ad7e8fd..aa4a8ed19045 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,5 @@
+AUX 249-hostnamed-error-variable.patch 1987 BLAKE2B 80f5d2518c4012f3c4011964896dc6f16ce7e799f82e0f0deb287e0b9fc880facf608deae740b6adef66f8c61645b16881b91d2b258ae69a62483cb2a99dc954 SHA512 fac633b3165497bbd3a7212fae3e67580bba5e48ff1ae4990d4831ac142384641cf5c3e70da2612d467a4ea4712c712c019f22a2d759d16cb9d3bd1e2af5dc8f
+AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0
@@ -6,7 +8,7 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
-EBUILD systemd-248.3-r1.ebuild 15192 BLAKE2B 799a00c488d832569392e3f6fdfd95abb529122b6084b392a8eeefbbb2b21a58d2e96439fbf33ab97b78792a412a28ffe49194b8cd249d282e8af1826a265752 SHA512 0abc8db451e49093ca9e352a0da22b33130df0bbf219a87ce2323dbb8b08d87c5e4546da76b3cc158f9ea3d56eab847a58b118bcda93902487d8000b73485f62
-EBUILD systemd-249.ebuild 14857 BLAKE2B adb4a4628071b11408d5430eb2d6c6e632589d56f68bea0d9c98475fe51336944bb5c1ad9796b95a4d326ab00491917dc28079a922b6c859123bc1e7463da6fc SHA512 a38d4cdbfbc4a524057dbd13dfdb5ce5bdb1c6b607ad25832fa3dae47ef63536683c11327d3fa7287d6544a9003fd1b725cf150822f5e7b041c0e5e74577e188
-EBUILD systemd-9999.ebuild 14857 BLAKE2B adb4a4628071b11408d5430eb2d6c6e632589d56f68bea0d9c98475fe51336944bb5c1ad9796b95a4d326ab00491917dc28079a922b6c859123bc1e7463da6fc SHA512 a38d4cdbfbc4a524057dbd13dfdb5ce5bdb1c6b607ad25832fa3dae47ef63536683c11327d3fa7287d6544a9003fd1b725cf150822f5e7b041c0e5e74577e188
+EBUILD systemd-248.3-r1.ebuild 15147 BLAKE2B 0b80d3da5bda9497d35d76c791c165f9f4ec3ad2ad012cb487e3f69b3decf23de57d2755675b65e99471960928df80d9db52d63473ac82fff0a7703aff817a19 SHA512 626f66cf8b8018870b53b623fc68170c150a9c3e7b18cfd022d2d4e1f5d49582d7bcf5da23633a8b9fc1741182aabc715a4b2865df811149889d49d6ad7b3243
+EBUILD systemd-249-r3.ebuild 14904 BLAKE2B 653d9a76594ed8bd16e3b4047399dd6cffd45199d162d43c8631f9824071b23e468c8925b69509ea14b0749b79db883f9c4fd5d41f8d96f4bc91dcc2e82c7866 SHA512 0498a15ac9d8d15b9c3f639bd85f15015e3c2a87c44cf67b05a9f4eaa84602058967b70736046397a83ff69bfa90e75771a8398c87aac0d4729264fd65440fdf
+EBUILD systemd-9999.ebuild 14812 BLAKE2B aee682e4b01400bd2fd3b347be8f219014681e2ce314ec64bc0d51c9187e1c06239efef9985b7c88580ec29e333f3ac959ab8df7d943b5be0ea3c3e3b7b1948f SHA512 0199f497a1d5607f7b1f751efdac6eed18eff34b1d6e8276bf6004778006cba09fe0cbc952e6a178efa44d77f959a2e8f6080c9cce6fa3f2b39097ff6bd59d8b
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/files/249-hostnamed-error-variable.patch b/sys-apps/systemd/files/249-hostnamed-error-variable.patch
new file mode 100644
index 000000000000..7fe7af73a003
--- /dev/null
+++ b/sys-apps/systemd/files/249-hostnamed-error-variable.patch
@@ -0,0 +1,50 @@
+From 105a4245ff13d588e1e848e8ee3cffd6185bd0ae Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Thu, 8 Jul 2021 00:23:21 +0200
+Subject: [PATCH] hostnamed: correct variable with errno in fallback_chassis
+
+fixes assertion failure on arm:
+
+systemd-hostnamed[642]: Assertion '(_error) != 0' failed at src/hostname/hostnamed.c:207, function fallback_chassis(). Aborting.
+---
+ src/hostname/hostnamed.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
+index bd535ddc4d80..36702f2fb0cd 100644
+--- a/src/hostname/hostnamed.c
++++ b/src/hostname/hostnamed.c
+@@ -204,14 +204,14 @@ static const char* fallback_chassis(void) {
+ 
+         r = read_one_line_file("/sys/class/dmi/id/chassis_type", &type);
+         if (r < 0) {
+-                log_debug_errno(v, "Failed to read DMI chassis type, ignoring: %m");
++                log_debug_errno(r, "Failed to read DMI chassis type, ignoring: %m");
+                 goto try_acpi;
+         }
+ 
+         r = safe_atou(type, &t);
+         free(type);
+         if (r < 0) {
+-                log_debug_errno(v, "Failed to parse DMI chassis type, ignoring: %m");
++                log_debug_errno(r, "Failed to parse DMI chassis type, ignoring: %m");
+                 goto try_acpi;
+         }
+ 
+@@ -260,14 +260,14 @@ static const char* fallback_chassis(void) {
+ try_acpi:
+         r = read_one_line_file("/sys/firmware/acpi/pm_profile", &type);
+         if (r < 0) {
+-                log_debug_errno(v, "Failed read ACPI PM profile, ignoring: %m");
++                log_debug_errno(r, "Failed read ACPI PM profile, ignoring: %m");
+                 return NULL;
+         }
+ 
+         r = safe_atou(type, &t);
+         free(type);
+         if (r < 0) {
+-                log_debug_errno(v, "Failed parse ACPI PM profile, ignoring: %m");
++                log_debug_errno(r, "Failed parse ACPI PM profile, ignoring: %m");
+                 return NULL;
+         }
+ 
diff --git a/sys-apps/systemd/files/249-libudev-static.patch b/sys-apps/systemd/files/249-libudev-static.patch
new file mode 100644
index 000000000000..73375b716e9b
--- /dev/null
+++ b/sys-apps/systemd/files/249-libudev-static.patch
@@ -0,0 +1,26 @@
+From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 9 Jul 2021 13:05:23 -0400
+Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc
+
+This resolves a failure when linking cryptsetup.static against libudev.a.
+
+```
+libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static -O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o src/utils_blockdev.o src/cryptsetup.o -pthread -pthread  -Wl,--as-needed ./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl -lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o): in function `sd_is_mq':
+(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr'
+```
+---
+ src/libudev/libudev.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
+index 89028aaa6bf2..1d6487fa4084 100644
+--- a/src/libudev/libudev.pc.in
++++ b/src/libudev/libudev.pc.in
+@@ -16,4 +16,5 @@ Name: libudev
+ Description: Library to access udev device information
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -ludev
++Libs.private: -lrt -pthread
+ Cflags: -I${includedir}
diff --git a/sys-apps/systemd/systemd-248.3-r1.ebuild b/sys-apps/systemd/systemd-248.3-r1.ebuild
index a6e3d207945c..cbf86f5cc09b 100644
--- a/sys-apps/systemd/systemd-248.3-r1.ebuild
+++ b/sys-apps/systemd/systemd-248.3-r1.ebuild
@@ -319,7 +319,6 @@ multilib_src_configure() {
 		$(meson_native_true vconsole)
 
 		# static-libs
-		$(meson_use static-libs static-libsystemd)
 		$(meson_use static-libs static-libudev)
 	)
 
diff --git a/sys-apps/systemd/systemd-249.ebuild b/sys-apps/systemd/systemd-249-r3.ebuild
index 7b82142e7ac7..d11da3bdbde0 100644
--- a/sys-apps/systemd/systemd-249.ebuild
+++ b/sys-apps/systemd/systemd-249-r3.ebuild
@@ -218,6 +218,8 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}/249-hostnamed-error-variable.patch"
+		"${FILESDIR}/249-libudev-static.patch"
 	)
 
 	if ! use vanilla; then
@@ -321,7 +323,6 @@ multilib_src_configure() {
 		$(meson_native_true vconsole)
 
 		# static-libs
-		$(meson_use static-libs static-libsystemd)
 		$(meson_use static-libs static-libudev)
 	)
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7b82142e7ac7..714f276a62f0 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -321,7 +321,6 @@ multilib_src_configure() {
 		$(meson_native_true vconsole)
 
 		# static-libs
-		$(meson_use static-libs static-libsystemd)
 		$(meson_use static-libs static-libudev)
 	)