diff options
Diffstat (limited to 'meta/recipes-extended/screen')
| -rw-r--r-- | meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch | 58 | ||||
| -rw-r--r-- | meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-extended/screen/screen_4.5.1.bb (renamed from meta/recipes-extended/screen/screen_4.3.1.bb) | 9 |
3 files changed, 22 insertions, 81 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 @@ -Bug: 45713 - -How to reproduce: -Run this command inside screen -$ printf '\x1b[10000000T' - -screen will recursively call MScrollV to depth n/256. -This is time consuming and will overflow stack if n is huge. - -Fixes CVE-2015-6806 - -Upstream-Status: Backport -CVE: CVE-2015-6806 - -Signed-off-by: Kuang-che Wu <kcwu@csie.org> -Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur screen-4.3.1-orig/ansi.c screen-4.3.1/ansi.c ---- screen-4.3.1-orig/ansi.c 2015-06-29 00:22:55.000000000 +0300 -+++ screen-4.3.1/ansi.c 2015-10-06 13:13:58.297648039 +0300 -@@ -2502,13 +2502,13 @@ - return; - if (n > 0) - { -+ if (ye - ys + 1 < n) -+ n = ye - ys + 1; - if (n > 256) - { - MScrollV(p, n - 256, ys, ye, bce); - n = 256; - } -- if (ye - ys + 1 < n) -- n = ye - ys + 1; - #ifdef COPY_PASTE - if (compacthist) - { -@@ -2562,15 +2562,15 @@ - } - else - { -- if (n < -256) -- { -- MScrollV(p, n + 256, ys, ye, bce); -- n = -256; -- } - n = -n; - if (ye - ys + 1 < n) - n = ye - ys + 1; - -+ if (n > 256) -+ { -+ MScrollV(p, - (n - 256), ys, ye, bce); -+ n = 256; -+ } - ml = p->w_mlines + ye; - /* Clear lines */ - 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 index 40ecef00bd..fbdb0eb478 100644 --- a/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch +++ b/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch @@ -1,3 +1,13 @@ +From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Tue, 26 Jul 2016 14:23:59 +0800 +Subject: [PATCH] fix for multijob build + +make sure that comm.sh script generates comm.h header before doing +anything else + +Signed-off-by: Amadeusz Sawiski <amade@asmblr.net> + Upstream-Status: Backport Backport patch to fix parallel build failure and update context to make patch @@ -6,25 +16,13 @@ coulde be applied. http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd Signed-off-by: Kai Kang <kai.kang@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- -From c0de6dd7970b2c7b426a5c39dcbc31c2bef87232 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net> -Date: Thu, 2 Jan 2014 18:18:06 +0100 -Subject: [PATCH] fix for multijob build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -make sure that comm.sh script generates comm.h header before doing -anything else - -Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> ---- - Makefile.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index ce86cbc..dea16d8 100644 +index aca7da3..3607711 100644 --- a/Makefile.in +++ b/Makefile.in @@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a @@ -51,8 +49,10 @@ index ce86cbc..dea16d8 100644 braille.h -list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h -list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h --list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h +list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h +list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h -+list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h + list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h +-- +1.9.1 + diff --git a/meta/recipes-extended/screen/screen_4.3.1.bb b/meta/recipes-extended/screen/screen_4.5.1.bb index 00d878b2c1..32c1a5af49 100644 --- a/meta/recipes-extended/screen/screen_4.3.1.bb +++ b/meta/recipes-extended/screen/screen_4.5.1.bb @@ -22,13 +22,12 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch \ file://Skip-host-file-system-checks-when-cross-compiling.patch \ file://Avoid-mis-identifying-systems-as-SVR4.patch \ - file://0001-fix-for-multijob-build.patch \ file://0002-comm.h-now-depends-on-term.h.patch \ - file://0001-Fix-stack-overflow-due-to-too-deep-recursion.patch \ + file://0001-fix-for-multijob-build.patch \ " -SRC_URI[md5sum] = "5bb3b0ff2674e29378c31ad3411170ad" -SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63" +SRC_URI[md5sum] = "a8c5da2f42f8a18fa4dada2419d1549b" +SRC_URI[sha256sum] = "97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d" inherit autotools texinfo @@ -39,7 +38,7 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" do_install_append () { - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen fi } |