Re: [OE-core] [PATCH 4/9] iputils: update 20210202 -> 20210722
From: Martin Jansa <hidden>
Date: 2021-08-03 22:04:33
This upgrade causes iputils to fail building on hosts without ip: ../git/ping/meson.build:38:0: ERROR: Program or command 'ip' not found or not executable It would need https://github.com/iputils/iputils/commit/3163c49f9f4ad473a00d8a345ee334a028376011 and -DSKIP_TESTS=true On Fri, Jul 30, 2021 at 1:45 PM Alexander Kanavin [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Drop rdisc part from 0001-rarpd-rdisc-Drop-PrivateUsers.patch as it's been fixed upstream; rarpd still isn't. Signed-off-by: Alexander Kanavin <redacted> --- .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 31 ++++--------------- ...putils_20210202.bb => iputils_20210722.bb} | 2 +- 2 files changed, 7 insertions(+), 26 deletions(-) rename meta/recipes-extended/iputils/{iputils_20210202.bb => iputils_20210722.bb} (98%) diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch index d7367caf78..c61e39dc80 100644 --- a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch@@ -1,20 +1,20 @@ -From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Thu, 13 Feb 2020 06:08:45 +0000 -Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers +Subject: [PATCH] rarpd:Drop PrivateUsers -Neither rarpd nor rdisc can gain the necessary capabilities with +rarpd cannot gain the necessary capabilities with PrivateUsers enabled. Upstream-Status: Pending Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> + --- systemd/rarpd.service.in | 1 - - systemd/rdisc.service.in | 3 ++- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 deletion(-) diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in -index e600c10c93e6..f5d7621a7ce8 100644 +index e600c10..f5d7621 100644 --- a/systemd/rarpd.service.in +++ b/systemd/rarpd.service.in @@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW@@ -25,22 +25,3 @@ index e600c10c93e6..f5d7621a7ce8 100644 ProtectSystem=strict ProtectHome=yes ProtectControlGroups=yes -diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in -index 4e2a1ec9d0e5..a71b87d36b37 100644 ---- a/systemd/rdisc.service.in -+++ b/systemd/rdisc.service.in -@@ -8,9 +8,10 @@ After=network.target - EnvironmentFile=-/etc/sysconfig/rdisc - ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS - -+CapabilityBoundingSet=CAP_NET_RAW - AmbientCapabilities=CAP_NET_RAW - PrivateTmp=yes --PrivateUsers=yes -+DynamicUser=yes - ProtectSystem=strict - ProtectHome=yes - ProtectControlGroups=yes --- -2.17.1 -diff --git a/meta/recipes-extended/iputils/iputils_20210202.bbb/meta/recipes-extended/iputils/iputils_20210722.bb similarity index 98% rename from meta/recipes-extended/iputils/iputils_20210202.bb rename to meta/recipes-extended/iputils/iputils_20210722.bb index 02a303782e..b5a774073e 100644--- a/meta/recipes-extended/iputils/iputils_20210202.bb +++ b/meta/recipes-extended/iputils/iputils_20210722.bb@@ -13,7 +13,7 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " -SRCREV = "cc16da6b574ce6637f3e6e9ab3c1a728663006ff" +SRCREV = "71bb2a6c72e9f658e90ac618c73d873a76bbaa81" S = "${WORKDIR}/git" --2.31.1