mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-16 03:47:03 +00:00
Code Issues Projects Releases Wiki Activity

bash: upgrade 4.4.18 -> 5.0

Browse Source 
- Rebase build-tests.patch and execute_cmd.patch to 5.0

- Drop 0001-help-fix-printf-format-security-warning.patch
  and pathexp-dep.patch, upstream has fixed them in commit
  [d233b48 bash-5.0 distribution sources and documentation]

(From OE-Core rev: db044235e72a1519a081c4f6541f7d7cfe70d49f)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
2019-05-12 16:16:24 +08:00
committed by Richard Purdie
parent 217d4d5660
commit 777b33a77c
6 changed files with 64 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
-35
View File
@@ -1,35 +0,0 @@
From e5837a42f8f48a6a721805ff8f7fcd32861d09ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
Date: Tue, 26 Jul 2016 13:09:47 +0100
Subject: [PATCH] help: fix printf() format security warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| ../../bash-4.3.30/builtins/../../bash-4.3.30/builtins/help.def: In function 'help_builtin':
| ../../bash-4.3.30/builtins/../../bash-4.3.30/builtins/help.def:130:7: error: format not a string literal and no format arguments [-Werror=format-security]
| printf (ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
| ^~~~~~
Signed-off-by: André Draszik <adraszik@tycoint.com>
---
Upstream-Status: Pending
builtins/help.def | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtins/help.def b/builtins/help.def
index 1894f17..cf624c6 100644
--- a/builtins/help.def
+++ b/builtins/help.def
@@ -127,7 +127,7 @@ help_builtin (list)
if (glob_pattern_p (list->word->word))
{
- printf (ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
+ printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
print_word_list (list, ", ");
printf ("'\n\n");
}
--
2.8.1
meta/recipes-extended/bash/bash/build-tests.patch
+5 -2
View File
@@ -2,15 +2,18 @@ Add 'ptest' target to Makefile, to run tests without checking dependencies.
Upstream-Status: Pending
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Rebase to 5.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
Makefile.in | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5fcb44b..de1c255 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -848,20 +848,34 @@ maybe-clean:
@@ -932,20 +932,34 @@ maybe-clean:
fi
recho$(EXEEXT): $(SUPPORT_SRC)recho.c
@@ -51,5 +54,5 @@ diff --git a/Makefile.in b/Makefile.in
PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
--
1.8.1.2
2.7.4
meta/recipes-extended/bash/bash/execute_cmd.patch
+14 -5
View File
@@ -1,10 +1,16 @@
Upstream-Status: Inappropriate [embedded specific]
Index: execute_cmd.c
===================================================================
--- execute_cmd.c.orig
+++ execute_cmd.c
@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous,
Rebase to 5.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
execute_cmd.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/execute_cmd.c b/execute_cmd.c
index f1d74bf..31674b4 100644
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -2567,7 +2567,11 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
/* If the `lastpipe' option is set with shopt, and job control is not
enabled, execute the last element of non-async pipelines in the
current shell environment. */
@@ -17,3 +23,6 @@ Index: execute_cmd.c
{
lstdin = move_to_high_fd (0, 1, -1);
if (lstdin > 0)
--
2.7.4
meta/recipes-extended/bash/bash/pathexp-dep.patch
-13
View File
@@ -1,13 +0,0 @@
pathexp includes libintl.h but doesn't depend on it, thus a build race can occur.
Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503)
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/Makefile.in b/Makefile.in
index c7b62bc0..241cbf12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1281,2 +1281,3 @@ nojobs.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
y.tab.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
+pathexp.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
pcomplete.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h