diff options
author | Petr Vorel <petr.vorel@gmail.com> | 2022-11-27 23:22:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-29 10:29:58 +0000 |
commit | 48ae9b852ea88c5c40e7ad94d9d93aa031ad9bd4 (patch) | |
tree | c43fc2c1ddb349a69861882896fb63bb50a06841 /meta/recipes-extended/iputils | |
parent | 49d114e33e3f4eb2583c54edb0b04bb0328a1353 (diff) | |
download | poky-48ae9b852ea88c5c40e7ad94d9d93aa031ad9bd4.tar.gz |
iputils: update to 20221126
This release removed: ninfod, rarpd, rdisc.
Remove also related, not yet upstreamed patch.
License-Update: ninfod, rarpd, rdisc and switch to SPDX identifier.
(From OE-Core rev: 4b78734d37f7f0f9057b3c89e028587d2b33aae5)
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils')
-rw-r--r-- | meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 | ||||
-rw-r--r-- | meta/recipes-extended/iputils/iputils_20221126.bb (renamed from meta/recipes-extended/iputils/iputils_20211215.bb) | 29 |
2 files changed, 6 insertions, 50 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 deleted file mode 100644 index c61e39dc80..0000000000 --- a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Thu, 13 Feb 2020 06:08:45 +0000 | ||
4 | Subject: [PATCH] rarpd:Drop PrivateUsers | ||
5 | |||
6 | rarpd cannot gain the necessary capabilities with | ||
7 | PrivateUsers enabled. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
11 | |||
12 | --- | ||
13 | systemd/rarpd.service.in | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in | ||
17 | index e600c10..f5d7621 100644 | ||
18 | --- a/systemd/rarpd.service.in | ||
19 | +++ b/systemd/rarpd.service.in | ||
20 | @@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW | ||
21 | DynamicUser=yes | ||
22 | PrivateTmp=yes | ||
23 | PrivateDevices=yes | ||
24 | -PrivateUsers=yes | ||
25 | ProtectSystem=strict | ||
26 | ProtectHome=yes | ||
27 | ProtectControlGroups=yes | ||
diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb b/meta/recipes-extended/iputils/iputils_20221126.bb index 3ddce0be54..cd5fe9bd3e 100644 --- a/meta/recipes-extended/iputils/iputils_20211215.bb +++ b/meta/recipes-extended/iputils/iputils_20221126.bb | |||
@@ -6,14 +6,12 @@ SECTION = "console/network" | |||
6 | 6 | ||
7 | LICENSE = "BSD-3-Clause & GPL-2.0-or-later" | 7 | LICENSE = "BSD-3-Clause & GPL-2.0-or-later" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819" |
10 | 10 | ||
11 | DEPENDS = "gnutls" | 11 | DEPENDS = "gnutls" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \ | 13 | SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https" |
14 | file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ | 14 | SRCREV = "5ffabc4190cab975c7332645259e286a032e183b" |
15 | " | ||
16 | SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d" | ||
17 | 15 | ||
18 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
19 | 17 | ||
@@ -23,18 +21,13 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)" | |||
23 | # breaks the version order. | 21 | # breaks the version order. |
24 | CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214" | 22 | CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214" |
25 | 23 | ||
26 | PACKAGECONFIG ??= "libcap rarpd \ | 24 | PACKAGECONFIG ??= "libcap" |
27 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \ | ||
28 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | ||
29 | PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native" | 25 | PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native" |
30 | PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" | 26 | PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" |
31 | PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" | 27 | PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" |
32 | PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," | ||
33 | PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," | ||
34 | PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd" | ||
35 | PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" | 28 | PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" |
36 | 29 | ||
37 | inherit meson systemd update-alternatives pkgconfig | 30 | inherit meson update-alternatives pkgconfig |
38 | 31 | ||
39 | EXTRA_OEMESON += "--prefix=${root_prefix}/ -DSKIP_TESTS=true" | 32 | EXTRA_OEMESON += "--prefix=${root_prefix}/ -DSKIP_TESTS=true" |
40 | 33 | ||
@@ -43,9 +36,7 @@ ALTERNATIVE_PRIORITY = "100" | |||
43 | ALTERNATIVE:${PN}-ping = "ping" | 36 | ALTERNATIVE:${PN}-ping = "ping" |
44 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 37 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
45 | 38 | ||
46 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \ | 39 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" |
47 | ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ | ||
48 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)}" | ||
49 | PACKAGES += "${SPLITPKGS}" | 40 | PACKAGES += "${SPLITPKGS}" |
50 | 41 | ||
51 | ALLOW_EMPTY:${PN} = "1" | 42 | ALLOW_EMPTY:${PN} = "1" |
@@ -56,11 +47,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" | |||
56 | FILES:${PN}-arping = "${base_bindir}/arping" | 47 | FILES:${PN}-arping = "${base_bindir}/arping" |
57 | FILES:${PN}-tracepath = "${base_bindir}/tracepath" | 48 | FILES:${PN}-tracepath = "${base_bindir}/tracepath" |
58 | FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" | 49 | FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" |
59 | FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_system_unitdir}/rarpd@.service" | ||
60 | FILES:${PN}-rdisc = "${base_sbindir}/rdisc" | ||
61 | FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" | ||
62 | |||
63 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ | ||
64 | ${PN}-rdisc" | ||
65 | SYSTEMD_SERVICE:${PN}-ninfod = "ninfod.service" | ||
66 | SYSTEMD_SERVICE:${PN}-rdisc = "rdisc.service" | ||