|
 |
2a49a8 |
%global commit 280aac5a0ee09c45b17ec4be0681397f7c34c12e
|
|
|
2a49a8 |
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
|
|
2a49a8 |
|
|
|
2a49a8 |
#global gitdate 20210201
|
|
|
2a49a8 |
%global pkgname %{?gitdate:xserver}%{!?gitdate:xwayland}
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
|
|
|
2a49a8 |
|
|
|
2a49a8 |
Summary: Xwayland
|
|
|
2a49a8 |
Name: xorg-x11-server-Xwayland
|
|
|
823e4a |
Version: 21.1.3
|
|
|
88131a |
Release: 6%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
|
|
|
2a49a8 |
|
|
|
2a49a8 |
URL: http://www.x.org
|
|
|
2a49a8 |
%if 0%{?gitdate}
|
|
|
2a49a8 |
Source0: https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{pkgname}-%{shortcommit}.tar.gz
|
|
|
2a49a8 |
%else
|
|
|
2a49a8 |
Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
|
|
|
2a49a8 |
%endif
|
|
|
5f5628 |
|
|
|
823e4a |
Patch1: 0001-xwayland-eglstream-Demote-EGLstream-device-warning.patch
|
|
|
823e4a |
Patch2: 0002-xwayland-glamor-Change-errors-to-verbose-messages.patch
|
|
|
823e4a |
Patch3: 0003-xwayland-glamor-Log-backend-selected-for-debug.patch
|
|
|
823e4a |
Patch4: 0004-xwayland-eglstream-Prefer-EGLstream-if-available.patch
|
|
|
823e4a |
|
|
|
823e4a |
# CVE-2021-4011
|
|
|
823e4a |
Patch10001: 0001-record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
|
|
|
823e4a |
# CVE-2021-4009
|
|
|
823e4a |
Patch10002: 0002-xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
|
|
|
823e4a |
# CVE-2021-4010
|
|
|
823e4a |
Patch10003: 0003-Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch
|
|
|
823e4a |
# CVE-2021-4008
|
|
|
823e4a |
Patch10004: 0004-render-Fix-out-of-bounds-access-in-SProcRenderCompos.patch
|
|
|
88131a |
# CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070
|
|
|
88131a |
Patch10005: 0001-xkb-switch-to-array-index-loops-to-moving-pointers.patch
|
|
|
88131a |
Patch10006: 0002-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
|
|
|
88131a |
Patch10007: 0003-xkb-add-request-length-validation-for-XkbSetGeometry.patch
|
|
|
5f5628 |
|
|
|
2a49a8 |
License: MIT
|
|
|
2a49a8 |
|
|
|
2a49a8 |
Requires: xorg-x11-server-common
|
|
|
2a49a8 |
Requires: libEGL
|
|
|
46d479 |
Requires: libepoxy >= 1.5.5
|
|
|
2a49a8 |
|
|
|
2a49a8 |
BuildRequires: gcc
|
|
|
2a49a8 |
BuildRequires: git-core
|
|
|
2a49a8 |
BuildRequires: meson
|
|
|
2a49a8 |
|
|
|
2a49a8 |
BuildRequires: wayland-devel
|
|
|
2a49a8 |
BuildRequires: pkgconfig(wayland-client) >= 1.3.0
|
|
|
2a49a8 |
BuildRequires: pkgconfig(wayland-protocols)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(wayland-eglstream-protocols)
|
|
|
2a49a8 |
|
|
|
2a49a8 |
BuildRequires: pkgconfig(dmx)
|
|
|
46d479 |
BuildRequires: pkgconfig(epoxy) >= 1.5.5
|
|
|
2a49a8 |
BuildRequires: pkgconfig(fontenc)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(libdrm) >= 2.4.0
|
|
|
2a49a8 |
BuildRequires: pkgconfig(libssl)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(libtirpc)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(pixman-1)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(x11)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xau)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xdmcp)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xext)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xfixes)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xfont2)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xi)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xinerama)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xkbfile)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xmu)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xorg-macros) >= 1.17
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xpm)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xrender)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xres)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xshmfence) >= 1.1
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xtrans) >= 1.3.2
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xtst)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xv)
|
|
|
2a49a8 |
BuildRequires: xorg-x11-proto-devel >= 7.7-10
|
|
|
2a49a8 |
|
|
|
2a49a8 |
BuildRequires: mesa-libGL-devel >= 9.2
|
|
|
2a49a8 |
BuildRequires: mesa-libEGL-devel
|
|
|
2a49a8 |
BuildRequires: mesa-libgbm-devel
|
|
|
2a49a8 |
|
|
|
2a49a8 |
BuildRequires: audit-libs-devel
|
|
|
2a49a8 |
BuildRequires: libselinux-devel >= 2.0.86-1
|
|
|
2a49a8 |
|
|
|
2a49a8 |
# libunwind is Exclusive for the following arches
|
|
|
2a49a8 |
%ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
|
|
|
2a49a8 |
%if !0%{?rhel}
|
|
|
2a49a8 |
BuildRequires: libunwind-devel
|
|
|
2a49a8 |
%endif
|
|
|
2a49a8 |
%endif
|
|
|
2a49a8 |
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xcb-aux)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xcb-image)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xcb-icccm)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xcb-keysyms)
|
|
|
2a49a8 |
BuildRequires: pkgconfig(xcb-renderutil)
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%description
|
|
|
2a49a8 |
Xwayland is an X server for running X clients under Wayland.
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%package devel
|
|
|
2a49a8 |
Summary: Development package
|
|
|
2a49a8 |
Requires: pkgconfig
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%description devel
|
|
|
2a49a8 |
The development package provides the developmental files which are
|
|
|
2a49a8 |
necessary for developing Wayland compositors using Xwayland.
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%prep
|
|
|
2a49a8 |
%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}}
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%build
|
|
|
2a49a8 |
%meson \
|
|
|
2a49a8 |
-Dxwayland_eglstream=true \
|
|
|
2a49a8 |
-Ddefault_font_path=%{default_font_path} \
|
|
|
2a49a8 |
-Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
|
|
|
2a49a8 |
-Dxkb_output_dir=%{_localstatedir}/lib/xkb \
|
|
|
2a49a8 |
-Dxcsecurity=true \
|
|
|
2a49a8 |
-Dglamor=true \
|
|
|
2a49a8 |
-Ddri3=true
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%meson_build
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%install
|
|
|
2a49a8 |
%meson_install
|
|
|
2a49a8 |
|
|
|
2a49a8 |
# Remove unwanted files/dirs
|
|
|
2a49a8 |
rm $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
|
|
|
2a49a8 |
rm -Rf $RPM_BUILD_ROOT%{_libdir}/xorg
|
|
|
2a49a8 |
rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg
|
|
|
2a49a8 |
rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal
|
|
|
2a49a8 |
rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%files
|
|
|
2a49a8 |
%{_bindir}/Xwayland
|
|
|
2a49a8 |
%{_mandir}/man1/Xwayland.1*
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%files devel
|
|
|
2a49a8 |
%{_libdir}/pkgconfig/xwayland.pc
|
|
|
2a49a8 |
|
|
|
2a49a8 |
%changelog
|
|
|
88131a |
* Fri Jul 29 2022 Olivier Fourdan <ofourdan@redhat.com> - 21.1.3-6
|
|
|
88131a |
- CVE fix for: CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070
|
|
|
88131a |
Resolves: rhbz#2110442, rhbz#2110437
|
|
|
88131a |
|
|
|
be9549 |
* Thu Jun 09 2022 Ray Strode <rstrode@redhat.com> - 21.1.3-5
|
|
|
be9549 |
- Rebuild again for ipv6 xtrans fix
|
|
|
be9549 |
Related: #2075132
|
|
|
be9549 |
|
|
|
be9549 |
* Tue May 24 2022 Ray Strode <rstrode@redhat.com> - 21.1.3-3
|
|
|
de95fe |
- Rebuild for ipv6 xtrans fix
|
|
|
be9549 |
Related: #2075132
|
|
|
de95fe |
|
|
|
823e4a |
* Fri Jan 7 2022 Olivier Fourdan <ofourdan@redhat.com> - 21.1.3-2
|
|
|
823e4a |
- CVE fix for: CVE-2021-4008 (#2038066), CVE-2021-4009 (#2038068),
|
|
|
823e4a |
CVE-2021-4010 (#2038071), CVE-2021-4011 (#2038073)
|
|
|
823e4a |
|
|
|
823e4a |
* Thu Dec 2 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.3-1
|
|
|
823e4a |
- Rebase to 21.1.3 (rhbz#2015842)
|
|
|
823e4a |
- Prefer EGLstream if both EGLstream and GBM are usable
|
|
|
823e4a |
|
|
|
9ca68e |
* Mon Aug 9 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-6
|
|
|
9ca68e |
- Backport the latest fixes from Xwayland for EGLstream (rhbz#1977741)
|
|
|
9ca68e |
|
|
|
46d479 |
* Tue Jun 29 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-5
|
|
|
46d479 |
- Require libepoxy >= 1.5.5 (rhbz#1976132)
|
|
|
46d479 |
|
|
|
2127ff |
* Mon Jun 21 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-4
|
|
|
2127ff |
- Fix a use-after-free in the previous changes for GLX
|
|
|
2127ff |
|
|
|
5f5628 |
* Mon Jun 14 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-3
|
|
|
5f5628 |
- Backport fixes for GLX and EGLstream (#1961981)
|
|
|
5f5628 |
|
|
|
2a49a8 |
* Thu Jun 03 2021 Tomas Pelka <tpelka@redhat.com> - 21.1.1-2
|
|
|
2a49a8 |
- bump release and rebuild to correctly trigger gating
|
|
|
2a49a8 |
|
|
|
2a49a8 |
* Wed Apr 14 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-1
|
|
|
2a49a8 |
- xwayland 21.1.1 (CVE-2021-3472 / ZDI-CAN-1259)
|
|
|
2a49a8 |
|
|
|
2a49a8 |
* Thu Mar 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.0-1
|
|
|
2a49a8 |
- xwayland 21.1.0
|
|
|
2a49a8 |
|
|
|
2a49a8 |
* Thu Mar 4 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.902-1
|
|
|
2a49a8 |
- xwayland 21.0.99.902
|
|
|
2a49a8 |
- Remove xdmcp, udev, udev_kms build options
|
|
|
2a49a8 |
- Stop overriding the vendor name, same as xorg-x11-server
|
|
|
2a49a8 |
|
|
|
2a49a8 |
* Thu Feb 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.901-1
|
|
|
2a49a8 |
- xwayland 21.0.99.901
|
|
|
2a49a8 |
|
|
|
2a49a8 |
* Mon Feb 1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.99.1-0.1.20210201git5429791
|
|
|
2a49a8 |
- Initial import (#1912335).
|