diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-18 03:31:51 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 23:46:37 +0100 |
commit | 0390b0975e24158755e41060646eb4c4fe367a1e (patch) | |
tree | 2f05e26cadc5d267262658a2c60bd2256112efb3 /meta | |
parent | 0bd2dd08e3daf284a6bb7757651af8d40393aec2 (diff) | |
download | poky-0390b0975e24158755e41060646eb4c4fe367a1e.tar.gz |
bash: 4.3.30 -> 4.4
1. Rebase patches:
- fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
- test-output.patch
2. Drop backported patches:
- CVE-2016-9401.patch
- fix-run-intl.patch
3. Add ${PN}-loadable for loadable builtins which is new features in Bash 4.4
4. The 4.4 fixed CVE-2017-5932 and CVE-2016-0634
- https://security-tracker.debian.org/tracker/CVE-2017-5932
- https://security-tracker.debian.org/tracker/CVE-2016-0634
5. The 4.4 installed include header files, fix bash-dev confilicts
with lib32-bash-dev
.....
$ bitbake lib32-core-image-sato-sdk
...
|Error: Transaction check error: file /usr/include/bash/config.h
conflicts between attempted installs
|of lib32-bash-dev-4.4-r0.x86 and bash-dev-4.4-r0.core2_64
......
(From OE-Core rev: 4097694b13cd5f0d68987551c3f9af80c87dc6ae)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/bash/bash.inc | 6 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/CVE-2016-9401.patch | 50 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch | 158 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/test-output.patch | 47 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_4.3.30.bb | 75 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_4.4.bb | 58 |
7 files changed, 113 insertions, 391 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 6c94a24b69..92916d9a6a 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc | |||
@@ -28,6 +28,8 @@ RDEPENDS_${PN}-ptest += "make" | |||
28 | USERADD_PACKAGES = "${PN}-ptest" | 28 | USERADD_PACKAGES = "${PN}-ptest" |
29 | USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" | 29 | USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" |
30 | 30 | ||
31 | CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" | ||
32 | |||
31 | do_configure_prepend () { | 33 | do_configure_prepend () { |
32 | if [ ! -e ${S}/acinclude.m4 ]; then | 34 | if [ ! -e ${S}/acinclude.m4 ]; then |
33 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 | 35 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 |
@@ -70,4 +72,8 @@ PACKAGES += "${PN}-bashbug" | |||
70 | FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" | 72 | FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" |
71 | FILES_${PN}-bashbug = "${bindir}/bashbug" | 73 | FILES_${PN}-bashbug = "${bindir}/bashbug" |
72 | 74 | ||
75 | PACKAGE_BEFORE_PN += "${PN}-loadable" | ||
76 | RDEPENDS_${PN}-loadable += "${PN}" | ||
77 | FILES_${PN}-loadable += "${libdir}/bash/*" | ||
78 | |||
73 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" | 79 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" |
diff --git a/meta/recipes-extended/bash/bash/CVE-2016-9401.patch b/meta/recipes-extended/bash/bash/CVE-2016-9401.patch deleted file mode 100644 index 28c927743c..0000000000 --- a/meta/recipes-extended/bash/bash/CVE-2016-9401.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From fa741771ed47b30547be63b5b5dbfb51977aca12 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chet Ramey <chet.ramey@case.edu> | ||
3 | Date: Fri, 20 Jan 2017 11:47:31 -0500 | ||
4 | Subject: [PATCH] Bash-4.4 patch 6 | ||
5 | |||
6 | Bug-Reference-URL: | ||
7 | https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00116.html | ||
8 | |||
9 | Reference to upstream patch: | ||
10 | https://ftp.gnu.org/pub/gnu/bash/bash-4.4-patches/bash44-006 | ||
11 | |||
12 | Bug-Description: | ||
13 | Out-of-range negative offsets to popd can cause the shell to crash attempting | ||
14 | to free an invalid memory block. | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | CVE: CVE-2016-9401 | ||
18 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
19 | --- | ||
20 | builtins/pushd.def | 7 ++++++- | ||
21 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/builtins/pushd.def b/builtins/pushd.def | ||
24 | index 9c6548f..8a13bae 100644 | ||
25 | --- a/builtins/pushd.def | ||
26 | +++ b/builtins/pushd.def | ||
27 | @@ -359,7 +359,7 @@ popd_builtin (list) | ||
28 | break; | ||
29 | } | ||
30 | |||
31 | - if (which > directory_list_offset || (directory_list_offset == 0 && which == 0)) | ||
32 | + if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0)) | ||
33 | { | ||
34 | pushd_error (directory_list_offset, which_word ? which_word : ""); | ||
35 | return (EXECUTION_FAILURE); | ||
36 | @@ -381,6 +381,11 @@ popd_builtin (list) | ||
37 | remove that directory from the list and shift the remainder | ||
38 | of the list into place. */ | ||
39 | i = (direction == '+') ? directory_list_offset - which : which; | ||
40 | + if (i < 0 || i > directory_list_offset) | ||
41 | + { | ||
42 | + pushd_error (directory_list_offset, which_word ? which_word : ""); | ||
43 | + return (EXECUTION_FAILURE); | ||
44 | + } | ||
45 | free (pushd_directory_list[i]); | ||
46 | directory_list_offset--; | ||
47 | |||
48 | -- | ||
49 | 1.9.1 | ||
50 | |||
diff --git a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch index 7f099ae0c6..9ac2461ab6 100644 --- a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch +++ b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch | |||
@@ -1,15 +1,7 @@ | |||
1 | From 2c30dff8ea8b17ad5ba9881e35ad1eba9c515f13 Mon Sep 17 00:00:00 2001 | 1 | From d1cd4c31ea0ed7406a3ad4bdaa211f581063f655 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 26 Nov 2015 22:09:07 -0500 | 3 | Date: Tue, 15 Aug 2017 10:21:21 +0800 |
4 | Subject: [PATCH] fix run-coproc/run-heredoc/run-execscript/run-test/ failed | 4 | Subject: [PATCH 2/2] fix run-execscript/run-test/ failed |
5 | |||
6 | FAIL: run-coproc | ||
7 | update test case:tests/coproc.right, tests/coproc.tests | ||
8 | git://git.sv.gnu.org/bash.git bash-4.4-testing | ||
9 | |||
10 | FAIL: run-heredoc | ||
11 | update test case: tests/heredoc.right tests/heredoc3.sub | ||
12 | git://git.sv.gnu.org/bash.git bash-4.4-testing | ||
13 | 5 | ||
14 | FAIL: run-execscript: | 6 | FAIL: run-execscript: |
15 | the test suite should not be run as root | 7 | the test suite should not be run as root |
@@ -21,149 +13,33 @@ Upstream-Status: Pending | |||
21 | 13 | ||
22 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
23 | --- | 15 | --- |
24 | tests/coproc.right | 5 +---- | 16 | tests/run-execscript | 3 ++- |
25 | tests/coproc.tests | 30 +++++++++++++++++++++++++----- | 17 | tests/run-test | 3 ++- |
26 | tests/heredoc.right | 5 ++--- | 18 | 2 files changed, 4 insertions(+), 2 deletions(-) |
27 | tests/heredoc3.sub | 3 ++- | ||
28 | tests/run-execscript | 3 ++- | ||
29 | tests/run-test | 3 ++- | ||
30 | 6 files changed, 34 insertions(+), 15 deletions(-) | ||
31 | 19 | ||
32 | diff --git a/tests/coproc.right b/tests/coproc.right | ||
33 | index 6d9deaa..94b001c 100644 | ||
34 | --- a/tests/coproc.right | ||
35 | +++ b/tests/coproc.right | ||
36 | @@ -1,11 +1,8 @@ | ||
37 | -84575 | ||
38 | 63 60 | ||
39 | a b c | ||
40 | -84577 | ||
41 | 63 60 | ||
42 | flop | ||
43 | -./coproc.tests: line 22: 84577 Terminated coproc REFLECT { cat -; } | ||
44 | -84579 | ||
45 | +coproc.tests: REFLECT: status 143 | ||
46 | 63 60 | ||
47 | FOO | ||
48 | 63 60 | ||
49 | diff --git a/tests/coproc.tests b/tests/coproc.tests | ||
50 | index 8be3563..d347eb7 100644 | ||
51 | --- a/tests/coproc.tests | ||
52 | +++ b/tests/coproc.tests | ||
53 | @@ -1,6 +1,13 @@ | ||
54 | +: ${TMPDIR:=/tmp} | ||
55 | +TMPOUT=${TMPDIR}/coproc-wait-$BASHPID | ||
56 | + | ||
57 | coproc { echo a b c; sleep 2; } | ||
58 | |||
59 | -echo $COPROC_PID | ||
60 | +case $COPROC_PID in | ||
61 | +[0-9]*) ;; | ||
62 | +*) echo COPROC_PID not integer ;; | ||
63 | +esac | ||
64 | + | ||
65 | echo ${COPROC[@]} | ||
66 | |||
67 | read LINE <&${COPROC[0]} | ||
68 | @@ -10,7 +17,11 @@ wait $COPROC_PID | ||
69 | |||
70 | coproc REFLECT { cat - ; } | ||
71 | |||
72 | -echo $REFLECT_PID | ||
73 | +case $REFLECT_PID in | ||
74 | +[0-9]*) ;; | ||
75 | +*) echo REFLECT_PID not integer ;; | ||
76 | +esac | ||
77 | + | ||
78 | echo ${REFLECT[@]} | ||
79 | |||
80 | echo flop >&${REFLECT[1]} | ||
81 | @@ -18,12 +29,21 @@ read LINE <&${REFLECT[0]} | ||
82 | |||
83 | echo $LINE | ||
84 | |||
85 | -kill $REFLECT_PID | ||
86 | -wait $REFLECT_PID | ||
87 | +{ sleep 1; kill $REFLECT_PID; } & | ||
88 | +wait $REFLECT_PID >$TMPOUT 2>&1 || echo "coproc.tests: REFLECT: status $?" | ||
89 | +grep 'Terminated.*coproc.*REFLECT' < $TMPOUT >/dev/null 2>&1 || { | ||
90 | + echo "coproc.tests: wait for REFLECT failed" >&2 | ||
91 | +} | ||
92 | +rm -f $TMPOUT | ||
93 | +exec 2>&1 | ||
94 | |||
95 | coproc xcase -n -u | ||
96 | |||
97 | -echo $COPROC_PID | ||
98 | +case $COPROC_PID in | ||
99 | +[0-9]*) ;; | ||
100 | +*) echo COPROC_PID not integer ;; | ||
101 | +esac | ||
102 | + | ||
103 | echo ${COPROC[@]} | ||
104 | |||
105 | echo foo >&${COPROC[1]} | ||
106 | diff --git a/tests/heredoc.right b/tests/heredoc.right | ||
107 | index 6abaa1f..8df91c5 100644 | ||
108 | --- a/tests/heredoc.right | ||
109 | +++ b/tests/heredoc.right | ||
110 | @@ -76,15 +76,14 @@ ENDEND | ||
111 | end ENDEND | ||
112 | hello | ||
113 | end hello | ||
114 | -x star x | ||
115 | end x*x | ||
116 | helloEND | ||
117 | end helloEND | ||
118 | hello | ||
119 | \END | ||
120 | end hello<NL>\END | ||
121 | -./heredoc3.sub: line 74: warning: here-document at line 72 delimited by end-of-file (wanted `EOF') | ||
122 | -./heredoc3.sub: line 75: syntax error: unexpected end of file | ||
123 | +./heredoc3.sub: line 75: warning: here-document at line 73 delimited by end-of-file (wanted `EOF') | ||
124 | +./heredoc3.sub: line 76: syntax error: unexpected end of file | ||
125 | comsub here-string | ||
126 | ./heredoc.tests: line 105: warning: here-document at line 103 delimited by end-of-file (wanted `EOF') | ||
127 | hi | ||
128 | diff --git a/tests/heredoc3.sub b/tests/heredoc3.sub | ||
129 | index 73a111e..9d3d846 100644 | ||
130 | --- a/tests/heredoc3.sub | ||
131 | +++ b/tests/heredoc3.sub | ||
132 | @@ -49,9 +49,10 @@ hello | ||
133 | END | ||
134 | echo end hello | ||
135 | |||
136 | -cat <<x*x & touch 'x*x' | ||
137 | +cat <<x*x >/dev/null & touch 'x*x' | ||
138 | x star x | ||
139 | x*x | ||
140 | +wait $! | ||
141 | echo end 'x*x' | ||
142 | rm 'x*x' | ||
143 | |||
144 | diff --git a/tests/run-execscript b/tests/run-execscript | 20 | diff --git a/tests/run-execscript b/tests/run-execscript |
145 | index f97ab21..0d00a1b 100644 | 21 | index de78644..38397c1 100644 |
146 | --- a/tests/run-execscript | 22 | --- a/tests/run-execscript |
147 | +++ b/tests/run-execscript | 23 | +++ b/tests/run-execscript |
148 | @@ -5,5 +5,6 @@ echo "warning: \`/tmp/bash-notthere' not being found or \`/' being a directory" | 24 | @@ -5,5 +5,6 @@ echo "warning: \`/tmp/bash-notthere' not being found or \`/' being a directory" |
149 | echo "warning: produce diff output, please do not consider this a test failure" >&2 | 25 | echo "warning: produce diff output, please do not consider this a test failure" >&2 |
150 | echo "warning: if diff output differing only in the location of the bash" >&2 | 26 | echo "warning: if diff output differing only in the location of the bash" >&2 |
151 | echo "warning: binary appears, please do not consider this a test failure" >&2 | 27 | echo "warning: binary appears, please do not consider this a test failure" >&2 |
152 | -${THIS_SH} ./execscript > /tmp/xx 2>&1 | 28 | -${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1 |
153 | +rm -f /tmp/xx | 29 | +rm -f ${BASH_TSTOUT} |
154 | +su -c "${THIS_SH} ./execscript > /tmp/xx 2>&1" test | 30 | +su -c "${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1" test |
155 | diff /tmp/xx exec.right && rm -f /tmp/xx | 31 | diff ${BASH_TSTOUT} exec.right && rm -f ${BASH_TSTOUT} |
156 | diff --git a/tests/run-test b/tests/run-test | 32 | diff --git a/tests/run-test b/tests/run-test |
157 | index b2482c3..2e8f049 100644 | 33 | index d68791c..d6317d2 100644 |
158 | --- a/tests/run-test | 34 | --- a/tests/run-test |
159 | +++ b/tests/run-test | 35 | +++ b/tests/run-test |
160 | @@ -1,4 +1,5 @@ | 36 | @@ -1,4 +1,5 @@ |
161 | unset GROUPS UID 2>/dev/null | 37 | unset GROUPS UID 2>/dev/null |
162 | 38 | ||
163 | -${THIS_SH} ./test.tests >/tmp/xx 2>&1 | 39 | -${THIS_SH} ./test.tests >${BASH_TSTOUT} 2>&1 |
164 | +rm -f /tmp/xx | 40 | +rm -f ${BASH_TSTOUT} |
165 | +su -c "${THIS_SH} ./test.tests >/tmp/xx 2>&1" test | 41 | +su -c "${THIS_SH} ./test.tests > ${BASH_TSTOUT} 2>&1" test |
166 | diff /tmp/xx test.right && rm -f /tmp/xx | 42 | diff ${BASH_TSTOUT} test.right && rm -f ${BASH_TSTOUT} |
167 | -- | 43 | -- |
168 | 1.9.1 | 44 | 1.8.3.1 |
169 | 45 | ||
diff --git a/meta/recipes-extended/bash/bash/fix-run-intl.patch b/meta/recipes-extended/bash/bash/fix-run-intl.patch deleted file mode 100644 index d4a3409ec6..0000000000 --- a/meta/recipes-extended/bash/bash/fix-run-intl.patch +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | From a00d3161fd7b6a698bdd2ed5f0ac5faac580ee2a Mon Sep 17 00:00:00 2001 | ||
2 | From: Dengke Du <dengke.du@windriver.com> | ||
3 | Date: Wed, 3 Aug 2016 23:13:00 -0400 | ||
4 | Subject: [PATCH] fix run-intl failed | ||
5 | |||
6 | 1. Filter extra white space of intl.right | ||
7 | |||
8 | Due to the extra white space of intl.right, when the result of | ||
9 | sub-test unicode2.sub of intl.tests compared to it, the test | ||
10 | failed. | ||
11 | |||
12 | So we need to filter the extra white space of intl.right. | ||
13 | |||
14 | Import this patch for intl.right from bash devel branch: | ||
15 | |||
16 | http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel | ||
17 | |||
18 | commit is: | ||
19 | |||
20 | 85ec0778f9d778e1820fb8c0e3e996f2d1103b45 | ||
21 | |||
22 | 2. Change intl.right correspond to the unicode3.sub's output | ||
23 | |||
24 | In sub-test unicode3.sub of intl.tests, the payload value is: | ||
25 | |||
26 | payload=$'\065\247\100\063\231\053\306\123\070\237\242\352\263' | ||
27 | |||
28 | It used quoted string expansion(escaped octal) to assign ASCII | ||
29 | characters to variables. So when the test run the following: | ||
30 | |||
31 | printf %q "$payload" | ||
32 | |||
33 | It produced: | ||
34 | |||
35 | $'5\247@3\231+\306S8\237\242\352\263' | ||
36 | |||
37 | When compared to the intl.right(contain the converted character), it failed. | ||
38 | |||
39 | Import parts of patch for intl.right from bash devel branch: | ||
40 | |||
41 | http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel | ||
42 | |||
43 | commit is: | ||
44 | |||
45 | 74b8cbb41398b4453d8ba04d0cdd1b25f9dcb9e3 | ||
46 | |||
47 | Upstream-Status: Backport | ||
48 | |||
49 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
50 | --- | ||
51 | tests/intl.right | 30 +++++++++++++++--------------- | ||
52 | 1 file changed, 15 insertions(+), 15 deletions(-) | ||
53 | |||
54 | diff --git a/tests/intl.right b/tests/intl.right | ||
55 | index acf108a..1efdfbe 100644 | ||
56 | --- a/tests/intl.right | ||
57 | +++ b/tests/intl.right | ||
58 | @@ -18,34 +18,34 @@ aéb | ||
59 | 1.0000 | ||
60 | 1,0000 | ||
61 | Passed all 1378 Unicode tests | ||
62 | -0000000 303 277 012 | ||
63 | +0000000 303 277 012 | ||
64 | 0000003 | ||
65 | -0000000 303 277 012 | ||
66 | +0000000 303 277 012 | ||
67 | 0000003 | ||
68 | -0000000 303 277 012 | ||
69 | +0000000 303 277 012 | ||
70 | 0000003 | ||
71 | -0000000 303 277 012 | ||
72 | +0000000 303 277 012 | ||
73 | 0000003 | ||
74 | -0000000 357 277 277 012 | ||
75 | +0000000 357 277 277 012 | ||
76 | 0000004 | ||
77 | -0000000 357 277 277 012 | ||
78 | +0000000 357 277 277 012 | ||
79 | 0000004 | ||
80 | -0000000 012 | ||
81 | +0000000 012 | ||
82 | 0000001 | ||
83 | -0000000 012 | ||
84 | +0000000 012 | ||
85 | 0000001 | ||
86 | -0000000 012 | ||
87 | +0000000 012 | ||
88 | 0000001 | ||
89 | -0000000 012 | ||
90 | +0000000 012 | ||
91 | 0000001 | ||
92 | -0000000 303 277 012 | ||
93 | +0000000 303 277 012 | ||
94 | 0000003 | ||
95 | -0000000 303 277 012 | ||
96 | +0000000 303 277 012 | ||
97 | 0000003 | ||
98 | -0000000 303 277 012 | ||
99 | +0000000 303 277 012 | ||
100 | 0000003 | ||
101 | -0000000 101 040 302 243 040 305 222 012 | ||
102 | +0000000 101 040 302 243 040 305 222 012 | ||
103 | 0000010 | ||
104 | ./unicode3.sub: line 2: 5§@3™+ÆS8Ÿ¢ê³: command not found | ||
105 | -5§@3™+ÆS8Ÿ¢ê³ | ||
106 | +$'5\247@3\231+\306S8\237\242\352\263' | ||
107 | + : $'5\247@3\231+\306S8\237\242\352\263' | ||
108 | -- | ||
109 | 2.8.1 | ||
110 | |||
diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/meta/recipes-extended/bash/bash/test-output.patch index 2b09b7d977..0ffcc24587 100644 --- a/meta/recipes-extended/bash/bash/test-output.patch +++ b/meta/recipes-extended/bash/bash/test-output.patch | |||
@@ -1,25 +1,42 @@ | |||
1 | Add FAIL/PASS output to test output. | 1 | From 28eb06047ebd2deaa8c7cd2bf6655ef6a469dc14 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 10:01:56 +0800 | ||
4 | Subject: [PATCH 1/2] Add FAIL/PASS output to test output. | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
2 | 8 | ||
3 | Signed-off-by: Björn Stenberg <bjst@enea.com> | 9 | Signed-off-by: Björn Stenberg <bjst@enea.com> |
4 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | |||
12 | Rebase to 4.4 | ||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
5 | --- | 14 | --- |
6 | diff -uNr a/tests/run-all b/tests/run-all | 15 | tests/run-all | 11 ++++++++++- |
7 | --- a/tests/run-all 1999-10-08 17:07:46.000000000 +0200 | 16 | 1 file changed, 10 insertions(+), 1 deletion(-) |
8 | +++ b/tests/run-all 2012-10-27 21:04:18.663331887 +0200 | 17 | |
9 | @@ -22,7 +22,15 @@ | 18 | diff --git a/tests/run-all b/tests/run-all |
19 | index 2882fe0..e21d026 100644 | ||
20 | --- a/tests/run-all | ||
21 | +++ b/tests/run-all | ||
22 | @@ -33,7 +33,16 @@ do | ||
10 | case $x in | 23 | case $x in |
11 | $0|run-minimal|run-gprof) ;; | 24 | $0|run-minimal|run-gprof) ;; |
12 | *.orig|*~) ;; | 25 | *.orig|*~) ;; |
13 | - *) echo $x ; sh $x ;; | 26 | - *) echo $x ; sh $x ; rm -f ${BASH_TSTOUT} ;; |
14 | + *) echo $x | 27 | + *) echo $x |
15 | + output=`sh $x` | 28 | + output=`sh $x` |
16 | + if [ -n "$output" ]; then | 29 | + if [ -n "$output" ]; then |
17 | + echo "$output" | 30 | + echo "$output" |
18 | + echo "FAIL: $x" | 31 | + echo "FAIL: $x" |
19 | + else | 32 | + else |
20 | + echo "PASS: $x" | 33 | + echo "PASS: $x" |
21 | + fi | 34 | + fi |
22 | + ;; | 35 | + rm -f ${BASH_TSTOUT} |
36 | + ;; | ||
23 | esac | 37 | esac |
24 | done | 38 | done |
25 | 39 | ||
40 | -- | ||
41 | 1.8.3.1 | ||
42 | |||
diff --git a/meta/recipes-extended/bash/bash_4.3.30.bb b/meta/recipes-extended/bash/bash_4.3.30.bb deleted file mode 100644 index b40059fa1d..0000000000 --- a/meta/recipes-extended/bash/bash_4.3.30.bb +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | require bash.inc | ||
2 | |||
3 | # GPLv2+ (< 4.0), GPLv3+ (>= 4.0) | ||
4 | LICENSE = "GPLv3+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
6 | |||
7 | SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ | ||
8 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-031;apply=yes;striplevel=0;name=patch031 \ | ||
9 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-032;apply=yes;striplevel=0;name=patch032 \ | ||
10 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-033;apply=yes;striplevel=0;name=patch033 \ | ||
11 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-034;apply=yes;striplevel=0;name=patch034 \ | ||
12 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-035;apply=yes;striplevel=0;name=patch035 \ | ||
13 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-036;apply=yes;striplevel=0;name=patch036 \ | ||
14 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-037;apply=yes;striplevel=0;name=patch037 \ | ||
15 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-038;apply=yes;striplevel=0;name=patch038 \ | ||
16 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-039;apply=yes;striplevel=0;name=patch039 \ | ||
17 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-040;apply=yes;striplevel=0;name=patch040 \ | ||
18 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-041;apply=yes;striplevel=0;name=patch041 \ | ||
19 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-042;apply=yes;striplevel=0;name=patch042 \ | ||
20 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-043;apply=yes;striplevel=0;name=patch043 \ | ||
21 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-044;apply=yes;striplevel=0;name=patch044 \ | ||
22 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-045;apply=yes;striplevel=0;name=patch045 \ | ||
23 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-046;apply=yes;striplevel=0;name=patch046 \ | ||
24 | ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-047;apply=yes;striplevel=0;name=patch047 \ | ||
25 | file://execute_cmd.patch;striplevel=0 \ | ||
26 | file://mkbuiltins_have_stringize.patch \ | ||
27 | file://build-tests.patch \ | ||
28 | file://test-output.patch \ | ||
29 | file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ | ||
30 | file://run-ptest \ | ||
31 | file://fix-run-builtins.patch \ | ||
32 | file://0001-help-fix-printf-format-security-warning.patch \ | ||
33 | file://fix-run-intl.patch \ | ||
34 | file://CVE-2016-9401.patch \ | ||
35 | " | ||
36 | |||
37 | SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447" | ||
38 | SRC_URI[tarball.sha256sum] = "317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd" | ||
39 | |||
40 | SRC_URI[patch031.md5sum] = "236df1ac1130a033ed0dbe2d2115f28f" | ||
41 | SRC_URI[patch031.sha256sum] = "cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d" | ||
42 | SRC_URI[patch032.md5sum] = "2360f7e79cfb28526f80021025ea5909" | ||
43 | SRC_URI[patch032.sha256sum] = "889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a" | ||
44 | SRC_URI[patch033.md5sum] = "b551c4ee7b8713759e4143499d0bbd48" | ||
45 | SRC_URI[patch033.sha256sum] = "fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16" | ||
46 | SRC_URI[patch034.md5sum] = "c9a56fbe0348e05a886dff97f2872b74" | ||
47 | SRC_URI[patch034.sha256sum] = "f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889" | ||
48 | SRC_URI[patch035.md5sum] = "e564e8ab44ed1ca3a4e315a9f6cabdc9" | ||
49 | SRC_URI[patch035.sha256sum] = "370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3" | ||
50 | SRC_URI[patch036.md5sum] = "b00ff66c41a7c0f06e191200981980b0" | ||
51 | SRC_URI[patch036.sha256sum] = "ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c" | ||
52 | SRC_URI[patch037.md5sum] = "be2a7b05f6ae560313f3c9d5f7127bda" | ||
53 | SRC_URI[patch037.sha256sum] = "33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813" | ||
54 | SRC_URI[patch038.md5sum] = "61e0522830b24fbe8c0d1b010f132470" | ||
55 | SRC_URI[patch038.sha256sum] = "adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367" | ||
56 | SRC_URI[patch039.md5sum] = "a4775487abe958536751c8ce53cdf6f9" | ||
57 | SRC_URI[patch039.sha256sum] = "ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec" | ||
58 | SRC_URI[patch040.md5sum] = "80d3587c58854e226055ef099ffeb535" | ||
59 | SRC_URI[patch040.sha256sum] = "84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b" | ||
60 | SRC_URI[patch041.md5sum] = "20bf63eef7cb441c0b1cc49ef3191d03" | ||
61 | SRC_URI[patch041.sha256sum] = "4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a" | ||
62 | SRC_URI[patch042.md5sum] = "70790646ae61e207c995e44931390e50" | ||
63 | SRC_URI[patch042.sha256sum] = "ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919" | ||
64 | SRC_URI[patch043.md5sum] = "855a46955cb251534e80b4732b748e37" | ||
65 | SRC_URI[patch043.sha256sum] = "47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180" | ||
66 | SRC_URI[patch044.md5sum] = "29623d3282fcbb37e1158136509b5bb8" | ||
67 | SRC_URI[patch044.sha256sum] = "9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99" | ||
68 | SRC_URI[patch045.md5sum] = "4473244ca5abfd4b018ea26dc73e7412" | ||
69 | SRC_URI[patch045.sha256sum] = "ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023" | ||
70 | SRC_URI[patch046.md5sum] = "7e5fb09991c077076b86e0e057798913" | ||
71 | SRC_URI[patch046.sha256sum] = "b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f" | ||
72 | SRC_URI[patch047.md5sum] = "8483153bad1a6f52cadc3bd9a8df7835" | ||
73 | SRC_URI[patch047.sha256sum] = "c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a" | ||
74 | |||
75 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-extended/bash/bash_4.4.bb b/meta/recipes-extended/bash/bash_4.4.bb new file mode 100644 index 0000000000..b602afe8ac --- /dev/null +++ b/meta/recipes-extended/bash/bash_4.4.bb | |||
@@ -0,0 +1,58 @@ | |||
1 | require bash.inc | ||
2 | |||
3 | # GPLv2+ (< 4.0), GPLv3+ (>= 4.0) | ||
4 | LICENSE = "GPLv3+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
6 | |||
7 | SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ | ||
8 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-001;apply=yes;striplevel=0;name=patch001 \ | ||
9 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-002;apply=yes;striplevel=0;name=patch002 \ | ||
10 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003 \ | ||
11 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004 \ | ||
12 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005 \ | ||
13 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-006;apply=yes;striplevel=0;name=patch006 \ | ||
14 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-007;apply=yes;striplevel=0;name=patch007 \ | ||
15 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-008;apply=yes;striplevel=0;name=patch008 \ | ||
16 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-009;apply=yes;striplevel=0;name=patch009 \ | ||
17 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-010;apply=yes;striplevel=0;name=patch010 \ | ||
18 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-011;apply=yes;striplevel=0;name=patch011 \ | ||
19 | ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-012;apply=yes;striplevel=0;name=patch012 \ | ||
20 | file://execute_cmd.patch;striplevel=0 \ | ||
21 | file://mkbuiltins_have_stringize.patch \ | ||
22 | file://build-tests.patch \ | ||
23 | file://test-output.patch \ | ||
24 | file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ | ||
25 | file://run-ptest \ | ||
26 | file://fix-run-builtins.patch \ | ||
27 | file://0001-help-fix-printf-format-security-warning.patch \ | ||
28 | " | ||
29 | |||
30 | SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25" | ||
31 | SRC_URI[tarball.sha256sum] = "d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb" | ||
32 | |||
33 | SRC_URI[patch001.md5sum] = "817d01a6c0af6f79308a8b7b649e53d8" | ||
34 | SRC_URI[patch001.sha256sum] = "3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f" | ||
35 | SRC_URI[patch002.md5sum] = "765e14cff12c7284009772e8e24f2fe0" | ||
36 | SRC_URI[patch002.sha256sum] = "7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53" | ||
37 | SRC_URI[patch003.md5sum] = "49e7da93bf07f510a2eb6bb43ac3e5a2" | ||
38 | SRC_URI[patch003.sha256sum] = "51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2" | ||
39 | SRC_URI[patch004.md5sum] = "4557d674ab5831a5fa98052ab19edaf4" | ||
40 | SRC_URI[patch004.sha256sum] = "ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3" | ||
41 | SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5" | ||
42 | SRC_URI[patch005.sha256sum] = "221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529" | ||
43 | SRC_URI[patch006.md5sum] = "d3379f8d8abce5c6ee338f931ad008d5" | ||
44 | SRC_URI[patch006.sha256sum] = "6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8" | ||
45 | SRC_URI[patch007.md5sum] = "ec38c76ca439ca7f9c178e9baede84fc" | ||
46 | SRC_URI[patch007.sha256sum] = "de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf" | ||
47 | SRC_URI[patch008.md5sum] = "e0ba18c1e3b94f905da9b5bf9d38b58b" | ||
48 | SRC_URI[patch008.sha256sum] = "86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba" | ||
49 | SRC_URI[patch009.md5sum] = "e952d4f44e612048930c559d90eb99bb" | ||
50 | SRC_URI[patch009.sha256sum] = "0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c" | ||
51 | SRC_URI[patch010.md5sum] = "57b5b35955d68f9a09dbef6b86d2c782" | ||
52 | SRC_URI[patch010.sha256sum] = "8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06" | ||
53 | SRC_URI[patch011.md5sum] = "cc896e1fa696b93ded568e557e2392d5" | ||
54 | SRC_URI[patch011.sha256sum] = "dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d" | ||
55 | SRC_URI[patch012.md5sum] = "fa47fbfa56fb7e9e5367f19a9df5fc9e" | ||
56 | SRC_URI[patch012.sha256sum] = "fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e" | ||
57 | |||
58 | BBCLASSEXTEND = "nativesdk" | ||