summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-07-04 16:02:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-10 14:12:16 +0100
commit8501934c216f679293ba63e86c02f4d59de47602 (patch)
tree5bdf2e109a81f669d7d3c781fac336a2a8b1e9a2 /meta
parent3eb5cbadd57f488fa6901bb97a0798e5af687981 (diff)
downloadpoky-8501934c216f679293ba63e86c02f4d59de47602.tar.gz
screen: upgrade to 4.4.0
Removed the following backported patch: * 0001-fix-for-multijob-build.patch * 0001-Fix-stack-overflow-due-to-too-deep-recursion.patch (From OE-Core rev: d43792151b7974f1d35a445943f62ed685288d12) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch58
-rw-r--r--meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch58
-rw-r--r--meta/recipes-extended/screen/screen_4.4.0.bb (renamed from meta/recipes-extended/screen/screen_4.3.1.bb)6
3 files changed, 2 insertions, 120 deletions
diff --git a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch b/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
deleted file mode 100644
index 4ac820fde2..0000000000
--- a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1Bug: 45713
2
3How to reproduce:
4Run this command inside screen
5$ printf '\x1b[10000000T'
6
7screen will recursively call MScrollV to depth n/256.
8This is time consuming and will overflow stack if n is huge.
9
10Fixes CVE-2015-6806
11
12Upstream-Status: Backport
13CVE: CVE-2015-6806
14
15Signed-off-by: Kuang-che Wu <kcwu@csie.org>
16Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
17Signed-off-by: Maxin B. John <maxin.john@intel.com>
18---
19diff -Naur screen-4.3.1-orig/ansi.c screen-4.3.1/ansi.c
20--- screen-4.3.1-orig/ansi.c 2015-06-29 00:22:55.000000000 +0300
21+++ screen-4.3.1/ansi.c 2015-10-06 13:13:58.297648039 +0300
22@@ -2502,13 +2502,13 @@
23 return;
24 if (n > 0)
25 {
26+ if (ye - ys + 1 < n)
27+ n = ye - ys + 1;
28 if (n > 256)
29 {
30 MScrollV(p, n - 256, ys, ye, bce);
31 n = 256;
32 }
33- if (ye - ys + 1 < n)
34- n = ye - ys + 1;
35 #ifdef COPY_PASTE
36 if (compacthist)
37 {
38@@ -2562,15 +2562,15 @@
39 }
40 else
41 {
42- if (n < -256)
43- {
44- MScrollV(p, n + 256, ys, ye, bce);
45- n = -256;
46- }
47 n = -n;
48 if (ye - ys + 1 < n)
49 n = ye - ys + 1;
50
51+ if (n > 256)
52+ {
53+ MScrollV(p, - (n - 256), ys, ye, bce);
54+ n = 256;
55+ }
56 ml = p->w_mlines + ye;
57 /* Clear lines */
58 for (i = ye; i > ye - n; i--, ml--)
diff --git a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
deleted file mode 100644
index 40ecef00bd..0000000000
--- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1Upstream-Status: Backport
2
3Backport patch to fix parallel build failure and update context to make patch
4coulde be applied.
5
6http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd
7
8Signed-off-by: Kai Kang <kai.kang@windriver.com>
9---
10From c0de6dd7970b2c7b426a5c39dcbc31c2bef87232 Mon Sep 17 00:00:00 2001
11From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
12Date: Thu, 2 Jan 2014 18:18:06 +0100
13Subject: [PATCH] fix for multijob build
14MIME-Version: 1.0
15Content-Type: text/plain; charset=UTF-8
16Content-Transfer-Encoding: 8bit
17
18make sure that comm.sh script generates comm.h header before doing
19anything else
20
21Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
22---
23 Makefile.in | 10 +++++-----
24 1 file changed, 5 insertions(+), 5 deletions(-)
25
26diff --git a/Makefile.in b/Makefile.in
27index ce86cbc..dea16d8 100644
28--- a/Makefile.in
29+++ b/Makefile.in
30@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a
31 comm.h layer.h term.h image.h display.h window.h mark.h extern.h
32 tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
33 layer.h term.h image.h display.h window.h extern.h
34-term.o: layout.h viewport.h canvas.h term.c term.h
35+term.o: layout.h viewport.h canvas.h term.c term.h comm.h
36 window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \
37 comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
38 utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
39@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a
40 comm.h layer.h term.h image.h display.h window.h extern.h \
41 braille.h
42 comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
43-kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
44+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h
45 acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
46 layer.h term.h image.h display.h window.h extern.h
47 braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
48@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a
49 viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
50 comm.h layer.h term.h image.h display.h window.h extern.h \
51 braille.h
52-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
53-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
54-list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h
55+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
56+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
57+list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
58
diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/meta/recipes-extended/screen/screen_4.4.0.bb
index 00d878b2c1..e970c5b0fc 100644
--- a/meta/recipes-extended/screen/screen_4.3.1.bb
+++ b/meta/recipes-extended/screen/screen_4.4.0.bb
@@ -22,13 +22,11 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
22 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \ 22 file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \
23 file://Skip-host-file-system-checks-when-cross-compiling.patch \ 23 file://Skip-host-file-system-checks-when-cross-compiling.patch \
24 file://Avoid-mis-identifying-systems-as-SVR4.patch \ 24 file://Avoid-mis-identifying-systems-as-SVR4.patch \
25 file://0001-fix-for-multijob-build.patch \
26 file://0002-comm.h-now-depends-on-term.h.patch \ 25 file://0002-comm.h-now-depends-on-term.h.patch \
27 file://0001-Fix-stack-overflow-due-to-too-deep-recursion.patch \
28 " 26 "
29 27
30SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad" 28SRC_URI[md5sum] = "d26e11a3648c2b11aaefa215a55dfd39"
31SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63" 29SRC_URI[sha256sum] = "ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b"
32 30
33inherit autotools texinfo 31inherit autotools texinfo
34 32