From be8209104f87d72094b3a0de35c29e0125d79935 Mon Sep 17 00:00:00 2001 From: Clyybber Date: Tue, 29 Nov 2022 21:56:11 +0100 Subject: [PATCH] pixman: update to 0.42.2. --- srcpkgs/pixman/patches/backport-0.42.2.patch | 29 -------------------- srcpkgs/pixman/template | 6 ++-- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/pixman/patches/backport-0.42.2.patch diff --git a/srcpkgs/pixman/patches/backport-0.42.2.patch b/srcpkgs/pixman/patches/backport-0.42.2.patch deleted file mode 100644 index 29804fca86e4..000000000000 --- a/srcpkgs/pixman/patches/backport-0.42.2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Wed, 2 Nov 2022 12:07:32 -0400 -Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write - -Thanks to Maddie Stone and Google's Project Zero for discovering this -issue, providing a proof-of-concept, and a great analysis. - -Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63 ---- - pixman/pixman-trap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c -index 91766fd..7560405 100644 ---- a/pixman/pixman-trap.c -+++ b/pixman/pixman-trap.c -@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y, - - if (f < Y_FRAC_FIRST (n)) - { -- if (pixman_fixed_to_int (i) == 0x8000) -+ if (pixman_fixed_to_int (i) == 0xffff8000) - { - f = 0; /* saturate */ - } --- -GitLab - diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template index 8dd8cb63fa03..29f17803188e 100644 --- a/srcpkgs/pixman/template +++ b/srcpkgs/pixman/template @@ -1,7 +1,7 @@ # Template file for 'pixman' pkgname=pixman -version=0.40.0 -revision=2 +version=0.42.2 +revision=1 build_style=meson # gtk is only necessary for demos, disabled to avoid dependency loop # openmp is only used in demos and tests, and things still test without it @@ -14,7 +14,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="http://pixman.org/" distfiles="https://www.cairographics.org/releases/${pkgname}-${version}.tar.gz" -checksum=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc +checksum=ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e # set stacksize for musl: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595 LDFLAGS="-Wl,-z,stack-size=2097152"