summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-07-30 13:45:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commit3665b46e5ff5014110f427e681c11134e61963d7 (patch)
tree0d1e360474f93352126cef028f9fbb0aeca8a79b /meta/recipes-extended
parent0b46f264a4c2e8cb75958a81a25a87830db726aa (diff)
downloadpoky-3665b46e5ff5014110f427e681c11134e61963d7.tar.gz
iputils: update 20210202 -> 20210722
Drop rdisc part from 0001-rarpd-rdisc-Drop-PrivateUsers.patch as it's been fixed upstream; rarpd still isn't. (From OE-Core rev: 521a8b2161614db50deed16a7a70d924b8ffe12f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch31
-rw-r--r--meta/recipes-extended/iputils/iputils_20210722.bb (renamed from meta/recipes-extended/iputils/iputils_20210202.bb)2
2 files changed, 7 insertions, 26 deletions
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 @@
1From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 1From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Thu, 13 Feb 2020 06:08:45 +0000 3Date: Thu, 13 Feb 2020 06:08:45 +0000
4Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers 4Subject: [PATCH] rarpd:Drop PrivateUsers
5 5
6Neither rarpd nor rdisc can gain the necessary capabilities with 6rarpd cannot gain the necessary capabilities with
7PrivateUsers enabled. 7PrivateUsers enabled.
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 10Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
11
11--- 12---
12 systemd/rarpd.service.in | 1 - 13 systemd/rarpd.service.in | 1 -
13 systemd/rdisc.service.in | 3 ++- 14 1 file changed, 1 deletion(-)
14 2 files changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in 16diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
17index e600c10c93e6..f5d7621a7ce8 100644 17index e600c10..f5d7621 100644
18--- a/systemd/rarpd.service.in 18--- a/systemd/rarpd.service.in
19+++ b/systemd/rarpd.service.in 19+++ b/systemd/rarpd.service.in
20@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW 20@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
@@ -25,22 +25,3 @@ index e600c10c93e6..f5d7621a7ce8 100644
25 ProtectSystem=strict 25 ProtectSystem=strict
26 ProtectHome=yes 26 ProtectHome=yes
27 ProtectControlGroups=yes 27 ProtectControlGroups=yes
28diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in
29index 4e2a1ec9d0e5..a71b87d36b37 100644
30--- a/systemd/rdisc.service.in
31+++ b/systemd/rdisc.service.in
32@@ -8,9 +8,10 @@ After=network.target
33 EnvironmentFile=-/etc/sysconfig/rdisc
34 ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS
35
36+CapabilityBoundingSet=CAP_NET_RAW
37 AmbientCapabilities=CAP_NET_RAW
38 PrivateTmp=yes
39-PrivateUsers=yes
40+DynamicUser=yes
41 ProtectSystem=strict
42 ProtectHome=yes
43 ProtectControlGroups=yes
44--
452.17.1
46
diff --git a/meta/recipes-extended/iputils/iputils_20210202.bb b/meta/recipes-extended/iputils/iputils_20210722.bb
index b8596ddf6a..c2a5bf44ea 100644
--- a/meta/recipes-extended/iputils/iputils_20210202.bb
+++ b/meta/recipes-extended/iputils/iputils_20210722.bb
@@ -13,7 +13,7 @@ DEPENDS = "gnutls"
13SRC_URI = "git://github.com/iputils/iputils \ 13SRC_URI = "git://github.com/iputils/iputils \
14 file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ 14 file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
15 " 15 "
16SRCREV = "cc16da6b574ce6637f3e6e9ab3c1a728663006ff" 16SRCREV = "71bb2a6c72e9f658e90ac618c73d873a76bbaa81"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19