* [PATCH 1/1] iputils: update to 20221126
@ 2022-11-26 0:50 Petr Vorel
2022-11-26 18:12 ` [OE-core] " Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: Petr Vorel @ 2022-11-26 0:50 UTC (permalink / raw)
To: openembedded-core
Cc: Petr Vorel, Richard Purdie, Daniel Díaz, Khem Raj,
Changhyeok Bae, Alexander Kanavin
From: Petr Vorel <petr.vorel@gmail.com>
This release removed: ninfod, rarpd, rdisc.
Remove also related, not yet upstreamed patch.
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi all,
I'm sorry, I haven't managed to test patch.
Can anybody do it for me?
Thank you.
Kind regards,
Petr
.../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 -------------------
...putils_20211215.bb => iputils_20221126.bb} | 21 +++------------
2 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
rename meta/recipes-extended/iputils/{iputils_20211215.bb => iputils_20221126.bb} (66%)
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 @@
-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:Drop PrivateUsers
-
-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 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
-index e600c10..f5d7621 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/meta/recipes-extended/iputils/iputils_20211215.bb b/meta/recipes-extended/iputils/iputils_20221126.bb
similarity index 66%
rename from meta/recipes-extended/iputils/iputils_20211215.bb
rename to meta/recipes-extended/iputils/iputils_20221126.bb
index 3ddce0be54..b4ab2fce5e 100644
--- a/meta/recipes-extended/iputils/iputils_20211215.bb
+++ b/meta/recipes-extended/iputils/iputils_20221126.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
DEPENDS = "gnutls"
SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
- file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
"
-SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
+SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
S = "${WORKDIR}/git"
@@ -23,14 +22,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
# breaks the version order.
CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
-PACKAGECONFIG ??= "libcap rarpd \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
+PACKAGECONFIG ??= "libcap \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native"
PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
-PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
-PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
@@ -43,9 +40,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE:${PN}-ping = "ping"
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
-SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \
- ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)}"
+SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
PACKAGES += "${SPLITPKGS}"
ALLOW_EMPTY:${PN} = "1"
@@ -56,11 +51,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
FILES:${PN}-arping = "${base_bindir}/arping"
FILES:${PN}-tracepath = "${base_bindir}/tracepath"
FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
-FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_system_unitdir}/rarpd@.service"
-FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
-FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
-
-SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \
- ${PN}-rdisc"
-SYSTEMD_SERVICE:${PN}-ninfod = "ninfod.service"
-SYSTEMD_SERVICE:${PN}-rdisc = "rdisc.service"
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH 1/1] iputils: update to 20221126
2022-11-26 0:50 [PATCH 1/1] iputils: update to 20221126 Petr Vorel
@ 2022-11-26 18:12 ` Alexandre Belloni
2022-11-27 15:14 ` Petr Vorel
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Belloni @ 2022-11-26 18:12 UTC (permalink / raw)
To: Petr Vorel
Cc: openembedded-core, Petr Vorel, Richard Purdie, Daniel Díaz,
Khem Raj, Changhyeok Bae, Alexander Kanavin
On 26/11/2022 01:50:57+0100, Petr Vorel wrote:
> From: Petr Vorel <petr.vorel@gmail.com>
>
> This release removed: ninfod, rarpd, rdisc.
> Remove also related, not yet upstreamed patch.
>
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
> Hi all,
>
> I'm sorry, I haven't managed to test patch.
> Can anybody do it for me?
> Thank you.
>
> Kind regards,
> Petr
>
> .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 -------------------
> ...putils_20211215.bb => iputils_20221126.bb} | 21 +++------------
> 2 files changed, 4 insertions(+), 44 deletions(-)
> delete mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
> rename meta/recipes-extended/iputils/{iputils_20211215.bb => iputils_20221126.bb} (66%)
>
> 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 @@
> -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:Drop PrivateUsers
> -
> -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 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
> -index e600c10..f5d7621 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/meta/recipes-extended/iputils/iputils_20211215.bb b/meta/recipes-extended/iputils/iputils_20221126.bb
> similarity index 66%
> rename from meta/recipes-extended/iputils/iputils_20211215.bb
> rename to meta/recipes-extended/iputils/iputils_20221126.bb
> index 3ddce0be54..b4ab2fce5e 100644
> --- a/meta/recipes-extended/iputils/iputils_20211215.bb
> +++ b/meta/recipes-extended/iputils/iputils_20221126.bb
> @@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
> DEPENDS = "gnutls"
>
> SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
> - file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
> "
> -SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
> +SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
>
> S = "${WORKDIR}/git"
>
> @@ -23,14 +22,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
> # breaks the version order.
> CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
>
> -PACKAGECONFIG ??= "libcap rarpd \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
> +PACKAGECONFIG ??= "libcap \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
> ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native"
> PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
> PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
> -PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
> -PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
> PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
> PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
>
> @@ -43,9 +40,7 @@ ALTERNATIVE_PRIORITY = "100"
> ALTERNATIVE:${PN}-ping = "ping"
> ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
>
> -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \
> - ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)}"
> +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
This line can't ever parse.
> PACKAGES += "${SPLITPKGS}"
>
> ALLOW_EMPTY:${PN} = "1"
> @@ -56,11 +51,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
> FILES:${PN}-arping = "${base_bindir}/arping"
> FILES:${PN}-tracepath = "${base_bindir}/tracepath"
> FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
> -FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_system_unitdir}/rarpd@.service"
> -FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
> -FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
> -
> -SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \
> - ${PN}-rdisc"
> -SYSTEMD_SERVICE:${PN}-ninfod = "ninfod.service"
> -SYSTEMD_SERVICE:${PN}-rdisc = "rdisc.service"
> --
> 2.38.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#173790): https://lists.openembedded.org/g/openembedded-core/message/173790
> Mute This Topic: https://lists.openembedded.org/mt/95265570/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH 1/1] iputils: update to 20221126
2022-11-26 18:12 ` [OE-core] " Alexandre Belloni
@ 2022-11-27 15:14 ` Petr Vorel
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2022-11-27 15:14 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Petr Vorel, openembedded-core, Richard Purdie, Daniel Díaz,
Khem Raj, Changhyeok Bae, Alexander Kanavin
Hi Alexandre,
...
> > -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \
> > - ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \
> > - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)}"
> > +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
>
> This line can't ever parse.
Thank you! The problem is in previous line which should be:
SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff"
I'll send v2.
Kind regards,
Petr
>
> > PACKAGES += "${SPLITPKGS}"
...
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-27 15:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-26 0:50 [PATCH 1/1] iputils: update to 20221126 Petr Vorel
2022-11-26 18:12 ` [OE-core] " Alexandre Belloni
2022-11-27 15:14 ` Petr Vorel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.