diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-11-23 10:16:27 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:35:19 +0000 |
commit | e9d3c569aaa61ade41fc6931f1e5c04eb1da53e8 (patch) | |
tree | f94f3542af45f7a5d71266e324c8d67cf0180b82 /meta/recipes-core/busybox | |
parent | a3e7ab01680a90cf3daf724713a29b60bc364fd7 (diff) | |
download | poky-e9d3c569aaa61ade41fc6931f1e5c04eb1da53e8.tar.gz |
busybox: check uudecode before using it in test case
Check uudecode before using it in test case to avoid unexpected failure.
(From OE-Core rev: 32ff819233024f23af1caa889691ccc3b0dadc50)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch | 45 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.29.2.bb | 1 |
2 files changed, 46 insertions, 0 deletions
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 @@ | |||
1 | From 85f164ec427fecbae24140b3c93acbbe2ba1c817 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Tue, 13 Nov 2018 11:27:01 +0800 | ||
4 | Subject: [PATCH] testsuite: check uudecode before using it | ||
5 | |||
6 | The unzip and tar test cases use uudecode command, so also | ||
7 | check it via optional function. | ||
8 | |||
9 | Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2018-November/086833.html] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | testsuite/tar.tests | 2 +- | ||
14 | testsuite/unzip.tests | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/testsuite/tar.tests b/testsuite/tar.tests | ||
18 | index d71a349..8c88567 100755 | ||
19 | --- a/testsuite/tar.tests | ||
20 | +++ b/testsuite/tar.tests | ||
21 | @@ -336,7 +336,7 @@ SKIP= | ||
22 | cd .. || exit 1; rm -rf tar.tempdir 2>/dev/null | ||
23 | |||
24 | mkdir tar.tempdir && cd tar.tempdir || exit 1 | ||
25 | -optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS | ||
26 | +optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS UUDECODE | ||
27 | testing "Symlink attack: create symlink and then write through it" '\ | ||
28 | exec 2>&1 | ||
29 | uudecode -o input && tar xvf input; echo $? | ||
30 | diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests | ||
31 | index af53de9..3b45ece 100755 | ||
32 | --- a/testsuite/unzip.tests | ||
33 | +++ b/testsuite/unzip.tests | ||
34 | @@ -31,7 +31,7 @@ rmdir foo | ||
35 | rm foo.zip | ||
36 | |||
37 | # File containing some damaged encrypted stream | ||
38 | -optional FEATURE_UNZIP_CDF | ||
39 | +optional FEATURE_UNZIP_CDF UUDECODE | ||
40 | testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \ | ||
41 | "Archive: bad.zip | ||
42 | inflating: ]3j½r«IK-%Ix | ||
43 | -- | ||
44 | 2.7.4 | ||
45 | |||
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 \ | |||
41 | file://rcS \ | 41 | file://rcS \ |
42 | file://rcK \ | 42 | file://rcK \ |
43 | file://makefile-libbb-race.patch \ | 43 | file://makefile-libbb-race.patch \ |
44 | file://0001-testsuite-check-uudecode-before-using-it.patch \ | ||
44 | " | 45 | " |
45 | SRC_URI_append_libc-musl = " file://musl.cfg " | 46 | SRC_URI_append_libc-musl = " file://musl.cfg " |
46 | 47 | ||