diff options
Diffstat (limited to 'meta/recipes-extended/iputils/iputils')
-rw-r--r-- | meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch | 46 |
2 files changed, 74 insertions, 0 deletions
diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch new file mode 100644 index 0000000000..03a3f5602d --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch @@ -0,0 +1,28 @@ +From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 +From: Andrea Stevanato <andrea.stevanato.95@hotmail.it> +Date: Tue, 5 Nov 2019 19:08:30 +0000 +Subject: [PATCH] ninfod: fix systemd Documentation url error + +systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) + +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + systemd/ninfod.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in +index 5ab69ca00e96..8e79fcd9238e 100644 +--- a/systemd/ninfod.service.in ++++ b/systemd/ninfod.service.in +@@ -1,6 +1,6 @@ + [Unit] + Description=Respond to IPv6 Node Information Queries +-Documentation=ninfod(8) ++Documentation=man:ninfod(8) + Requires=network.target + After=network.target + +-- +2.17.1 + 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 new file mode 100644 index 0000000000..d7367caf78 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -0,0 +1,46 @@ +From 6e51d529988cfc0bb357751fd767e9f1478e2b81 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 + +Neither rarpd nor rdisc can 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(-) + +diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in +index e600c10c93e6..f5d7621a7ce8 100644 +--- a/systemd/rarpd.service.in ++++ b/systemd/rarpd.service.in +@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW + DynamicUser=yes + PrivateTmp=yes + PrivateDevices=yes +-PrivateUsers=yes + 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 + |