Skip to contentSkip to conversation

cairo: upgrade 1.16.0 -> 1.17.4

PATCH In review wangmy 3 participants 9 messages Mar 31, 2021 – Apr 5, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 cairo: upgrade 1.16.0 -> 1.17.4

CVE-2018-19876.patch
removed since it is included in 1.17.4

---
 .../cairo/cairo/CVE-2018-19876.patch          | 34 -------------------
 .../{cairo_1.16.0.bb => cairo_1.17.4.bb}      |  7 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
 rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb => cairo_1.17.4.bb} (94%)
meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch deleted +0 -34
deleted file mode 100644
index 4252a5663b..0000000000
@@ -1,34 +0,0 @@
-CVE: CVE-2018-19876
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <[email protected]>
-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
-
meta/recipes-graphics/cairo/cairo_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +3 -4
similarity index 94%
rename from meta/recipes-graphics/cairo/cairo_1.16.0.bb
rename to meta/recipes-graphics/cairo/cairo_1.17.4.bb
index 68f993d7ca..e92540c49e 100644
@@ -22,15 +22,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
 DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
+SRC_URI = "https://cairographics.org/snapshots/cairo-${PV}.tar.xz \
            file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
-           file://CVE-2018-19876.patch \
            file://CVE-2019-6461.patch \
            file://CVE-2019-6462.patch \
           "
 
-SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552"
-SRC_URI[sha256sum] = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
+SRC_URI[md5sum] = "bf9d0d324ecbd350d0e9308125fa4ce0"
+SRC_URI[sha256sum] = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"
 
 inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/1 ccache: upgrade 4.2 -> 4.2.1

License-Update: add license information of src/third_party/win32/winerror_to_errno.h

---
 .../ccache/{ccache_4.2.bb => ccache_4.2.1.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/ccache/{ccache_4.2.bb => ccache_4.2.1.bb} (78%)
meta/recipes-devtools/ccache/ccache_4.2.1.bb renamed from meta/recipes-devtools/ccache/ccache_4.2.bb +2 -2
similarity index 78%
rename from meta/recipes-devtools/ccache/ccache_4.2.bb
rename to meta/recipes-devtools/ccache/ccache_4.2.1.bb
index 9957bc7e65..90b9c6181f 100644
@@ -7,12 +7,12 @@ HOMEPAGE = "http://ccache.samba.org"
 SECTION = "devel"
 
 LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=28afb89f649f309e7ac1aab554564637"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=698a26b57e513d678e1e7727bf56395b"
 
 DEPENDS = "zstd"
 
 SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "dbf139ff32031b54cb47f2d7983269f328df14b5a427882f89f7721e5c411b7e"
+SRC_URI[sha256sum] = "320d2b17d2f76393e5d4bb28c8dee5ca783248e9cd23dff0654694d60f8a4b62"
 
 UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 1/1 ell: upgrade 0.38 -> 0.39

In reply to wangmy
---
 meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} (90%)
meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb +1 -1
similarity index 90%
rename from meta/recipes-core/ell/ell_0.38.bb
rename to meta/recipes-core/ell/ell_0.39.bb
index 7d3a339978..68ec4cb4a4 100644
@@ -17,7 +17,7 @@ inherit autotools pkgconfig
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
            file://0001-pem.c-do-not-use-rawmemchr.patch \
            "
-SRC_URI[sha256sum] = "c1b7ae5676eec310f08757b3d8652b8e818776be1897fb5deb59e55f02a012a7"
+SRC_URI[sha256sum] = "653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08"
 
 do_configure_prepend () {
     mkdir -p ${S}/build-aux
Signature · 1 line
2.25.1
#3 lore raw

Re: [OE-core] [PATCH] ell: upgrade 0.38 -> 0.39

iwd fails to build with this upgrade, its expecting some bult sources from ell and they dont exist. Please take a look

https://errors.yoctoproject.org/Errors/Details/575442/

even 1.13 upgrade fails,

Quoted 29 lines · wangmy
---
 meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} (90%)
meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb +1 -2
similarity index 90%
rename from meta/recipes-core/ell/ell_0.38.bb
rename to meta/recipes-core/ell/ell_0.39.bb
index 7d3a339978..68ec4cb4a4 100644
@@ -17,7 +17,7 @@ inherit autotools pkgconfig
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
            file://0001-pem.c-do-not-use-rawmemchr.patch \
            "
-SRC_URI[sha256sum] = "c1b7ae5676eec310f08757b3d8652b8e818776be1897fb5deb59e55f02a012a7"
+SRC_URI[sha256sum] = "653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08"
 
 do_configure_prepend () {
     mkdir -p ${S}/build-aux
--

2.25.1

#4 lore raw

Re: [OE-core] [PATCH] ell: upgrade 0.38 -> 0.39

I have sent a patch to fix iwd as well. so we should be good except that sadly upstream has introduced nested functions in both ell and iwd, which means we can use clang to compile them anymore :(, I wish it remained portable as it was. however when you touch ell, iwd is tied to it, so always see if iwd is ok when ell is upgraded.

Quoted 38 lines · Khem Raj

iwd fails to build with this upgrade, its expecting some bult sources from ell and they dont exist. Please take a look

https://errors.yoctoproject.org/Errors/Details/575442/

even 1.13 upgrade fails,

Quoted 29 lines · wangmy
---
 meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} (90%)
meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb +1 -2
similarity index 90%
rename from meta/recipes-core/ell/ell_0.38.bb
rename to meta/recipes-core/ell/ell_0.39.bb
index 7d3a339978..68ec4cb4a4 100644
@@ -17,7 +17,7 @@ inherit autotools pkgconfig
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
            file://0001-pem.c-do-not-use-rawmemchr.patch \
            "
-SRC_URI[sha256sum] = "c1b7ae5676eec310f08757b3d8652b8e818776be1897fb5deb59e55f02a012a7"
+SRC_URI[sha256sum] = "653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08"
 
 do_configure_prepend () {
     mkdir -p ${S}/build-aux
--

2.25.1

author
#5 lore raw

Re: [OE-core] [PATCH] ell: upgrade 0.38 -> 0.39

Sorry, I took a long holiday a few days ago, so I didn't respond to the email in time.

Thank you very much for solving this problem. I will consider iwd when I upgrade ell in the future

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 57 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Khem Raj
Sent: Tuesday, April 6, 2021 5:58 AM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] ell: upgrade 0.38 -> 0.39

I have sent a patch to fix iwd as well. so we should be good except that sadly upstream has introduced nested functions in both ell and iwd, which means we can use clang to compile them anymore :(, I wish it remained portable as it was. however when you touch ell, iwd is tied to it, so always see if iwd is ok when ell is upgraded.

Quoted 16 lines · Khem Raj

iwd fails to build with this upgrade, its expecting some bult sources from ell and they dont exist. Please take a look

https://errors.yoctoproject.org/Errors/Details/575442/

even 1.13 upgrade fails,

Quoted 7 lines · wangmy
---
 meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)  rename

meta/recipes-core/ell/{ell_0.38.bb => ell_0.39.bb} (90%)

Quoted 13 lines

meta/recipes-core/ell/ell_0.39.bb inherit autotools pkgconfig SRC_URI = · line 20

Quoted 13 lines
meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb rename to +0 -0
similarity index 90%
rename from meta/recipes-core/ell/ell_0.38.bb rename to

meta/recipes-core/ell/ell_0.39.bb index 7d3a339978..68ec4cb4a4 100644

meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb +0 -1
@@ -17,7 +17,7 @@ inherit autotools pkgconfig  SRC_URI =
 "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \
            file://0001-pem.c-do-not-use-rawmemchr.patch \
            "
-SRC_URI[sha256sum] =

"c1b7ae5676eec310f08757b3d8652b8e818776be1897fb5deb59e55f02a012a7"

Quoted 1 line

meta/recipes-core/ell/ell_0.39.bb inherit autotools pkgconfig SRC_URI = · line 20

Quoted 1 line
meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb +1 -0
+SRC_URI[sha256sum] =

"653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08"

Quoted 9 lines
Quoted 9 lines
meta/recipes-core/ell/ell_0.39.bb renamed from meta/recipes-core/ell/ell_0.38.bb +0 -1
 do_configure_prepend () {
     mkdir -p ${S}/build-aux
--

2.25.1

author
#6 lore raw

PATCH 1/1 dbus-glib: upgrade 0.110 -> 0.112

In reply to wangmy

License-Update:add the following information of license
SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later

---
 .../dbus/{dbus-glib_0.110.bb => dbus-glib_0.112.bb}       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-core/dbus/{dbus-glib_0.110.bb => dbus-glib_0.112.bb} (84%)
meta/recipes-core/dbus/dbus-glib_0.112.bb renamed from meta/recipes-core/dbus/dbus-glib_0.110.bb +4 -4
similarity index 84%
rename from meta/recipes-core/dbus/dbus-glib_0.110.bb
rename to meta/recipes-core/dbus/dbus-glib_0.112.bb
index 0b45805cf4..003c3accc3 100644
@@ -3,8 +3,8 @@ DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \
 the D-Bus library with the GLib thread abstraction and main loop."
 HOMEPAGE = "https://www.freedesktop.org/Software/dbus"
 LICENSE = "AFL-2.1 | GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
-                    file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c31c73c1d8f5d06784b2ccd22e42d641 \
+                    file://dbus/dbus-glib.h;beginline=7;endline=21;md5=c374833bd817988323f3a8fda0dc7f48"
 SECTION = "base"
 
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
@@ -14,8 +14,8 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.g
            file://no-examples.patch \
            file://test-install-makefile.patch \
 "
-SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192"
-SRC_URI[sha256sum] = "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
+SRC_URI[md5sum] = "021e6c8a288df02c227e4aafbf7e7527"
+SRC_URI[sha256sum] = "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a"
 
 inherit autotools pkgconfig gettext bash-completion gtk-doc
 
Signature · 1 line
2.25.1
#7 lore raw
In reply to wangmy

This is a development version, which is made very clearly:
https://cairographics.org/snapshots/

What's the rationale for this update?

Alex

Quoted 91 lines · wangmy

CVE-2018-19876.patch
removed since it is included in 1.17.4

---
 .../cairo/cairo/CVE-2018-19876.patch          | 34 -------------------
 .../{cairo_1.16.0.bb => cairo_1.17.4.bb}      |  7 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
 rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb => cairo_1.17.4.bb}

(94%)

meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch deleted +0 -34
deleted file mode 100644
index 4252a5663b..0000000000
@@ -1,34 +0,0 @@
-CVE: CVE-2018-19876
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <[email protected]>
-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
-
meta/recipes-graphics/cairo/cairo_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +0 -0
similarity index 94%
rename from meta/recipes-graphics/cairo/cairo_1.16.0.bb
rename to meta/recipes-graphics/cairo/cairo_1.17.4.bb
index 68f993d7ca..e92540c49e 100644
@@ -22,15 +22,14 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"

DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"

meta/recipes-graphics/cairo/cairo_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +1 -4
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
+SRC_URI = "https://cairographics.org/snapshots/cairo-${PV}.tar.xz \
            file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
-           file://CVE-2018-19876.patch \
            file://CVE-2019-6461.patch \
            file://CVE-2019-6462.patch \
           "
 
-SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552"
-SRC_URI[sha256sum] =

"5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"

meta/recipes-graphics/cairo/cairo_1.17.4.bb renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +2 -0
+SRC_URI[md5sum] = "bf9d0d324ecbd350d0e9308125fa4ce0"
+SRC_URI[sha256sum] =

"74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"

inherit autotools pkgconfig upstream-version-is-even gtk-doc
multilib_script

--
2.25.1

author
#8 lore raw

This is an upgrade to solve the CVE problem.

Please ignore the upgrade. I will upgrade it after the new version is released.

--
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]<mailto:[email protected]>
http://www.fujitsu.com/cn/fnst/

From: Alexander Kanavin <[email protected]>
Sent: Wednesday, March 31, 2021 11:49 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: OE-core <[email protected]>; Richard Purdie <[email protected]>
Subject: Re: [OE-core] [PATCH] cairo: upgrade 1.16.0 -> 1.17.4

This is a development version, which is made very clearly:
https://cairographics.org/snapshots/

What's the rationale for this update?

Alex

On Wed, 31 Mar 2021 at 16:22, wangmy <[email protected]<mailto:[email protected]>> wrote:
CVE-2018-19876.patch
removed since it is included in 1.17.4

---
 .../cairo/cairo/CVE-2018-19876.patch          | 34 -------------------
 .../{cairo_1.16.0.bb<http://cairo_1.16.0.bb> => cairo_1.17.4.bb<http://cairo_1.17.4.bb>}      |  7 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch
 rename meta/recipes-graphics/cairo/{cairo_1.16.0.bb<http://cairo_1.16.0.bb> => cairo_1.17.4.bb<http://cairo_1.17.4.bb>} (94%)
meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch deleted +0 -34
deleted file mode 100644
index 4252a5663b..0000000000
@@ -1,34 +0,0 @@
-CVE: CVE-2018-19876
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]<mailto:[email protected]>>
-
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <[email protected]<mailto:[email protected]>>
-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
-
meta/recipes-graphics/cairo/cairo_1.17.4.bb<http://cairo_1.17.4.bb> renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> +3 -4
similarity index 94%
rename from meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb>
rename to meta/recipes-graphics/cairo/cairo_1.17.4.bb<http://cairo_1.17.4.bb>
index 68f993d7ca..e92540c49e 100644
@@ -22,15 +22,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
 DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz<http://cairographics.org/releases/cairo-$%7BPV%7D.tar.xz> \
+SRC_URI = "https://cairographics.org/snapshots/cairo-${PV}.tar.xz<https://cairographics.org/snapshots/cairo-$%7BPV%7D.tar.xz> \
            file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
-           file://CVE-2018-19876.patch \
            file://CVE-2019-6461.patch \
            file://CVE-2019-6462.patch \
           "
 
-SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552"
-SRC_URI[sha256sum] = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
+SRC_URI[md5sum] = "bf9d0d324ecbd350d0e9308125fa4ce0"
+SRC_URI[sha256sum] = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"
 
 inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script
 

--
2.25.1