diff --git a/xorg-x11-server-fb-access-wrapper.patch b/xorg-x11-server-fb-access-wrapper.patch new file mode 100644 index 0000000..7bb0e23 --- /dev/null +++ b/xorg-x11-server-fb-access-wrapper.patch @@ -0,0 +1,31 @@ +fb: Declare wfbFinishScreenInit, wfbScreenInit for !FB_ACCESS_WRAPPER + +xorg-x11-drv-nouveau wfbScreenInit without defining FB_ACCESS_WRAPPER +(which has other unintended side effects). Presently, this compiles +and links because compilers still support implicit function +declarations, but this is going to change fairly soon. This seems to +be the most straightforward change to keep the driver building. + +Submitted upstream: + + + +diff -ur xorg-server-1.20.14.orig/fb/fb.h xorg-server-1.20.14/fb/fb.h +--- xorg-server-1.20.14.orig/fb/fb.h 2021-12-15 20:01:24.000000000 +0100 ++++ xorg-server-1.20.14/fb/fb.h 2023-04-13 13:59:47.325341537 +0200 +@@ -1027,7 +1027,6 @@ + int dpiy, int width, /* pixel width of frame buffer */ + int bpp); /* bits per pixel of frame buffer */ + +-#ifdef FB_ACCESS_WRAPPER + extern _X_EXPORT Bool + wfbFinishScreenInit(ScreenPtr pScreen, + void *pbits, +@@ -1049,7 +1048,6 @@ + int width, + int bpp, + SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap); +-#endif + + extern _X_EXPORT Bool + fbFinishScreenInit(ScreenPtr pScreen, diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 53f1d75..2086fcd 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -46,7 +46,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.20.14 -Release: 21%{?gitdate:.%{gitdate}}%{?dist} +Release: 22%{?gitdate:.%{gitdate}}%{?dist} URL: http://www.x.org License: MIT @@ -138,6 +138,8 @@ Patch123: 0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch # CVE-2023-1393 Patch124: 0001-composite-Fix-use-after-free-of-the-COW.patch +Patch125: xorg-x11-server-fb-access-wrapper.patch + # Only on F38 and later (patch number starts at 3801, see autopatch below) # Upstream commits 73d6e88, f69280dd and 4127776, minus the xwayland.pc.in change Patch3801: 0001-Disallow-byte-swapped-clients-by-default.patch @@ -556,6 +558,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Thu Apr 13 2023 Florian Weimer - 1.20.14-22 +- Make more functions available in fb.h with !FB_ACCESS_WRAPPER + * Wed Mar 29 2023 Olivier Fourdan - 1.20.14-21 - CVE fix for: CVE-2023-1393