gentoo resync : 18.05.2019

5 files changed, 89 insertions, 3 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 867fc053858f..74777b29e023 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,7 @@
 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 AUX 241-version-dep.patch 5015 BLAKE2B 63a2f591c6199787cabc5af4c0df14c76e8dba189ca2d69cf539b13a0187fb7f29f7d6a2550b7eee046859d99c9b4de4af11573c624787968a8041e210d8bc75 SHA512 22667683fdec5b92d9dd7afe40930d7483f3025b24152a6d0f9497ac81e9e2a75b467d2b02770d2321ea53236444b5d01217b6f97d725913974ebd2522c6ac58
+AUX 242-gcc-9.patch 1676 BLAKE2B ed0151821dd695faaecaf3b7eeb5b6765d335b2e355c835d03c64c93c1920981ffad15b50ad1d2ef356b416173c6a53a0e4adbb6f40bbd6688655e622472358d SHA512 a1502ff4dd6b66952791676781bc8a2d8db4bd41123345e42d1eb2f99cca4f53d70a35e96306df4a8aec2f3b50be177a12bd67c88133373b54e7985121a7a435
+AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
 AUX CVE-2019-6454.patch 6017 BLAKE2B 8feefe11f44e4136c5fcf87160197bfbc0557d5097bc12275411887005bed1fe56a532d114e2e49527a7f35016a6b5fc04cb1086b33445402ace21eb880c02e9 SHA512 ff84ae9a043f17fd78c7fc499fe532c4d3b46dbe34f24c8289c209a026c1eda20de3ba46b67c8a5b14e9889e6362a4fb2097d550e6bcdb5182455fc569e23224
 AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch 1848 BLAKE2B 348c35881ce039f92d8fc8dc8c87af2efa95696afbe79ad8fc4e01129524bdf28b529ab86ec611d08446e589176c0678018d94d8c5fc068c65ab4eb429746cf9 SHA512 693afe328ebc20d34cbf07c632a8da90ee293147e793a599a4d2aac6f757738bfab93048a2f8ed6e68d16f865e9b4112e737c692ad01c7d4946f8c430714161d
 AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460
@@ -14,7 +16,7 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 EBUILD systemd-239-r4.ebuild 13317 BLAKE2B d62f39c9d3ed7ae40c5d04ab463dc1e14140bf9a7b55292906420c088549ace6e491aa1fc598cc274c4518824e419a3d8067d5ea491a7736fc075393d3f68b88 SHA512 3fefb4eb2a28e511cfaba5f076fbbb63358b9adeaed5dce8afa289da7b8295fe793dd2f32a5dd58b84a4fabecf4a138bda6f7d4ed0719acc47a3bffaff2ad446
-EBUILD systemd-241-r1.ebuild 13776 BLAKE2B bfdb34f1d71b5fc1c3806a26ee7c5f771ed2b36309f14dc1d2314ae476148b7eeefe984b97951144bb17b2b9ea276bacde6aaa245477f1a8acc1e97c2795118b SHA512 92448034ad82c0900ede656e50d6594cfc4a4836e3d1246bf74efd49912ec3c3b7cd8be3b3bb112f60eb59b56c7d6feb69e93b54fa2f1ddf2e45aa3903a8a8bc
-EBUILD systemd-242.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
+EBUILD systemd-241-r1.ebuild 13807 BLAKE2B bed17c8e35d3936f67fa538a314c716d7fbeb0b3e7057024f5cf5c0080b27f9f8e3739e47b419125e78b2f7f67d555b82e4155e7eecb0bd8b7ada58480f24428 SHA512 6cd80e98c0104cd7807fc0ddbe5e59a7558743cf98caaa40a84786caa5919603e683c3ca11f8ad215e3290ddd4fdc67988ef90fd4b9ff5ec12eb80adbe116729
+EBUILD systemd-242-r1.ebuild 13756 BLAKE2B a8dd25392b38e683e2b46c1b50efc3dfd46235ae4aa64432c891525bd17044645cf6917c73461b9ff534f5f803e9214c47892f0e89ec0e6b08babdbac288ebf5 SHA512 7fe988fb7df8f11a681376894e8d343ceb141f86ec85136388585b5318d1bfa490682eff5e24b64477dd78cbe562c1324875c048e4c946eab151e891bd0dac0b
 EBUILD systemd-9999.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
 MISC metadata.xml 2125 BLAKE2B fed24f3b56a79016c4df8554626c7ae67ff50f97adb9af809a726b226c52690642f9df71b22eab320d3964d764dec1439009d8b8bf6979e407a5704e843829d2 SHA512 414d069185451f72eb1e803da7019da8800b08eade46824620632d795007bdec0e9201af93bb895674e3c48907593062610eb2f22f20ac15d099a593b450b8de
diff --git a/sys-apps/systemd/files/242-gcc-9.patch b/sys-apps/systemd/files/242-gcc-9.patch
new file mode 100644
index 000000000000..e12d65718238
--- /dev/null
+++ b/sys-apps/systemd/files/242-gcc-9.patch
@@ -0,0 +1,35 @@
+From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 7 May 2019 13:46:55 +0200
+Subject: [PATCH] network: remove redunant link name in message
+
+Fixes #12454.
+
+gcc was complaining that the link->ifname argument is NULL. Adding
+assert(link->ifname) right before the call has no effect. It seems that
+gcc is confused by the fact that log_link_warning_errno() internally
+calls log_object(), with link->ifname passed as the object. log_object()
+is also a macro and is does a check whether the passed object is NULL.
+So we have a check if something is NULL right next an unconditional use
+of it where it cannot be NULL. I think it's a bug in gcc.
+
+Anyway, we don't need to use link->ifname here. log_object() already prepends
+the object name to the message.
+---
+ src/network/networkd-link.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 533193ac932..6fc82940033 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
+ 
+         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
+         if (r < 0)
+-                log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
+-                                       enable_disable(!disabled), link->ifname);
++                log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
+         else
+                 log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
+ 
diff --git a/sys-apps/systemd/files/242-socket-util-flush-accept.patch b/sys-apps/systemd/files/242-socket-util-flush-accept.patch
new file mode 100644
index 000000000000..4849c4c0789e
--- /dev/null
+++ b/sys-apps/systemd/files/242-socket-util-flush-accept.patch
@@ -0,0 +1,46 @@
+From f3d75364fbebf2ddb6393e54db5e10b6f6234e14 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 18 Apr 2019 15:13:54 +0200
+Subject: [PATCH] socket-util: make sure flush_accept() doesn't hang on
+ unexpected EOPNOTSUPP
+
+So apparently there are two reasons why accept() can return EOPNOTSUPP:
+because the socket is not a listening stream socket (or similar), or
+because the incoming TCP connection for some reason wasn't acceptable to
+the host. THe latter should be a transient error, as suggested on
+accept(2). The former however should be considered fatal for
+flush_accept(). Let's fix this by explicitly checking whether the socket
+is a listening socket beforehand.
+---
+ src/basic/socket-util.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
+index 904bafb76f9..e787d53d8f4 100644
+--- a/src/basic/socket-util.c
++++ b/src/basic/socket-util.c
+@@ -1225,9 +1225,22 @@ int flush_accept(int fd) {
+                 .fd = fd,
+                 .events = POLLIN,
+         };
+-        int r;
++        int r, b;
++        socklen_t l = sizeof(b);
++
++        /* Similar to flush_fd() but flushes all incoming connection by accepting them and immediately
++         * closing them.  */
++
++        if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &b, &l) < 0)
++                return -errno;
+ 
+-        /* Similar to flush_fd() but flushes all incoming connection by accepting them and immediately closing them. */
++        assert(l == sizeof(b));
++        if (!b) /* Let's check if this is a socket accepting connections before calling accept(). That's
++                 * because accept4() can return EOPNOTSUPP in the fd we are called on is not a listening
++                 * socket, or in case the incoming TCP connection transiently triggered that (see accept(2)
++                 * man page for details). The latter case is a transient error we should continue looping
++                 * on. The former case however is fatal. */
++                return -ENOTTY;
+ 
+         for (;;) {
+                 int cfd;
diff --git a/sys-apps/systemd/systemd-241-r1.ebuild b/sys-apps/systemd/systemd-241-r1.ebuild
index e136800d0694..a6ba1136fd72 100644
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ b/sys-apps/systemd/systemd-241-r1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
@@ -169,6 +169,7 @@ src_prepare() {
 		"${FILESDIR}"/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
 		"${FILESDIR}"/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
 		"${FILESDIR}"/241-version-dep.patch
+		"${FILESDIR}"/242-gcc-9.patch
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-242.ebuild b/sys-apps/systemd/systemd-242-r1.ebuild
index 201667ade310..a26267273852 100644
--- a/sys-apps/systemd/systemd-242.ebuild
+++ b/sys-apps/systemd/systemd-242-r1.ebuild
@@ -170,6 +170,8 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}"/242-gcc-9.patch
+		"${FILESDIR}"/242-socket-util-flush-accept.patch
 	)
 
 	if ! use vanilla; then