summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-01-10 21:01:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-12 11:51:18 +0000
commit9a4ca6b08d6031ebb67adcdd650aa59acd4fb5fb (patch)
treecc79cd2ec8b80cd9e3d6c4efdeb13722675a5976 /meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
parentd64b307891422e290bbe821d4303b3af526bbe17 (diff)
downloadopenembedded-core-9a4ca6b08d6031ebb67adcdd650aa59acd4fb5fb.tar.gz
cairo: upgrade to 1.18.0
The changelog is large[1] but: Added: - Type 3 colour and COLRv2 fonts - Tee surfice automatically enabled - Meson build system Removed: - The cairo-sphinx tool - The XML, GL, GLES, Qt5, BeOS, OS/2, DirectFB, DRM, Cogl, and OpenVL backends - Autotools build system These CVE patches have been merged upstream: CVE-2018-19876.patch: https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645 CVE-2019-6461.patch: https://gitlab.freedesktop.org/cairo/cairo/-/commit/09643ee1abdd5daacebfcb564448f29be9a79bac CVE-2019-6462.patch: https://gitlab.freedesktop.org/cairo/cairo/-/commit/bbeaf08190d3006a80b80a77724801cd477a37b8 CVE-2020-35492.patch: https://gitlab.freedesktop.org/cairo/cairo/-/commit/c986a7310bb06582b7d8a566d5f007ba4e5e75bf Some niche options have been removed in the migration to Meson, so the recipe can be cleaned up. Put libcairo-fdr ("flight data recorder") in the perf-utils package instead of deleting it. There is an executable test for IPC behaviour that needs to be set via a cross file if qemu-user isn't available, thanks to Alex Kanavin for this portion. [1] https://www.cairographics.org/news/cairo-1.18.0/ Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch')
-rw-r--r--meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch b/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
deleted file mode 100644
index 4252a5663b..0000000000
--- a/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-CVE: CVE-2018-19876
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon, 19 Nov 2018 12:33:07 +0100
-Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
- cairo_ft_apply_variations
-
-Fixes a crash when using freetype >= 2.9
----
- src/cairo-ft-font.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..981973f78 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2393,7 +2393,11 @@ skip:
- done:
- free (coords);
- free (current_coords);
-+#if HAVE_FT_DONE_MM_VAR
-+ FT_Done_MM_Var (face->glyph->library, ft_mm_var);
-+#else
- free (ft_mm_var);
-+#endif
- }
- }
-
---
-2.11.0
-