Blame SPECS/xorg-x11-server.spec

f34ecf
# This package is an experiment in active integration of upstream SCM with
f34ecf
# Fedora packaging.  It works something like this:
f34ecf
#
f34ecf
# The "pristine" source is actually a git repo (with no working checkout).
f34ecf
# The first step of %%prep is to check it out and switch to a "fedora" branch.
f34ecf
# If you need to add a patch to the server, just do it like a normal git
f34ecf
# operation, dump it with git-format-patch to a file in the standard naming
f34ecf
# format, and add a PatchN: line.  If you want to push something upstream,
f34ecf
# check out the master branch, pull, cherry-pick, and push.
f34ecf
f34ecf
# X.org requires lazy relocations to work.
f34ecf
%undefine _hardened_build
f34ecf
%undefine _strict_symbol_defs_build
f34ecf
f34ecf
#global gitdate 20161026
f34ecf
%global stable_abi 1
f34ecf
f34ecf
%if !0%{?gitdate} || %{stable_abi}
f34ecf
# Released ABI versions.  Have to keep these manually in sync with the
f34ecf
# source because rpm is a terrible language.
f34ecf
%global ansic_major 0
f34ecf
%global ansic_minor 4
f34ecf
%global videodrv_major 24
315c3e
%global videodrv_minor 1
f34ecf
%global xinput_major 24
f34ecf
%global xinput_minor 1
f34ecf
%global extension_major 10
f34ecf
%global extension_minor 0
f34ecf
%endif
f34ecf
f34ecf
%if 0%{?gitdate}
f34ecf
# For git snapshots, use date for major and a serial number for minor
f34ecf
%global minor_serial 0
f34ecf
%global git_ansic_major %{gitdate}
f34ecf
%global git_ansic_minor %{minor_serial}
f34ecf
%global git_videodrv_major %{gitdate}
f34ecf
%global git_videodrv_minor %{minor_serial}
f34ecf
%global git_xinput_major %{gitdate}
f34ecf
%global git_xinput_minor %{minor_serial}
f34ecf
%global git_extension_major %{gitdate}
f34ecf
%global git_extension_minor %{minor_serial}
f34ecf
%endif
f34ecf
f34ecf
%global pkgname xorg-server
f34ecf
f34ecf
Summary:   X.Org X11 X server
f34ecf
Name:      xorg-x11-server
b28c11
Version:   1.20.11
1e29dd
Release:   5%{?gitdate:.%{gitdate}}%{?dist}
f34ecf
URL:       http://www.x.org
f34ecf
License:   MIT
f34ecf
Group:     User Interface/X
f34ecf
f34ecf
#VCS:      git:git://git.freedesktop.org/git/xorg/xserver
f34ecf
%if 0%{?gitdate}
f34ecf
# git snapshot.  to recreate, run:
f34ecf
# ./make-git-snapshot.sh `cat commitid`
f34ecf
Source0:   xorg-server-%{gitdate}.tar.xz
f34ecf
#Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
f34ecf
Source1:   make-git-snapshot.sh
f34ecf
Source2:   commitid
f34ecf
%else
f34ecf
Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
f34ecf
Source1:   gitignore
f34ecf
%endif
f34ecf
f34ecf
Source4:   10-quirks.conf
f34ecf
f34ecf
Source10:   xserver.pamd
f34ecf
f34ecf
# "useful" xvfb-run script
f34ecf
Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
f34ecf
f34ecf
# for requires generation in drivers
f34ecf
Source30: xserver-sdk-abi-requires.release
f34ecf
Source31: xserver-sdk-abi-requires.git
f34ecf
f34ecf
# maintainer convenience script
f34ecf
Source40: driver-abi-rebuild.sh
f34ecf
f34ecf
# From Debian use intel ddx driver only for gen4 and older chipsets
f34ecf
Patch1: 06_use-intel-only-on-pre-gen4.diff
f34ecf
# Default to xf86-video-modesetting on GeForce 8 and newer
f34ecf
Patch2: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch
f34ecf
Patch3: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch
f34ecf
Patch4: 0001-Always-install-vbe-and-int10-sdk-headers.patch
f34ecf
# Submitted upstream, but not going anywhere
f34ecf
Patch5: 0001-autobind-GPUs-to-the-screen.patch
f34ecf
# because the display-managers are not ready yet, do not upstream
f34ecf
Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
f34ecf
f34ecf
# RHEL mustard
f34ecf
Patch10: 0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL8.patch
05dbd3
Patch11: 0001-mustard-Add-DRI2-fallback-driver-mappings-for-i965-a.patch
f34ecf
#Patch11: 0001-Enable-PAM-support.patch
f34ecf
Patch12: 0001-link-with-z-now.patch
f34ecf
Patch14: 0001-xfree86-Don-t-autoconfigure-vesa-or-fbdev.patch
f34ecf
Patch15: 0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch
f34ecf
Patch16: 0001-xfree86-try-harder-to-span-on-multihead.patch
f34ecf
Patch18: 0001-mustard-Work-around-broken-fbdev-headers.patch
f34ecf
f34ecf
# fix to be upstreamed
f34ecf
Patch100: 0001-linux-Make-platform-device-probe-less-fragile.patch
f34ecf
Patch102: 0001-xfree86-ensure-the-readlink-buffer-is-null-terminate.patch
f34ecf
f34ecf
# fix already upstream
f34ecf
Patch200: 0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
8b541d
Patch201: 0001-linux-Fix-platform-device-PCI-detection-for-complex-.patch
315c3e
Patch202: 0001-modesetting-Reduce-glamor-initialization-failed-mess.patch
315c3e
Patch203: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch
1e29dd
Patch204: 0001-xf86-logind-Fix-drm_drop_master-before-vt_reldisp.patch
1e29dd
Patch205: 0001-present-Check-for-NULL-to-prevent-crash.patch
1e29dd
1e29dd
# CVE-2021-4011
1e29dd
Patch10009: 0001-record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
1e29dd
# CVE-2021-4009
1e29dd
Patch10010: 0002-xfixes-Fix-out-of-bounds-access-in-ProcXFixesCreateP.patch
1e29dd
# CVE-2021-4010
1e29dd
Patch10011: 0003-Xext-Fix-out-of-bounds-access-in-SProcScreenSaverSus.patch
1e29dd
# CVE-2021-4008
1e29dd
Patch10012: 0004-render-Fix-out-of-bounds-access-in-SProcRenderCompos.patch
05dbd3
f34ecf
BuildRequires: systemtap-sdt-devel
f34ecf
BuildRequires: git
f34ecf
BuildRequires: automake autoconf libtool pkgconfig
f34ecf
BuildRequires: xorg-x11-util-macros >= 1.17
f34ecf
f34ecf
BuildRequires: xorg-x11-proto-devel >= 7.7-10
f34ecf
BuildRequires: xorg-x11-font-utils >= 7.2-11
f34ecf
f34ecf
BuildRequires: dbus-devel libepoxy-devel systemd-devel
f34ecf
BuildRequires: xorg-x11-xtrans-devel >= 1.3.2
f34ecf
BuildRequires: libXfont2-devel libXau-devel libxkbfile-devel libXres-devel
f34ecf
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
f34ecf
BuildRequires: libX11-devel libXext-devel
f34ecf
BuildRequires: libXinerama-devel libXi-devel
f34ecf
f34ecf
# DMX config utils buildreqs.
f34ecf
BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
f34ecf
BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel
f34ecf
f34ecf
BuildRequires: pkgconfig(epoxy)
f34ecf
BuildRequires: pkgconfig(xshmfence) >= 1.1
f34ecf
BuildRequires: libXv-devel
f34ecf
BuildRequires: pixman-devel >= 0.30.0
f34ecf
BuildRequires: libpciaccess-devel >= 0.13.1 openssl-devel bison flex flex-devel
f34ecf
BuildRequires: mesa-libGL-devel >= 9.2
f34ecf
BuildRequires: mesa-libEGL-devel
f34ecf
BuildRequires: mesa-libgbm-devel
f34ecf
# XXX silly...
f34ecf
BuildRequires: libdrm-devel >= 2.4.0 kernel-headers
f34ecf
BuildRequires: pam-devel
f34ecf
BuildRequires: audit-libs-devel libselinux-devel >= 2.0.86-1
f34ecf
BuildRequires: libudev-devel
f34ecf
# libunwind is Exclusive for the following arches
f34ecf
%ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
f34ecf
%if !0%{?rhel}
f34ecf
BuildRequires: libunwind-devel
f34ecf
%endif
f34ecf
%endif
f34ecf
f34ecf
BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm)
f34ecf
BuildRequires: pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
f34ecf
f34ecf
%description
f34ecf
X.Org X11 X server
f34ecf
f34ecf
f34ecf
%package common
f34ecf
Summary: Xorg server common files
f34ecf
Group: User Interface/X
f34ecf
Requires: pixman >= 0.30.0
f34ecf
Requires: xkeyboard-config xkbcomp
f34ecf
f34ecf
%description common
f34ecf
Common files shared among all X servers.
f34ecf
f34ecf
f34ecf
%package Xorg
f34ecf
Summary: Xorg X server
f34ecf
Group: User Interface/X
f34ecf
Provides: Xorg = %{version}-%{release}
f34ecf
Provides: Xserver
f34ecf
# HdG: This should be moved to the wrapper package once the wrapper gets
f34ecf
# its own sub-package:
f34ecf
Provides: xorg-x11-server-wrapper = %{version}-%{release}
f34ecf
%if !0%{?gitdate} || %{stable_abi}
f34ecf
Provides: xserver-abi(ansic-%{ansic_major}) = %{ansic_minor}
f34ecf
Provides: xserver-abi(videodrv-%{videodrv_major}) = %{videodrv_minor}
f34ecf
Provides: xserver-abi(xinput-%{xinput_major}) = %{xinput_minor}
f34ecf
Provides: xserver-abi(extension-%{extension_major}) = %{extension_minor}
f34ecf
%endif
f34ecf
%if 0%{?gitdate}
f34ecf
Provides: xserver-abi(ansic-%{git_ansic_major}) = %{git_ansic_minor}
f34ecf
Provides: xserver-abi(videodrv-%{git_videodrv_major}) = %{git_videodrv_minor}
f34ecf
Provides: xserver-abi(xinput-%{git_xinput_major}) = %{git_xinput_minor}
f34ecf
Provides: xserver-abi(extension-%{git_extension_major}) = %{git_extension_minor}
f34ecf
%endif
f34ecf
Obsoletes: xorg-x11-glamor < %{version}-%{release}
f34ecf
Provides: xorg-x11-glamor = %{version}-%{release}
f34ecf
Obsoletes: xorg-x11-drv-modesetting < %{version}-%{release}
f34ecf
Provides: xorg-x11-drv-modesetting = %{version}-%{release}
f34ecf
# Dropped from F25
f34ecf
Obsoletes: xorg-x11-drv-vmmouse < 13.1.0-4
f34ecf
f34ecf
Requires: xorg-x11-server-common >= %{version}-%{release}
f34ecf
Requires: system-setup-keyboard
f34ecf
Requires: xorg-x11-drv-libinput
b3a1f6
%ifnarch s390 s390x
b3a1f6
Requires: xorg-x11-drv-fbdev
b3a1f6
%ifarch x86_64
b3a1f6
Requires: xorg-x11-drv-vesa
b3a1f6
%endif
b3a1f6
%endif
f34ecf
Requires: libEGL
f34ecf
f34ecf
%description Xorg
f34ecf
X.org X11 is an open source implementation of the X Window System.  It
f34ecf
provides the basic low level functionality which full fledged
f34ecf
graphical user interfaces (GUIs) such as GNOME and KDE are designed
f34ecf
upon.
f34ecf
f34ecf
f34ecf
%package Xnest
f34ecf
Summary: A nested server
f34ecf
Group: User Interface/X
f34ecf
Requires: xorg-x11-server-common >= %{version}-%{release}
f34ecf
Provides: Xnest
f34ecf
f34ecf
%description Xnest
f34ecf
Xnest is an X server which has been implemented as an ordinary
f34ecf
X application.  It runs in a window just like other X applications,
f34ecf
but it is an X server itself in which you can run other software.  It
f34ecf
is a very useful tool for developers who wish to test their
f34ecf
applications without running them on their real X server.
f34ecf
f34ecf
f34ecf
%package Xdmx
f34ecf
Summary: Distributed Multihead X Server and utilities
f34ecf
Group: User Interface/X
f34ecf
Requires: xorg-x11-server-common >= %{version}-%{release}
f34ecf
Provides: Xdmx
f34ecf
f34ecf
%description Xdmx
f34ecf
Xdmx is proxy X server that provides multi-head support for multiple displays
f34ecf
attached to different machines (each of which is running a typical X server).
f34ecf
When Xinerama is used with Xdmx, the multiple displays on multiple machines
f34ecf
are presented to the user as a single unified screen.  A simple application
f34ecf
for Xdmx would be to provide multi-head support using two desktop machines,
f34ecf
each of which has a single display device attached to it.  A complex
f34ecf
application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
f34ecf
(each attached to one of 16 computers) into a unified 5120x4096 display.
f34ecf
f34ecf
f34ecf
%package Xvfb
f34ecf
Summary: A X Windows System virtual framebuffer X server
f34ecf
Group: User Interface/X
f34ecf
# xvfb-run is GPLv2, rest is MIT
f34ecf
License: MIT and GPLv2
f34ecf
Requires: xorg-x11-server-common >= %{version}-%{release}
f34ecf
# required for xvfb-run
f34ecf
Requires: xorg-x11-xauth
f34ecf
Provides: Xvfb
f34ecf
f34ecf
%description Xvfb
f34ecf
Xvfb (X Virtual Frame Buffer) is an X server that is able to run on
f34ecf
machines with no display hardware and no physical input devices.
f34ecf
Xvfb simulates a dumb framebuffer using virtual memory.  Xvfb does
f34ecf
not open any devices, but behaves otherwise as an X display.  Xvfb
f34ecf
is normally used for testing servers.
f34ecf
f34ecf
f34ecf
%package Xephyr
f34ecf
Summary: A nested server
f34ecf
Group: User Interface/X
f34ecf
Requires: xorg-x11-server-common >= %{version}-%{release}
f34ecf
Provides: Xephyr
f34ecf
f34ecf
%description Xephyr
f34ecf
Xephyr is an X server which has been implemented as an ordinary
f34ecf
X application.  It runs in a window just like other X applications,
f34ecf
but it is an X server itself in which you can run other software.  It
f34ecf
is a very useful tool for developers who wish to test their
f34ecf
applications without running them on their real X server.  Unlike
f34ecf
Xnest, Xephyr renders to an X image rather than relaying the
f34ecf
X protocol, and therefore supports the newer X extensions like
f34ecf
Render and Composite.
f34ecf
f34ecf
f34ecf
%package devel
f34ecf
Summary: SDK for X server driver module development
f34ecf
Group: User Interface/X
f34ecf
Requires: xorg-x11-util-macros
f34ecf
Requires: xorg-x11-proto-devel
f34ecf
Requires: libXfont2-devel
f34ecf
Requires: pkgconfig pixman-devel libpciaccess-devel
f34ecf
Provides: xorg-x11-server-static
f34ecf
Obsoletes: xorg-x11-glamor-devel < %{version}-%{release}
f34ecf
Provides: xorg-x11-glamor-devel = %{version}-%{release}
f34ecf
f34ecf
%description devel
f34ecf
The SDK package provides the developmental files which are necessary for
f34ecf
developing X server driver modules, and for compiling driver modules
f34ecf
outside of the standard X11 source code tree.  Developers writing video
f34ecf
drivers, input drivers, or other X modules should install this package.
f34ecf
f34ecf
f34ecf
%package source
f34ecf
Summary: Xserver source code required to build VNC server (Xvnc)
f34ecf
Group: Development/Libraries
f34ecf
BuildArch: noarch
f34ecf
f34ecf
%description source
f34ecf
Xserver source code needed to build VNC server (Xvnc)
f34ecf
f34ecf
f34ecf
%prep
f34ecf
%autosetup -N -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
f34ecf
rm -rf .git
f34ecf
cp %{SOURCE1} .gitignore
f34ecf
# ick
f34ecf
%global __scm git
f34ecf
%{expand:%__scm_setup_git -q}
f34ecf
%autopatch
f34ecf
f34ecf
%if 0%{?stable_abi}
f34ecf
# check the ABI in the source against what we expect.
f34ecf
getmajor() {
f34ecf
    grep -i ^#define.ABI.$1_VERSION hw/xfree86/common/xf86Module.h |
f34ecf
    tr '(),' '   ' | awk '{ print $4 }'
f34ecf
}
f34ecf
f34ecf
getminor() {
f34ecf
    grep -i ^#define.ABI.$1_VERSION hw/xfree86/common/xf86Module.h |
f34ecf
    tr '(),' '   ' | awk '{ print $5 }'
f34ecf
}
f34ecf
f34ecf
test `getmajor ansic` == %{ansic_major}
f34ecf
test `getminor ansic` == %{ansic_minor}
f34ecf
test `getmajor videodrv` == %{videodrv_major}
f34ecf
test `getminor videodrv` == %{videodrv_minor}
f34ecf
test `getmajor xinput` == %{xinput_major}
f34ecf
test `getminor xinput` == %{xinput_minor}
f34ecf
test `getmajor extension` == %{extension_major}
f34ecf
test `getminor extension` == %{extension_minor}
f34ecf
f34ecf
%endif
f34ecf
f34ecf
%build
f34ecf
f34ecf
export CFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1"
f34ecf
export CXXFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1"
f34ecf
export LDFLAGS="$RPM_LD_FLAGS -specs=/usr/lib/rpm/redhat/redhat-hardened-ld"
f34ecf
f34ecf
%ifnarch %{ix86} x86_64
f34ecf
%global no_int10 --disable-vbe --disable-int10-module
f34ecf
%endif
f34ecf
f34ecf
%global kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
f34ecf
%global xservers --enable-xvfb --enable-xnest %{kdrive} --enable-xorg
f34ecf
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
f34ecf
%global dri_flags --enable-dri --enable-dri2 %{?!rhel:--enable-dri3} --enable-suid-wrapper --enable-glamor
f34ecf
f34ecf
autoreconf -f -v --install || exit 1
f34ecf
f34ecf
%configure %{xservers} \
f34ecf
	--enable-dependency-tracking \
f34ecf
	--disable-static \
f34ecf
	--with-pic \
f34ecf
	%{?no_int10} --with-int10=x86emu \
f34ecf
	--with-default-font-path=%{default_font_path} \
f34ecf
	--with-module-dir=%{_libdir}/xorg/modules \
f34ecf
	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
f34ecf
	--with-os-name="$(hostname -s) $(uname -r)" \
f34ecf
	--with-xkb-output=%{_localstatedir}/lib/xkb \
f34ecf
        --without-dtrace \
f34ecf
	--disable-linux-acpi --disable-linux-apm \
f34ecf
	--enable-xselinux --enable-record --enable-present \
4afc8a
        --enable-xcsecurity \
f34ecf
	--enable-config-udev \
f34ecf
	--disable-unit-tests \
f34ecf
	--enable-dmx \
b28c11
	--disable-xwayland \
f34ecf
	%{dri_flags} %{?bodhi_flags} \
f34ecf
	${CONFIGURE}
f34ecf
        
f34ecf
make V=1 %{?_smp_mflags}
f34ecf
f34ecf
f34ecf
%install
f34ecf
%make_install
f34ecf
f34ecf
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
f34ecf
f34ecf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
f34ecf
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
f34ecf
# restore this if/when restoring the PAM patch
f34ecf
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
f34ecf
#touch $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/xserver
f34ecf
f34ecf
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
f34ecf
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
f34ecf
f34ecf
# make sure the (empty) /etc/X11/xorg.conf.d is there, system-setup-keyboard
f34ecf
# relies on it more or less.
f34ecf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
f34ecf
f34ecf
%if %{stable_abi}
f34ecf
install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
f34ecf
%else
f34ecf
sed -e s/@MAJOR@/%{gitdate}/g -e s/@MINOR@/%{minor_serial}/g %{SOURCE31} > \
f34ecf
    $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
f34ecf
chmod 755 $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
f34ecf
%endif
f34ecf
f34ecf
install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run
f34ecf
f34ecf
# Make the source package
f34ecf
%global xserver_source_dir %{_datadir}/xorg-x11-server-source
f34ecf
%global inst_srcdir %{buildroot}/%{xserver_source_dir}
f34ecf
f34ecf
mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
f34ecf
mkdir -p %{inst_srcdir}/{hw/dmx/doc,man,doc,hw/dmx/doxygen}
f34ecf
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
f34ecf
cp {,%{inst_srcdir}/}man/Xserver.man
f34ecf
cp {,%{inst_srcdir}/}doc/smartsched
f34ecf
cp {,%{inst_srcdir}/}hw/dmx/doxygen/doxygen.conf.in
f34ecf
cp {,%{inst_srcdir}/}xserver.ent.in
f34ecf
cp {,%{inst_srcdir}/}hw/xfree86/Xorg.sh.in
f34ecf
cp xkb/README.compiled %{inst_srcdir}/xkb
f34ecf
cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
f34ecf
f34ecf
find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
f34ecf
xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
f34ecf
find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
f34ecf
f34ecf
# Remove unwanted files/dirs
f34ecf
{
f34ecf
    find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
f34ecf
%ifnarch %{ix86} x86_64
f34ecf
    rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/lib{int10,vbe}.so
f34ecf
%endif
f34ecf
}
f34ecf
f34ecf
f34ecf
%files common
f34ecf
%doc COPYING
f34ecf
%{_mandir}/man1/Xserver.1*
f34ecf
%{_libdir}/xorg/protocol.txt
f34ecf
%dir %{_localstatedir}/lib/xkb
f34ecf
%{_localstatedir}/lib/xkb/README.compiled
f34ecf
f34ecf
%if 1
f34ecf
%global Xorgperms %attr(4755, root, root)
f34ecf
%else
f34ecf
# disable until module loading is audited
f34ecf
%global Xorgperms %attr(0711,root,root) %caps(cap_sys_admin,cap_sys_rawio,cap_dac_override=pe)
f34ecf
%endif
f34ecf
f34ecf
# restore the missingok one if/when restoring the PAM patch
f34ecf
%files Xorg
f34ecf
%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
f34ecf
#config(missingok) /etc/security/console.apps/xserver
f34ecf
%{_bindir}/X
f34ecf
%{_bindir}/Xorg
f34ecf
%{_libexecdir}/Xorg
f34ecf
%{Xorgperms} %{_libexecdir}/Xorg.wrap
f34ecf
%{_bindir}/cvt
f34ecf
%{_bindir}/gtf
f34ecf
%dir %{_libdir}/xorg
f34ecf
%dir %{_libdir}/xorg/modules
f34ecf
%dir %{_libdir}/xorg/modules/drivers
f34ecf
%{_libdir}/xorg/modules/drivers/modesetting_drv.so
f34ecf
%dir %{_libdir}/xorg/modules/extensions
f34ecf
%{_libdir}/xorg/modules/extensions/libglx.so
f34ecf
%dir %{_libdir}/xorg/modules/input
f34ecf
%{_libdir}/xorg/modules/libfbdevhw.so
f34ecf
%{_libdir}/xorg/modules/libexa.so
f34ecf
%{_libdir}/xorg/modules/libfb.so
f34ecf
%{_libdir}/xorg/modules/libglamoregl.so
f34ecf
%{_libdir}/xorg/modules/libshadow.so
f34ecf
%{_libdir}/xorg/modules/libshadowfb.so
f34ecf
%{_libdir}/xorg/modules/libvgahw.so
f34ecf
%{_libdir}/xorg/modules/libwfb.so
f34ecf
%ifarch %{ix86} x86_64
f34ecf
%{_libdir}/xorg/modules/libint10.so
f34ecf
%{_libdir}/xorg/modules/libvbe.so
f34ecf
%endif
f34ecf
%{_mandir}/man1/gtf.1*
f34ecf
%{_mandir}/man1/Xorg.1*
f34ecf
%{_mandir}/man1/Xorg.wrap.1*
f34ecf
%{_mandir}/man1/cvt.1*
f34ecf
%{_mandir}/man4/fbdevhw.4*
f34ecf
%{_mandir}/man4/exa.4*
f34ecf
%{_mandir}/man4/modesetting.4*
f34ecf
%{_mandir}/man5/Xwrapper.config.5*
f34ecf
%{_mandir}/man5/xorg.conf.5*
f34ecf
%{_mandir}/man5/xorg.conf.d.5*
f34ecf
%dir %{_sysconfdir}/X11/xorg.conf.d
f34ecf
%dir %{_datadir}/X11/xorg.conf.d
f34ecf
%{_datadir}/X11/xorg.conf.d/10-quirks.conf
f34ecf
f34ecf
%files Xnest
f34ecf
%{_bindir}/Xnest
f34ecf
%{_mandir}/man1/Xnest.1*
f34ecf
f34ecf
%files Xdmx
f34ecf
%{_bindir}/Xdmx
f34ecf
%{_bindir}/dmxaddinput
f34ecf
%{_bindir}/dmxaddscreen
f34ecf
%{_bindir}/dmxreconfig
f34ecf
%{_bindir}/dmxresize
f34ecf
%{_bindir}/dmxrminput
f34ecf
%{_bindir}/dmxrmscreen
f34ecf
%{_bindir}/dmxtodmx
f34ecf
%{_bindir}/dmxwininfo
f34ecf
%{_bindir}/vdltodmx
f34ecf
%{_bindir}/dmxinfo
f34ecf
%{_bindir}/xdmxconfig
f34ecf
%{_mandir}/man1/Xdmx.1*
f34ecf
%{_mandir}/man1/dmxtodmx.1*
f34ecf
%{_mandir}/man1/vdltodmx.1*
f34ecf
%{_mandir}/man1/xdmxconfig.1*
f34ecf
f34ecf
%files Xvfb
f34ecf
%{_bindir}/Xvfb
f34ecf
%{_bindir}/xvfb-run
f34ecf
%{_mandir}/man1/Xvfb.1*
f34ecf
f34ecf
%files Xephyr
f34ecf
%{_bindir}/Xephyr
f34ecf
%{_mandir}/man1/Xephyr.1*
f34ecf
f34ecf
%files devel
f34ecf
%doc COPYING
f34ecf
#{_docdir}/xorg-server
f34ecf
%{_bindir}/xserver-sdk-abi-requires
f34ecf
%{_libdir}/pkgconfig/xorg-server.pc
f34ecf
%dir %{_includedir}/xorg
f34ecf
%{_includedir}/xorg/*.h
f34ecf
%{_datadir}/aclocal/xorg-server.m4
f34ecf
f34ecf
%files source
f34ecf
%{xserver_source_dir}
f34ecf
f34ecf
f34ecf
%changelog
1e29dd
* Fri Jan 28 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-5
1e29dd
- Fix crash with NVIDIA proprietary driver with Present (#2046329)
1e29dd
1e29dd
* Thu Jan  6 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-4
1e29dd
- CVE fix for: CVE-2021-4008 (#2030162), CVE-2021-4009 (#2030172),
1e29dd
  CVE-2021-4010 (#2030175), CVE-2021-4011 (#2030181)
1e29dd
1e29dd
* Mon Nov  29 2021 Jocelyn Falempe <jfalempe@redhat.com> - 1.20.11-3
1e29dd
- xf86/logind Fix drm_drop_master before vt_reldis
1e29dd
  Resolves: #1771863
1e29dd
b28c11
* Wed Jun  9 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-2
b28c11
- Remove Xwayland from the xserver builds
b28c11
  Resolves: #1956838
b28c11
b28c11
* Tue Jun  1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-1
b28c11
- xserver 1.20.11
b28c11
  Resolves: #1954260
b28c11
4afc8a
* Thu Dec 10 2020 Adam Jackson <ajax@redhat.com> - 1.20.10-1
4afc8a
- xserver 1.20.10
4afc8a
  Resolves: #1891871
4afc8a
4afc8a
* Wed Dec  9 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.8-10
733295
- modesetting: keep going if a modeset fails on EnterVT
4afc8a
  Resolves: #1838392
4afc8a
4afc8a
* Mon Nov 16 2020 Adam Jackson <ajax@redhat.com> - 1.20.8-9
4afc8a
- CVE fix for: CVE-2020-14347 (#1862320)
4afc8a
4afc8a
* Thu Oct 29 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.8-8
4afc8a
- CVE fixes for: CVE-2020-14345 (#1872391), CVE-2020-14346 (#1872395),
4afc8a
  CVE-2020-14361 (#1872402), CVE-2020-14362 (#1872409)
4afc8a
4afc8a
* Tue Oct 27 2020 Adam Jackson <ajax@redhat.com> - 1.20.8-7
4afc8a
- Enable XC-SECURITY
4afc8a
  Resolves: #1863142
733295
315c3e
* Thu Aug 20 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.8-6
315c3e
- xfree86: add drm modes on non-GTF panels
315c3e
  Resolves: #1823461
315c3e
315c3e
* Tue Aug  4 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.8-5
315c3e
- xwayland: Hold a pixmap reference in struct xwl_present_event
315c3e
  Related: #1728684
315c3e
- glamor: Fix glamor_poly_fill_rect_gl xRectangle::width/height handling
315c3e
  Resolves: #1740250
315c3e
315c3e
* Fri Jul 10 2020 Ray Strode <rstrode@redhat.com> - 1.20.8-4
315c3e
- Don't switch VTs in the exit path, if killed on inactive VT
315c3e
  Related: #1618481
315c3e
315c3e
* Fri Jun 26 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.8-3
315c3e
- Downgrade modesetting "glamor initialization failed" X_ERROR → X_INFO
315c3e
  Resolves: #1724573
315c3e
- Xwayland / Present leak fixes for #1728684
315c3e
315c3e
* Wed Jun 10 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.8-2
315c3e
- Re-enable Xwayland Present support
315c3e
  Resolves: #1728684, #1715676
315c3e
- Remove unused patch
315c3e
315c3e
* Tue May 26 2020 Adam Jackson <ajax@redhat.com> - 1.20.8-1
315c3e
- xserver 1.20.8
315c3e
61240a
* Tue Feb 11 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.20.6-3
61240a
- Add fix for crash with Option "Rotate" in xorg.conf
61240a
  Resolves: #1795328
61240a
61240a
* Wed Dec 11 2019 Michel Dänzer <mdaenzer@redhat.com> - 1.20.6-2
61240a
- Add fixes for intermittent modesetting artifacts
61240a
  Resolves: #1738670
61240a
61240a
* Mon Dec  9 2019 Olivier Fourdan <ofourdan@redhat.com> - 1.20.6-1
61240a
- xserver 1.20.6
61240a
05dbd3
* Tue Sep 03 2019 Adam Jackson <ajax@redhat.com> - 1.20.3-11
05dbd3
- Add DRI2 fallback driver mappings for i965 and radeonsi
05dbd3
05dbd3
* Mon Aug 19 2019 Adam Jackson <ajax@redhat.com> - 1.20.3-10
05dbd3
- Backport glvnd vendor selection for prime render offloading
05dbd3
8b541d
* Fri Jul 12 2019 Adam Jackson <ajax@redhat.com> - 1.20.3-8
8b541d
- Fix platform device PCI detection for complex bus topologies
8b541d
8b541d
* Wed Apr 10 2019 Adam Jackson <ajax@redhat.com> - 1.20.3-7
b3a1f6
- Don't require fbdev on s390x, where it doesn't exist
b3a1f6
8b541d
* Wed Apr 03 2019 Adam Jackson <ajax@redhat.com> - 1.20.3-6
b3a1f6
- Add Requires: fbdev (and on x86_64, vesa) to Xorg subpackage
b3a1f6
b3a1f6
* Mon Jan 14 2019 Ben Crocker <bcrocker@redhat.com> - 1.20.3-5
f34ecf
- Add Eric Anholt's patch e50c85f4ebf559 from upstream:
f34ecf
- Fix segfault on probing a non-PCI platform device on a system with PCI
f34ecf
- NOTE: also pertains on a system with no PCI, e.g. s390x.
f34ecf
  Resolves: #1652013
f34ecf
f34ecf
* Mon Jan 07 2019 Olivier Fourdan <ofourdan@redhat.com> - 1.20.3-4
f34ecf
- Move LeaveVT after resetting randr pointers in xf86CrtcCloseScreen
f34ecf
f34ecf
* Mon Nov 19 2018 Adam Jackson <ajax@redhat.com> - 1.20.3-3
f34ecf
- Apply even more -z now and -pie
f34ecf
f34ecf
* Mon Nov 19 2018 Ray Strode <rstrode@redhat.com> - 1.20.3-2
f34ecf
- Fix crash in Xephyr on server reset
f34ecf
  Resolves: #1650168
f34ecf
f34ecf
* Tue Nov 13 2018 Adam Jackson <ajax@redhat.com> - 1.20.3-1
f34ecf
- xserver 1.20.3
f34ecf
- Also forget about DRI driver names for drivers we're not shipping
f34ecf
f34ecf
* Fri Oct 26 2018 Adam Jackson <ajax@redhat.com> - 1.20.2-5
f34ecf
- Work around broken fbdev headers
f34ecf
f34ecf
* Mon Oct 22 2018 Adam Jackson <ajax@redhat.com> - 1.20.2-4
f34ecf
- Back out the PAM patch, may not be necessary in 8
f34ecf
f34ecf
* Wed Oct 17 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.20.2-3
f34ecf
- Backport fix for readlink call from master
f34ecf
f34ecf
* Tue Oct 16 2018 Adam Jackson <ajax@redhat.com> - 1.20.2-2
f34ecf
- Avoid drmSetInterfaceVersion in platform device probe
f34ecf
- Backport a misparenthesis fix from master
f34ecf
f34ecf
* Mon Oct 15 2018 Adam Jackson <ajax@redhat.com> - 1.20.2-1
f34ecf
- xserver 1.20.2
f34ecf
f34ecf
* Mon Oct 15 2018 Olivier Fourdan <ofourdan@redhat.com>> - 1.20.1-4
f34ecf
- Some more RHEL mustard:
f34ecf
  - Disable Present support in Xwayland (rhbz#1638463)
f34ecf
f34ecf
* Fri Oct 12 2018 Adam Jackson <ajax@redhat.com> - 1.20.1-3
f34ecf
- Assorted RHEL mustard:
f34ecf
  - Don't probe for drivers we're not shipping
f34ecf
  - Enable PAM
f34ecf
  - Link Xorg with -z now
f34ecf
  - Nerf modesetting's atomic ioctl support
f34ecf
  - Don't autoconfigure vesa or fbdev from X -configure
f34ecf
  - Call LeaveVT on RANDR's CloseScreen path so we drop drm master
f34ecf
  - Try harder to get initial spanning desktop if the output's
f34ecf
    preferred mode was filtered away
f34ecf
- Sync va_gl/vdpau patch from F29
f34ecf
f34ecf
* Thu Sep 13 2018 Dave Airlie <airlied@redhat.com> - 1.20.1-2
f34ecf
- build with PIE flags
f34ecf
f34ecf
* Thu Aug 09 2018 Adam Jackson <ajax@redhat.com> - 1.20.1-1
f34ecf
- xserver 1.20.1
f34ecf
f34ecf
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-5
f34ecf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
f34ecf
f34ecf
* Tue Jun 12 2018 Adam Jackson <ajax@redhat.com> - 1.20.0-4
f34ecf
- Xorg and Xwayland Requires: libEGL
f34ecf
f34ecf
* Fri Jun 01 2018 Adam Williamson <awilliam@redhat.com> - 1.20.0-3
f34ecf
- Backport fixes for RHBZ#1579067
f34ecf
f34ecf
* Wed May 16 2018 Adam Jackson <ajax@redhat.com> - 1.20.0-2
f34ecf
- Xorg Requires: xorg-x11-drv-libinput
f34ecf
f34ecf
* Thu May 10 2018 Adam Jackson <ajax@redhat.com> - 1.20.0-1
f34ecf
- xserver 1.20
f34ecf
f34ecf
* Wed Apr 25 2018 Adam Jackson <ajax@redhat.com> - 1.19.99.905-2
f34ecf
- Fix xvfb-run's default depth to be 24
f34ecf
f34ecf
* Tue Apr 24 2018 Adam Jackson <ajax@redhat.com> - 1.19.99.905-1
f34ecf
- xserver 1.20 RC5
f34ecf
f34ecf
* Thu Apr 12 2018 Olivier Fourdan <ofourdan@redhat.com> - 1.19.99.904-2
f34ecf
- Re-fix "use type instead of which in xvfb-run (rhbz#1443357)" which
f34ecf
  was overridden inadvertently
f34ecf
f34ecf
* Tue Apr 10 2018 Adam Jackson <ajax@redhat.com> - 1.19.99.904-1
f34ecf
- xserver 1.20 RC4
f34ecf
f34ecf
* Mon Apr 02 2018 Adam Jackson <ajax@redhat.com> - 1.19.99.903-1
f34ecf
- xserver 1.20 RC3
f34ecf
f34ecf
* Tue Feb 13 2018 Olivier Fourdan <ofourdan@redhat.com> 1.19.6-5
f34ecf
- xwayland: avoid race condition on new keymap
f34ecf
- xwayland: Keep separate variables for pointer and tablet foci (rhbz#1519961)
f34ecf
- xvfb-run now support command line option “--auto-display”
f34ecf
f34ecf
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.6-4
f34ecf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
f34ecf
f34ecf
* Tue Jan 30 2018 Olivier Fourdan <ofourdan@redhat.com> 1.19.6-3
f34ecf
- Avoid generating a core file when the Wayland compositor is gone.
f34ecf
f34ecf
* Thu Jan 11 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.19.6-2
f34ecf
- Fix handling of devices with ID_INPUT=null
f34ecf
f34ecf
* Wed Dec 20 2017 Adam Jackson <ajax@redhat.com> - 1.19.6-1
f34ecf
- xserver 1.19.6
f34ecf
f34ecf
* Thu Oct 12 2017 Adam Jackson <ajax@redhat.com> - 1.19.5-1
f34ecf
- xserver 1.19.5
f34ecf
f34ecf
* Thu Oct 05 2017 Olivier Fourdan <ofourdan@redhat.com> - 1.19.4-1
f34ecf
- xserver-1.19.4
f34ecf
- Backport tablet support for Xwayland
f34ecf
f34ecf
* Fri Sep 08 2017 Troy Dawson <tdawson@redhat.com> - 1.19.3-9
f34ecf
- Cleanup spec file conditionals
f34ecf
f34ecf
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-8
f34ecf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
f34ecf
f34ecf
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-7
f34ecf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
f34ecf
f34ecf
* Sun Jul  2 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.19.3-6
f34ecf
- Use type instead of which in xvfb-run (rhbz#1443357)
f34ecf
f34ecf
* Thu May 04 2017 Orion Poplawski <orion@cora.nwra.com> - 1.19.3-5
f34ecf
- Enable full build for s390/x
f34ecf
f34ecf
* Mon Apr 24 2017 Ben Skeggs <bskeggs@redhat.com> - 1.19.3-4
f34ecf
- Default to xf86-video-modesetting on GeForce 8 and newer
f34ecf
f34ecf
* Fri Apr 07 2017 Adam Jackson <ajax@redhat.com> - 1.19.3-3
f34ecf
- Inoculate against a versioning bug with libdrm 2.4.78
f34ecf
f34ecf
* Thu Mar 23 2017 Hans de Goede <hdegoede@redhat.com> - 1.19.3-2
f34ecf
- Use va_gl as vdpau driver on i965 GPUs (rhbz#1413733)
f34ecf
f34ecf
* Wed Mar 15 2017 Adam Jackson <ajax@redhat.com> - 1.19.3-1
f34ecf
- xserver 1.19.3
f34ecf
f34ecf
* Thu Mar 02 2017 Adam Jackson <ajax@redhat.com> - 1.19.2-1
f34ecf
- xserver 1.19.2
f34ecf
f34ecf
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-4
f34ecf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
f34ecf
f34ecf
* Wed Feb 01 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.19.1-3
f34ecf
- Fix a few input thread lock issues causing intel crashes (#1384486)
f34ecf
f34ecf
* Mon Jan 16 2017 Adam Jackson <ajax@redhat.com> - 1.19.1-2
f34ecf
- Limit the intel driver only on F26 and up
f34ecf
f34ecf
* Wed Jan 11 2017 Adam Jackson <ajax@redhat.com> - 1.19.1-1
f34ecf
- xserver 1.19.1
f34ecf
f34ecf
* Tue Jan 10 2017 Hans de Goede <hdegoede@redhat.com> - 1.19.0-4
f34ecf
- Follow Debian and only default to the intel ddx on gen4 or older intel GPUs
f34ecf
f34ecf
* Tue Dec 20 2016 Hans de Goede <hdegoede@redhat.com> - 1.19.0-3
f34ecf
- Add one more patch for better integration with the nvidia binary driver
f34ecf
f34ecf
* Thu Dec 15 2016 Hans de Goede <hdegoede@redhat.com> - 1.19.0-2
f34ecf
- Add some patches for better integration with the nvidia binary driver
f34ecf
- Add a patch from upstream fixing a crash (rhbz#1389886)
f34ecf
f34ecf
* Wed Nov 23 2016 Olivier Fourdan <ofourdan@redhat.com> 1.19.0-1
f34ecf
- xserver 1.19.0
f34ecf
- Fix use after free of cursors in Xwayland (rhbz#1385258)
f34ecf
- Fix an issue where some monitors would show only black, or
f34ecf
  partially black when secondary GPU outputs are used
f34ecf
f34ecf
* Tue Nov 15 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.19.0-0.8.rc2
f34ecf
- Update device barriers for new master devices (#1384432)
f34ecf
f34ecf
* Thu Nov  3 2016 Hans de Goede <hdegoede@redhat.com> - 1.19.0-0.7.rc2
f34ecf
- Update to 1.19.0-rc2
f34ecf
- Fix (hopefully) various crashes in FlushAllOutput() (rhbz#1382444)
f34ecf
- Fix Xwayland crashing in glamor on non glamor capable hw (rhbz#1390018)
f34ecf
f34ecf
* Tue Nov  1 2016 Ben Crocker <bcrocker@redhat.com> - 1.19.0-0.6.20161028
f34ecf
- Fix Config record allocation during startup: if xorg.conf.d directory
f34ecf
- was absent, a segfault resulted.
f34ecf
f34ecf
* Mon Oct 31 2016 Adam Jackson <ajax@redhat.com> - 1.19.0-0.5.20161026
f34ecf
- Use %%autopatch instead of doing our own custom git-am trick
f34ecf
f34ecf
* Fri Oct 28 2016 Hans de Goede <hdegoede@redhat.com> - 1.19.0-0.4.20161026
f34ecf
- Add missing Requires: libXfont2-devel to -devel sub-package (rhbz#1389711)
f34ecf
f34ecf
* Wed Oct 26 2016 Hans de Goede <hdegoede@redhat.com> - 1.19.0-0.3.20161026
f34ecf
- Sync with upstream git, bringing in a bunch if bug-fixes
f34ecf
- Add some extra fixes which are pending upstream
f34ecf
- This also adds PointerWarping emulation to Xwayland, which should improve
f34ecf
  compatiblity with many games