backport-CVE-2022-44638.patch

@@ -1,32 +0,0 @@
-From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-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
-
-Conflict:NA
-Reference:https://gitlab.freedesktop.org/pixman/pixman/-/commit/a1f88e842e0216a5b4df1ab023caebe33c101395
----
- 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
-

pixman.spec

@@ -1,12 +1,10 @@
 Name:              pixman		
-Version:	   0.40.0
+Version:	   0.38.0
-Release:           3
+Release:           1
 Summary:           Pixman is a pixel manipulation library for X and Cairo
 License:           MIT
 URL:               https://gitlab.freedesktop.org/pixman/pixman
-Source0:           https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-%{version}/pixman-pixman-%{version}.tar.bz2
+Source0:           https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
-
-Patch6000:	   backport-CVE-2022-44638.patch
 
 BuildRequires:     gcc meson
 
@@ -23,7 +21,7 @@ Requires:          pkgconfig
 Provide library and header files for pixman
 
 %prep
-%autosetup -n pixman-%{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -p1
 sed -i 's/120/600/' test/meson.build
 
 %build
@@ -55,18 +53,6 @@ sed -i 's/120/600/' test/meson.build
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Tue Nov 08 2022 wangkerong <wangkerong@h-partners.com> - 0.40.0-3
-- fix CVE-2022-44638
-
-* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 0.40.0-2
-- Rebuild for next release
-
-* Mon Apr 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.40.0-1
-- Type:enhancement
-- Id:NA
-- SUG:NA
-- DESC:update to 0.40.0
-
 * Mon Sep 9 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.38.0-1
 - Type:enhancement
 - Id:NA