mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 09:32:13 +02:00
vte: Upgrade to 0.44.1
* License change LGPL 2.0 -> LGPL 2.1+ * vte-termcap is no more * API break: current version seems to be parallel installable with old one, but I did not opt for that. * Add patch to avoid stack protection by default * Use libtool-cross: libtool adds "-nostdlib" when g++ is used, and this leads to a link failure on PIE builds: "undefined reference to __init_array_start". libtool-cross has a hack to avoid "-nostdlib" (From OE-Core rev: dc21182ada418cf3917ae8319494d219462c5bfd) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen
committed by
Richard Purdie
Richard Purdie
parent
5b076f945a
commit
ee0188f1e0
@@ -1,136 +0,0 @@
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2012-2738
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sat, 19 May 2012 19:36:09 +0200
|
||||
Subject: [PATCH 1/2] emulation: Limit integer arguments to 65535
|
||||
|
||||
To guard against malicious sequences containing excessively big numbers,
|
||||
limit all parsed numbers to 16 bit range. Doing this here in the parsing
|
||||
routine is a catch-all guard; this doesn't preclude enforcing
|
||||
more stringent limits in the handlers themselves.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=676090
|
||||
---
|
||||
src/table.c | 2 +-
|
||||
src/vteseq.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/table.c b/src/table.c
|
||||
index 140e8c8..85cf631 100644
|
||||
--- a/src/table.c
|
||||
+++ b/src/table.c
|
||||
@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
|
||||
if (G_UNLIKELY (*array == NULL)) {
|
||||
*array = g_value_array_new(1);
|
||||
}
|
||||
- g_value_set_long(&value, total);
|
||||
+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
|
||||
g_value_array_append(*array, &value);
|
||||
} while (i++ < arginfo->length);
|
||||
g_value_unset(&value);
|
||||
diff --git a/src/vteseq.c b/src/vteseq.c
|
||||
index 7ef4c8c..10991db 100644
|
||||
--- a/src/vteseq.c
|
||||
+++ b/src/vteseq.c
|
||||
@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
|
||||
GValueArray *params,
|
||||
VteTerminalSequenceHandler handler)
|
||||
{
|
||||
- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
|
||||
+ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
2.4.9 (Apple Git-60)
|
||||
|
||||
|
||||
From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sat, 19 May 2012 20:04:12 +0200
|
||||
Subject: [PATCH 2/2] emulation: Limit repetitions
|
||||
|
||||
Don't allow malicious sequences to cause excessive repetitions.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=676090
|
||||
---
|
||||
src/vteseq.c | 25 ++++++++++++++++++-------
|
||||
1 file changed, 18 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/vteseq.c b/src/vteseq.c
|
||||
index 10991db..209522f 100644
|
||||
--- a/src/vteseq.c
|
||||
+++ b/src/vteseq.c
|
||||
@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
|
||||
static void
|
||||
vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
|
||||
{
|
||||
- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
|
||||
+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
|
||||
}
|
||||
|
||||
/* Delete a line at the current cursor position. */
|
||||
@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
|
||||
static void
|
||||
vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
|
||||
{
|
||||
- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
|
||||
+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
|
||||
}
|
||||
|
||||
/* Save cursor (position). */
|
||||
@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
|
||||
{
|
||||
GValue *value;
|
||||
VteScreen *screen;
|
||||
- long param, end, row;
|
||||
- int i;
|
||||
+ long param, end, row, i, limit;
|
||||
screen = terminal->pvt->screen;
|
||||
/* The default is one. */
|
||||
param = 1;
|
||||
@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
|
||||
} else {
|
||||
end = screen->insert_delta + terminal->row_count - 1;
|
||||
}
|
||||
- /* Insert the new lines at the cursor. */
|
||||
+
|
||||
+ /* Only allow to insert as many lines as there are between this row
|
||||
+ * and the end of the scrolling region. See bug #676090.
|
||||
+ */
|
||||
+ limit = end - row + 1;
|
||||
+ param = MIN (param, limit);
|
||||
+
|
||||
for (i = 0; i < param; i++) {
|
||||
/* Clear a line off the end of the region and add one to the
|
||||
* top of the region. */
|
||||
@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
|
||||
{
|
||||
GValue *value;
|
||||
VteScreen *screen;
|
||||
- long param, end, row;
|
||||
- int i;
|
||||
+ long param, end, row, i, limit;
|
||||
|
||||
screen = terminal->pvt->screen;
|
||||
/* The default is one. */
|
||||
@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
|
||||
} else {
|
||||
end = screen->insert_delta + terminal->row_count - 1;
|
||||
}
|
||||
+
|
||||
+ /* Only allow to delete as many lines as there are between this row
|
||||
+ * and the end of the scrolling region. See bug #676090.
|
||||
+ */
|
||||
+ limit = end - row + 1;
|
||||
+ param = MIN (param, limit);
|
||||
+
|
||||
/* Clear them from below the current cursor. */
|
||||
for (i = 0; i < param; i++) {
|
||||
/* Insert a line at the end of the region and remove one from
|
||||
--
|
||||
2.4.9 (Apple Git-60)
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=691545]
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
diff -Nurd vte-0.28.2/gnome-pty-helper/configure.in vte-0.28.2/gnome-pty-helper/configure.in
|
||||
--- vte-0.28.2/gnome-pty-helper/configure.in 2010-07-15 20:08:44.000000000 +0300
|
||||
+++ vte-0.28.2/gnome-pty-helper/configure.in 2013-01-11 14:50:34.971027440 +0200
|
||||
@@ -8,7 +8,6 @@
|
||||
AC_ISC_POSIX
|
||||
AC_PROG_CC
|
||||
AC_STDC_HEADERS
|
||||
-AM_PROG_CC_STDC
|
||||
|
||||
if test -z "$enable_maintainer_mode"; then
|
||||
enable_maintainer_mode=yes
|
||||
@@ -1,15 +0,0 @@
|
||||
SUMMARY = "Virtual terminal emulator GTK+ widget library"
|
||||
BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
|
||||
LICENSE = "LGPLv2.0"
|
||||
DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
|
||||
RDEPENDS_libvte = "vte-termcap"
|
||||
|
||||
inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
|
||||
|
||||
EXTRA_OECONF = "--disable-python"
|
||||
|
||||
PACKAGES =+ "libvte vte-termcap"
|
||||
FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
|
||||
FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 13 Jun 2016 11:05:00 +0300
|
||||
Subject: [PATCH] Don't enable stack-protection by default
|
||||
|
||||
These are set by security_flags.inc.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
configure.ac | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 068d072..d580f84 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl
|
||||
-fno-common dnl
|
||||
-fdiagnostics-show-option dnl
|
||||
-fno-strict-aliasing dnl
|
||||
- -fstack-protector dnl
|
||||
- -fstack-protector-strong dnl
|
||||
-fno-semantic-interposition dnl
|
||||
-Wno-deprecated-declarations dnl
|
||||
])
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
require vte.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
|
||||
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI += "file://obsolete_automake_macros.patch \
|
||||
file://cve-2012-2738.patch \
|
||||
"
|
||||
|
||||
CFLAGS += "-D_GNU_SOURCE"
|
||||
|
||||
SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
|
||||
SRC_URI[archive.sha256sum] = "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"
|
||||
|
||||
RECIPE_NO_UPDATE_REASON = "matchbox-terminal needs to be ported over to new vte first"
|
||||
28
meta/recipes-support/vte/vte_0.44.1.bb
Normal file
28
meta/recipes-support/vte/vte_0.44.1.bb
Normal file
@@ -0,0 +1,28 @@
|
||||
SUMMARY = "Virtual terminal emulator GTK+ widget library"
|
||||
BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
|
||||
LICENSE = "LGPLv2.1+"
|
||||
DEPENDS = "glib-2.0 gtk+3 intltool-native"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
inherit gnomebase gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
|
||||
|
||||
SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch"
|
||||
SRC_URI[archive.md5sum] = "20916d97a5902657e54307cc2757beee"
|
||||
SRC_URI[archive.sha256sum] = "712dd548339f600fd7e221d12b2670a13a4361b2cd23ba0e057e76cc19fe5d4e"
|
||||
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
|
||||
|
||||
CFLAGS += "-D_GNU_SOURCE"
|
||||
|
||||
# Enable vala only if gobject-introspection is enabled
|
||||
EXTRA_OECONF = "--enable-vala=auto"
|
||||
|
||||
# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds.
|
||||
# Use libtool-cross (which has a hack to prevent that) instead.
|
||||
EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
|
||||
|
||||
PACKAGES =+ "libvte"
|
||||
FILES_libvte = "${libdir}/*.so.*"
|
||||
Reference in New Issue
Block a user