diff options
author | Ross Burton <ross.burton@arm.com> | 2024-01-10 21:01:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-12 11:51:18 +0000 |
commit | 9a4ca6b08d6031ebb67adcdd650aa59acd4fb5fb (patch) | |
tree | cc79cd2ec8b80cd9e3d6c4efdeb13722675a5976 /meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch | |
parent | d64b307891422e290bbe821d4303b3af526bbe17 (diff) | |
download | openembedded-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-2019-6461.patch')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch deleted file mode 100644 index a2dba6cb20..0000000000 --- a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch +++ /dev/null @@ -1,20 +0,0 @@ -There is an assertion in function _cairo_arc_in_direction(). - -CVE: CVE-2019-6461 -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1bde774a4 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, - if (cairo_status (cr)) - return; - -- assert (angle_max >= angle_min); -+ if (angle_max < angle_min) -+ return; - - if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { - angle_max = fmod (angle_max - angle_min, 2 * M_PI); |