From 7f8e85c03b3d386bff620ba94e06758e884978d919a51bde69be96d67f4195a0 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 22 Nov 2024 14:33:29 +0000
Subject: [PATCH] fixed u_mesa-CVE-2023-45913.patch re-added u_dep_xcb.patch
 adjusted changelog entry

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1346
---
 Mesa.changes                | 28 +++++++++++++---------------
 Mesa.spec                   |  4 +++-
 u_dep_xcb.patch             | 21 ++++++++++-----------
 u_mesa-CVE-2023-45913.patch |  2 +-
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index d3fa3b3..cd72721 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -8,26 +8,24 @@ Fri Nov 22 10:35:29 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 Thu Nov 21 05:09:35 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 
 - Update to release 24.3.0~rc2
-  https://www.phoronix.com/news/Mesa-24.3-rc2
+  --> https://www.phoronix.com/news/Mesa-24.3-rc2
 - Update to release 24.3.0~rc1
-  https://www.phoronix.com/news/Mesa-24.3-rc1-Released
+  --> https://www.phoronix.com/news/Mesa-24.3-rc1-Released
 - refreshed patches:
-  n_drirc-disable-rgb10-for-chromium-on-amd.patch
-  python36-buildfix1.patch
-  python36-buildfix2.patch
-  tlsdesc_test.patch
-  u_mesa-CVE-2023-45913.patch
-  u_mesa-CVE-2023-45919.patch
-  u_mesa-CVE-2023-45922.patch
-- drop patches
-  0001-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch
-  u_dep_xcb.patch
+  * n_drirc-disable-rgb10-for-chromium-on-amd.patch
+  * python36-buildfix1.patch
+  * python36-buildfix2.patch
+  * tlsdesc_test.patch
+  * u_mesa-CVE-2023-45913.patch
+  * u_mesa-CVE-2023-45919.patch
+  * u_mesa-CVE-2023-45922.patch
+  * u_dep_xcb.patch
 - drop no longer supported options:
-  -Ddri3=enabled
-  -Ddri-search-path=%{_libdir}/dri
+  * -Ddri3=enabled
+  * -Ddri-search-path=%{_libdir}/dri
 - new files added in this update currently packaged as part of
   Mesa-dri:
-  %{_libdir}/gbm/dri_gbm.so
+  * %{_libdir}/gbm/dri_gbm.so
 
 -------------------------------------------------------------------
 Tue Nov 19 12:48:59 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
diff --git a/Mesa.spec b/Mesa.spec
index 0ee923f..c55e8cf 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package Mesa
+# spec file
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -183,6 +183,7 @@ Patch17:        tlsdesc_test.patch
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
 Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch400:       n_stop-iris-flicker.patch
+Patch500:       u_dep_xcb.patch
 Patch1222040:   u_mesa-CVE-2023-45913.patch
 Patch1222041:   u_mesa-CVE-2023-45919.patch
 Patch1222042:   u_mesa-CVE-2023-45922.patch
@@ -849,6 +850,7 @@ cp %{SOURCE6} subprojects/packagecache/
 %endif
 %patch -P 100 -p1
 %patch -P 400 -p1
+%patch -P 500 -p1
 %patch -P 1222040 -p1
 %patch -P 1222041 -p1
 %patch -P 1222042 -p1
diff --git a/u_dep_xcb.patch b/u_dep_xcb.patch
index d8ee42b..3567666 100644
--- a/u_dep_xcb.patch
+++ b/u_dep_xcb.patch
@@ -1,16 +1,15 @@
-Index: mesa-24.2.2/meson.build
+Index: mesa-24.3.0/meson.build
 ===================================================================
---- mesa-24.2.2.orig/meson.build
-+++ mesa-24.2.2/meson.build
-@@ -2145,9 +2145,11 @@ if with_platform_x11
+--- mesa-24.3.0.orig/meson.build
++++ mesa-24.3.0/meson.build
+@@ -2103,8 +2103,10 @@ if with_platform_x11
      endif
    endif
-   if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
+   if with_dri_platform == 'drm'
 +    dep_x11_xcb = dependency('x11-xcb')
-     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
+     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8', required : with_x11_dri2)
  
-     if with_dri3
-+      dep_xcb = dependency('xcb')
-       dep_xcb_dri3 = dependency('xcb-dri3')
-       dep_xcb_present = dependency('xcb-present')
-       # until xcb-dri3 has been around long enough to make a hard-dependency:
++    dep_xcb = dependency('xcb')
+     dep_xcb_dri3 = dependency('xcb-dri3', version : '>= 1.13')
+     dep_xcb_present = dependency('xcb-present', version : '>= 1.13')
+     if (dep_xcb_dri3.version().version_compare('>= 1.17') and
diff --git a/u_mesa-CVE-2023-45913.patch b/u_mesa-CVE-2023-45913.patch
index 052df23..e92335a 100644
--- a/u_mesa-CVE-2023-45913.patch
+++ b/u_mesa-CVE-2023-45913.patch
@@ -9,7 +9,7 @@ Index: mesa-24.3.0-rc1/src/glx/dri2_glx.c
     __GLXDRIdrawable *pdraw;
  
 -   if (__glxHashLookup(d->dri2Hash, id, (void *) &pdraw) == 0)
-+   if (pdp && __glxHashLookup(d->dri2Hash, id, (void *) &pdraw) == 0)
++   if (d && __glxHashLookup(d->dri2Hash, id, (void *) &pdraw) == 0)
        return pdraw;
  
     return NULL;