From 32ff819233024f23af1caa889691ccc3b0dadc50 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 23 Nov 2018 10:16:27 +0800 Subject: busybox: check uudecode before using it in test case Check uudecode before using it in test case to avoid unexpected failure. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- ...-testsuite-check-uudecode-before-using-it.patch | 45 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.29.2.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch diff --git a/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch b/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch new file mode 100644 index 0000000000..2d9856fb61 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch @@ -0,0 +1,45 @@ +From 85f164ec427fecbae24140b3c93acbbe2ba1c817 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 13 Nov 2018 11:27:01 +0800 +Subject: [PATCH] testsuite: check uudecode before using it + +The unzip and tar test cases use uudecode command, so also +check it via optional function. + +Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2018-November/086833.html] + +Signed-off-by: Chen Qi +--- + testsuite/tar.tests | 2 +- + testsuite/unzip.tests | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testsuite/tar.tests b/testsuite/tar.tests +index d71a349..8c88567 100755 +--- a/testsuite/tar.tests ++++ b/testsuite/tar.tests +@@ -336,7 +336,7 @@ SKIP= + cd .. || exit 1; rm -rf tar.tempdir 2>/dev/null + + mkdir tar.tempdir && cd tar.tempdir || exit 1 +-optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS ++optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS UUDECODE + testing "Symlink attack: create symlink and then write through it" '\ + exec 2>&1 + uudecode -o input && tar xvf input; echo $? +diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests +index af53de9..3b45ece 100755 +--- a/testsuite/unzip.tests ++++ b/testsuite/unzip.tests +@@ -31,7 +31,7 @@ rmdir foo + rm foo.zip + + # File containing some damaged encrypted stream +-optional FEATURE_UNZIP_CDF ++optional FEATURE_UNZIP_CDF UUDECODE + testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \ + "Archive: bad.zip + inflating: ]3j½r«IK-%Ix +-- +2.7.4 + diff --git a/meta/recipes-core/busybox/busybox_1.29.2.bb b/meta/recipes-core/busybox/busybox_1.29.2.bb index df3ea5906b..a63fa8213b 100644 --- a/meta/recipes-core/busybox/busybox_1.29.2.bb +++ b/meta/recipes-core/busybox/busybox_1.29.2.bb @@ -41,6 +41,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://rcS \ file://rcK \ file://makefile-libbb-race.patch \ + file://0001-testsuite-check-uudecode-before-using-it.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- cgit 1.2.3-korg