summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-26 15:19:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:23 +0100
commitee0188f1e0bdb65bf2dd0e68c1bd4a51f32a4da8 (patch)
treed01bb29ac5e96870563c238d540f1392f1a03966 /meta/recipes-support
parent5b076f945a0d563dcc9c60e893d58eb0bf39a8e4 (diff)
downloadpoky-ee0188f1e0bdb65bf2dd0e68c1bd4a51f32a4da8.tar.gz
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>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch136
-rw-r--r--meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-support/vte/vte.inc15
-rw-r--r--meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch29
-rw-r--r--meta/recipes-support/vte/vte_0.28.2.bb16
-rw-r--r--meta/recipes-support/vte/vte_0.44.1.bb28
6 files changed, 57 insertions, 181 deletions
diff --git a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch b/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
deleted file mode 100644
index 9b9980397a..0000000000
--- a/meta/recipes-support/vte/vte-0.28.2/cve-2012-2738.patch
+++ /dev/null
@@ -1,136 +0,0 @@
1Upstream-Status: Backport
2CVE: CVE-2012-2738
3Signed-off-by: Ross Burton <ross.burton@intel.com>
4
5From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
6From: Christian Persch <chpe@gnome.org>
7Date: Sat, 19 May 2012 19:36:09 +0200
8Subject: [PATCH 1/2] emulation: Limit integer arguments to 65535
9
10To guard against malicious sequences containing excessively big numbers,
11limit all parsed numbers to 16 bit range. Doing this here in the parsing
12routine is a catch-all guard; this doesn't preclude enforcing
13more stringent limits in the handlers themselves.
14
15https://bugzilla.gnome.org/show_bug.cgi?id=676090
16---
17 src/table.c | 2 +-
18 src/vteseq.c | 2 +-
19 2 files changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/src/table.c b/src/table.c
22index 140e8c8..85cf631 100644
23--- a/src/table.c
24+++ b/src/table.c
25@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
26 if (G_UNLIKELY (*array == NULL)) {
27 *array = g_value_array_new(1);
28 }
29- g_value_set_long(&value, total);
30+ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
31 g_value_array_append(*array, &value);
32 } while (i++ < arginfo->length);
33 g_value_unset(&value);
34diff --git a/src/vteseq.c b/src/vteseq.c
35index 7ef4c8c..10991db 100644
36--- a/src/vteseq.c
37+++ b/src/vteseq.c
38@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
39 GValueArray *params,
40 VteTerminalSequenceHandler handler)
41 {
42- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
43+ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
44 }
45
46 static void
47--
482.4.9 (Apple Git-60)
49
50
51From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
52From: Christian Persch <chpe@gnome.org>
53Date: Sat, 19 May 2012 20:04:12 +0200
54Subject: [PATCH 2/2] emulation: Limit repetitions
55
56Don't allow malicious sequences to cause excessive repetitions.
57
58https://bugzilla.gnome.org/show_bug.cgi?id=676090
59---
60 src/vteseq.c | 25 ++++++++++++++++++-------
61 1 file changed, 18 insertions(+), 7 deletions(-)
62
63diff --git a/src/vteseq.c b/src/vteseq.c
64index 10991db..209522f 100644
65--- a/src/vteseq.c
66+++ b/src/vteseq.c
67@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
68 static void
69 vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
70 {
71- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
72+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
73 }
74
75 /* Delete a line at the current cursor position. */
76@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
77 static void
78 vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
79 {
80- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
81+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
82 }
83
84 /* Save cursor (position). */
85@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
86 {
87 GValue *value;
88 VteScreen *screen;
89- long param, end, row;
90- int i;
91+ long param, end, row, i, limit;
92 screen = terminal->pvt->screen;
93 /* The default is one. */
94 param = 1;
95@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
96 } else {
97 end = screen->insert_delta + terminal->row_count - 1;
98 }
99- /* Insert the new lines at the cursor. */
100+
101+ /* Only allow to insert as many lines as there are between this row
102+ * and the end of the scrolling region. See bug #676090.
103+ */
104+ limit = end - row + 1;
105+ param = MIN (param, limit);
106+
107 for (i = 0; i < param; i++) {
108 /* Clear a line off the end of the region and add one to the
109 * top of the region. */
110@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
111 {
112 GValue *value;
113 VteScreen *screen;
114- long param, end, row;
115- int i;
116+ long param, end, row, i, limit;
117
118 screen = terminal->pvt->screen;
119 /* The default is one. */
120@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
121 } else {
122 end = screen->insert_delta + terminal->row_count - 1;
123 }
124+
125+ /* Only allow to delete as many lines as there are between this row
126+ * and the end of the scrolling region. See bug #676090.
127+ */
128+ limit = end - row + 1;
129+ param = MIN (param, limit);
130+
131 /* Clear them from below the current cursor. */
132 for (i = 0; i < param; i++) {
133 /* Insert a line at the end of the region and remove one from
134--
1352.4.9 (Apple Git-60)
136
diff --git a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch b/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
deleted file mode 100644
index 6763d37540..0000000000
--- a/meta/recipes-support/vte/vte-0.28.2/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=691545]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd vte-0.28.2/gnome-pty-helper/configure.in vte-0.28.2/gnome-pty-helper/configure.in
5--- vte-0.28.2/gnome-pty-helper/configure.in 2010-07-15 20:08:44.000000000 +0300
6+++ vte-0.28.2/gnome-pty-helper/configure.in 2013-01-11 14:50:34.971027440 +0200
7@@ -8,7 +8,6 @@
8 AC_ISC_POSIX
9 AC_PROG_CC
10 AC_STDC_HEADERS
11-AM_PROG_CC_STDC
12
13 if test -z "$enable_maintainer_mode"; then
14 enable_maintainer_mode=yes
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
deleted file mode 100644
index 8565cc2ad6..0000000000
--- a/meta/recipes-support/vte/vte.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1SUMMARY = "Virtual terminal emulator GTK+ widget library"
2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
3LICENSE = "LGPLv2.0"
4DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
5RDEPENDS_libvte = "vte-termcap"
6
7inherit gnome gtk-doc distro_features_check upstream-version-is-even gobject-introspection
8ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
9
10EXTRA_OECONF = "--disable-python"
11
12PACKAGES =+ "libvte vte-termcap"
13FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
14FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
15
diff --git a/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
new file mode 100644
index 0000000000..fcfc559758
--- /dev/null
+++ b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
@@ -0,0 +1,29 @@
1From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 13 Jun 2016 11:05:00 +0300
4Subject: [PATCH] Don't enable stack-protection by default
5
6These are set by security_flags.inc.
7
8Upstream-Status: Inappropriate [configuration]
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10---
11 configure.ac | 2 --
12 1 file changed, 2 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 068d072..d580f84 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl
19 -fno-common dnl
20 -fdiagnostics-show-option dnl
21 -fno-strict-aliasing dnl
22- -fstack-protector dnl
23- -fstack-protector-strong dnl
24 -fno-semantic-interposition dnl
25 -Wno-deprecated-declarations dnl
26 ])
27--
282.1.4
29
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
deleted file mode 100644
index 74087ca831..0000000000
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require vte.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4
5PR = "r6"
6
7SRC_URI += "file://obsolete_automake_macros.patch \
8 file://cve-2012-2738.patch \
9 "
10
11CFLAGS += "-D_GNU_SOURCE"
12
13SRC_URI[archive.md5sum] = "497f26e457308649e6ece32b3bb142ff"
14SRC_URI[archive.sha256sum] = "86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae"
15
16RECIPE_NO_UPDATE_REASON = "matchbox-terminal needs to be ported over to new vte first"
diff --git a/meta/recipes-support/vte/vte_0.44.1.bb b/meta/recipes-support/vte/vte_0.44.1.bb
new file mode 100644
index 0000000000..ecbf58a900
--- /dev/null
+++ b/meta/recipes-support/vte/vte_0.44.1.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Virtual terminal emulator GTK+ widget library"
2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
3LICENSE = "LGPLv2.1+"
4DEPENDS = "glib-2.0 gtk+3 intltool-native"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
7
8inherit gnomebase gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
9
10SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch"
11SRC_URI[archive.md5sum] = "20916d97a5902657e54307cc2757beee"
12SRC_URI[archive.sha256sum] = "712dd548339f600fd7e221d12b2670a13a4361b2cd23ba0e057e76cc19fe5d4e"
13
14ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
15
16PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
17
18CFLAGS += "-D_GNU_SOURCE"
19
20# Enable vala only if gobject-introspection is enabled
21EXTRA_OECONF = "--enable-vala=auto"
22
23# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds.
24# Use libtool-cross (which has a hack to prevent that) instead.
25EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
26
27PACKAGES =+ "libvte"
28FILES_libvte = "${libdir}/*.so.*"