summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-07-14 10:21:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:48 +0100
commit220a68bfc2cfd4f243706d97e3944f02b2bc01ff (patch)
tree46d0a09accb4e49046bcdb35b7b3628d2281ce16
parent2184694a17b20346a5a2c7b84f419c5161e8a24c (diff)
downloadpoky-220a68bfc2cfd4f243706d97e3944f02b2bc01ff.tar.gz
bash: fix string format errors when enabling security flags
If security_flags.inc is included then bash 3.2.48 fails to build: | ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security] | cprintf (indentation_string); Backport a patch from upstream to solve this. (From OE-Core rev: 293d90d757d0d1e292c90cb0e9c576faf911ffcc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash-3.2.48/string-format.patch21
-rw-r--r--meta/recipes-extended/bash/bash_3.2.48.bb1
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 @@
1Fix 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
6Upstream-Status: Backport
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9diff --git a/print_cmd.c b/print_cmd.c
10index 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
25SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" 26SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8"