diff options
-rw-r--r-- | meta/recipes-extended/bash/bash-3.2.48/string-format.patch | 21 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_3.2.48.bb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-3.2.48/string-format.patch b/meta/recipes-extended/bash/bash-3.2.48/string-format.patch new file mode 100644 index 0000000000..eda39649d9 --- /dev/null +++ b/meta/recipes-extended/bash/bash-3.2.48/string-format.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Fix a string format warning when using security flags: | ||
2 | |||
3 | | ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security] | ||
4 | | cprintf (indentation_string); | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/print_cmd.c b/print_cmd.c | ||
10 | index d1dfd1a..956db53 100644 | ||
11 | --- a/print_cmd.c | ||
12 | +++ b/print_cmd.c | ||
13 | @@ -1149,7 +1149,7 @@ indent (amount) | ||
14 | for (i = 0; amount > 0; amount--) | ||
15 | indentation_string[i++] = ' '; | ||
16 | indentation_string[i] = '\0'; | ||
17 | - cprintf (indentation_string); | ||
18 | + cprintf ("%s", indentation_string); | ||
19 | } | ||
20 | |||
21 | static void | ||
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index d42b292b0a..6b4028df11 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb | |||
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ | |||
20 | file://test-output.patch \ | 20 | file://test-output.patch \ |
21 | file://run-ptest \ | 21 | file://run-ptest \ |
22 | file://dont-include-target-CFLAGS-in-host-LDFLAGS.patch \ | 22 | file://dont-include-target-CFLAGS-in-host-LDFLAGS.patch \ |
23 | file://string-format.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" | 26 | SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" |