summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/security_flags.inc1
-rw-r--r--meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch29
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.bb1
3 files changed, 30 insertions, 1 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 5a1ea0de8e..89fd45b859 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -91,7 +91,6 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
91 91
92# Recipes which fail to compile when elevating -Wformat-security to an error 92# Recipes which fail to compile when elevating -Wformat-security to an error
93SECURITY_STRINGFORMAT_pn-busybox = "" 93SECURITY_STRINGFORMAT_pn-busybox = ""
94SECURITY_STRINGFORMAT_pn-expect = ""
95SECURITY_STRINGFORMAT_pn-gcc = "" 94SECURITY_STRINGFORMAT_pn-gcc = ""
96SECURITY_STRINGFORMAT_pn-oh-puzzles = "" 95SECURITY_STRINGFORMAT_pn-oh-puzzles = ""
97 96
diff --git a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
new file mode 100644
index 0000000000..af1d8c626c
--- /dev/null
+++ b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
@@ -0,0 +1,29 @@
1From 107cc370705d8520ba42f1416d89ed3544277c83 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 23 Mar 2017 13:44:41 +0200
4Subject: [PATCH] Resolve string formatting issues.
5
6Upstream-Status: Inappropriate [upstream seems dead]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 exp_clib.c | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/exp_clib.c b/exp_clib.c
13index 172c05e..809200e 100644
14--- a/exp_clib.c
15+++ b/exp_clib.c
16@@ -1476,8 +1476,8 @@ expDiagLogU(str)
17 char *str;
18 {
19 if (exp_is_debugging) {
20- fprintf(stderr,str);
21- if (exp_logfile) fprintf(exp_logfile,str);
22+ fprintf(stderr, "%s", str);
23+ if (exp_logfile) fprintf(exp_logfile, "%s", str);
24 }
25 }
26
27--
282.11.0
29
diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb
index ab22a61394..630f2e4649 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
25 file://0002-tcl.m4.patch \ 25 file://0002-tcl.m4.patch \
26 file://01-example-shebang.patch \ 26 file://01-example-shebang.patch \
27 file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \ 27 file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
28 file://0001-Resolve-string-formatting-issues.patch \
28 " 29 "
29SRC_URI[md5sum] = "44e1a4f4c877e9ddc5a542dfa7ecc92b" 30SRC_URI[md5sum] = "44e1a4f4c877e9ddc5a542dfa7ecc92b"
30SRC_URI[sha256sum] = "b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040" 31SRC_URI[sha256sum] = "b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040"