|
|
|
@ -42,7 +42,7 @@
@@ -42,7 +42,7 @@
|
|
|
|
|
Summary: X.Org X11 X server |
|
|
|
|
Name: xorg-x11-server |
|
|
|
|
Version: 1.20.11 |
|
|
|
|
Release: 10%{?gitdate:.%{gitdate}}%{?dist} |
|
|
|
|
Release: 17%{?gitdate:.%{gitdate}}%{?dist} |
|
|
|
|
URL: http://www.x.org |
|
|
|
|
License: MIT |
|
|
|
|
|
|
|
|
@ -95,6 +95,10 @@ Patch7: 0001-xkb-Drop-check-for-XkbSetMapResizeTypes.patch
@@ -95,6 +95,10 @@ Patch7: 0001-xkb-Drop-check-for-XkbSetMapResizeTypes.patch
|
|
|
|
|
# 2029769 - fbdev Xorg driver no longer works as a fallback with unsupported hardware |
|
|
|
|
Patch8: 0001-mustard-xfree86-Disable-the-PCI-probe-path.patch |
|
|
|
|
|
|
|
|
|
# 2148292 - Drop dependency on xorg-x11-font-utils |
|
|
|
|
# Upstream MR #1001 but that one is meson only |
|
|
|
|
Patch9: 0001-configure.ac-search-for-the-fontrootdir-ourselves.patch |
|
|
|
|
|
|
|
|
|
# Backports from current stable "server-1.20-branch": |
|
|
|
|
# <empty> |
|
|
|
|
|
|
|
|
@ -124,7 +128,32 @@ Patch10010: 0002-xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
@@ -124,7 +128,32 @@ Patch10010: 0002-xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
|
|
|
|
|
Patch10011: 0003-Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch |
|
|
|
|
# CVE-2021-4008 |
|
|
|
|
Patch10012: 0004-render-Fix-out-of-bounds-access-in-SProcRenderCompos.patch |
|
|
|
|
|
|
|
|
|
# CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070 |
|
|
|
|
Patch10013: 0001-xkb-switch-to-array-index-loops-to-moving-pointers.patch |
|
|
|
|
Patch10014: 0002-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch |
|
|
|
|
Patch10015: 0003-xkb-add-request-length-validation-for-XkbSetGeometry.patch |
|
|
|
|
# CVE-2022-3550 |
|
|
|
|
Patch10016: 0001-xkb-proof-GetCountedString-against-request-length-at.patch |
|
|
|
|
# CVE-2022-3551 |
|
|
|
|
Patch10017: 0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch |
|
|
|
|
# CVE-2022-46340 |
|
|
|
|
Patch10018: 0001-Xtest-disallow-GenericEvents-in-XTestSwapFakeInput.patch |
|
|
|
|
# related to CVE-2022-46344 |
|
|
|
|
Patch10019: 0002-Xi-return-an-error-from-XI-property-changes-if-verif.patch |
|
|
|
|
# CVE-2022-46344 |
|
|
|
|
Patch10020: 0003-Xi-avoid-integer-truncation-in-length-check-of-ProcX.patch |
|
|
|
|
# CVE-2022-46341 |
|
|
|
|
Patch10021: 0004-Xi-disallow-passive-grabs-with-a-detail-255.patch |
|
|
|
|
# CVE-2022-46343 |
|
|
|
|
Patch10022: 0005-Xext-free-the-screen-saver-resource-when-replacing-i.patch |
|
|
|
|
# CVE-2022-46342 |
|
|
|
|
Patch10023: 0006-Xext-free-the-XvRTVideoNotify-when-turning-off-from-.patch |
|
|
|
|
# CVE-2022-46283 |
|
|
|
|
Patch10024: 0007-xkb-reset-the-radio_groups-pointer-to-NULL-after-fre.patch |
|
|
|
|
# Follow-up to CVE-2022-46340 |
|
|
|
|
Patch10025: 0008-Xext-fix-invalid-event-type-mask-in-XTestSwapFakeInp.patch |
|
|
|
|
# CVE-2023-0494 |
|
|
|
|
Patch10026: 0001-Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch |
|
|
|
|
|
|
|
|
|
BuildRequires: make |
|
|
|
|
BuildRequires: systemtap-sdt-devel |
|
|
|
@ -133,7 +162,6 @@ BuildRequires: automake autoconf libtool pkgconfig
@@ -133,7 +162,6 @@ BuildRequires: automake autoconf libtool pkgconfig
|
|
|
|
|
BuildRequires: xorg-x11-util-macros >= 1.17 |
|
|
|
|
|
|
|
|
|
BuildRequires: xorg-x11-proto-devel >= 7.7-10 |
|
|
|
|
BuildRequires: xorg-x11-font-utils >= 7.2-11 |
|
|
|
|
|
|
|
|
|
BuildRequires: dbus-devel libepoxy-devel systemd-devel |
|
|
|
|
BuildRequires: xorg-x11-xtrans-devel >= 1.3.2 |
|
|
|
@ -339,12 +367,6 @@ test `getminor extension` == %{extension_minor}
@@ -339,12 +367,6 @@ test `getminor extension` == %{extension_minor}
|
|
|
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
sed 's/MAXSCREENS\t16/MAXSCREENS\t32/g' -i include/misc.h |
|
|
|
|
sed 's/MAXGPUSCREENS\t16/MAXGPUSCREENS\t32/g' -i include/misc.h |
|
|
|
|
sed 's/MAXCLIENTS\t2048/MAXCLIENTS\t4096/g' -i include/misc.h |
|
|
|
|
sed 's/LIMITCLIENTS\t256/LIMITCLIENTS\t1024/g' -i include/misc.h |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build |
|
|
|
|
|
|
|
|
|
%if !0%{?rhel} |
|
|
|
@ -541,6 +563,33 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
@@ -541,6 +563,33 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog |
|
|
|
|
* Tue Feb 21 2023 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-17 |
|
|
|
|
- Fix xvfb-run script with --listen-tcp |
|
|
|
|
Resolves: rhbz#2172116 |
|
|
|
|
|
|
|
|
|
* Wed Feb 08 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.11-16 |
|
|
|
|
- CVE-2023-0494 (#2166973) |
|
|
|
|
|
|
|
|
|
* Mon Dec 19 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.11-15 |
|
|
|
|
- Follow-up fix for CVE-2022-46340 (#2151776) |
|
|
|
|
|
|
|
|
|
* Wed Dec 14 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.11-14 |
|
|
|
|
- CVE fix for: CVE-2022-4283 (#2151801), CVE-2022-46340 (#2151776), |
|
|
|
|
CVE-2022-46341 (#2151781), CVE-2022-46342 (#2151788), |
|
|
|
|
CVE-2022-46343 (#2151791), CVE-2022-46344 (#2151798) |
|
|
|
|
|
|
|
|
|
* Tue Nov 29 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.11-13 |
|
|
|
|
- Drop dependency on xorg-x11-font-utils, it was only there for one pkgconfig |
|
|
|
|
query for a variable that never changes value (#2148292) |
|
|
|
|
|
|
|
|
|
* Mon Nov 14 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-12 |
|
|
|
|
- Fix CVE-2022-3550, CVE-2022-3551 |
|
|
|
|
Resolves: rhbz#2140768, rhbz#2140773 |
|
|
|
|
|
|
|
|
|
* Fri Jul 29 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-11 |
|
|
|
|
- CVE fix for: CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070 |
|
|
|
|
Resolves: rhbz#2108157, rhbz#2108162 |
|
|
|
|
|
|
|
|
|
* Thu Feb 10 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-10 |
|
|
|
|
- Fix a regression with hybrid gfx and NVIDIA proprietary driver (#2052605) |
|
|
|
|
|
|
|
|
|