From: Mingli Yu <mingli...@windriver.com>

Backport a patch to fix the below traceroute failure:
 $ traceroute -f 64 -I -n -m 240 10.226.43.84 46
traceroute: NO OPT x!

Signed-off-by: Mingli Yu <mingli...@windriver.com>
---
 .../0001-traceroute-fix-option-parsing.patch  | 31 +++++++++++++++++++
 meta/recipes-core/busybox/busybox_1.33.0.bb   |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 
meta/recipes-core/busybox/busybox/0001-traceroute-fix-option-parsing.patch

diff --git 
a/meta/recipes-core/busybox/busybox/0001-traceroute-fix-option-parsing.patch 
b/meta/recipes-core/busybox/busybox/0001-traceroute-fix-option-parsing.patch
new file mode 100644
index 0000000000..1e03b7dbfb
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-traceroute-fix-option-parsing.patch
@@ -0,0 +1,31 @@
+From 89358a7131d3e75c74af834bb117b4fad7914983 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.li...@googlemail.com>
+Date: Tue, 2 Feb 2021 13:48:21 +0100
+Subject: [PATCH] traceroute: fix option parsing
+
+Fix option parsing
+
+Upstream-Status: Backport 
[https://git.busybox.net/busybox/commit/?h=1_33_stable&id=89358a7131d3e75c74af834bb117b4fad7914983]
+
+Signed-off-by: Denys Vlasenko <vda.li...@googlemail.com>
+Signed-off-by: Mingli Yu <mingli...@windriver.com>
+---
+ networking/traceroute.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/networking/traceroute.c b/networking/traceroute.c
+index 3f1a9ab46..29f5e480b 100644
+--- a/networking/traceroute.c
++++ b/networking/traceroute.c
+@@ -896,7 +896,7 @@ traceroute_init(int op, char **argv)
+ 
+       op |= getopt32(argv, "^"
+               OPT_STRING
+-              "\0" "-1:x-x" /* minimum 1 arg */
++              "\0" "-1" /* minimum 1 arg */
+               , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
+               , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
+       );
+-- 
+2.31.1
+
diff --git a/meta/recipes-core/busybox/busybox_1.33.0.bb 
b/meta/recipes-core/busybox/busybox_1.33.0.bb
index b2a30ba16f..2d18ec072c 100644
--- a/meta/recipes-core/busybox/busybox_1.33.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.33.0.bb
@@ -48,6 +48,7 @@ SRC_URI = 
"https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://pgrep.cfg \
            file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \
            
file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch \
+           file://0001-traceroute-fix-option-parsing.patch \
            "
 SRC_URI_append_libc-musl = " file://musl.cfg "
 
-- 
2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#153670): 
https://lists.openembedded.org/g/openembedded-core/message/153670
Mute This Topic: https://lists.openembedded.org/mt/84060098/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to