|
 |
f20033 |
%global tarball libX11
|
|
|
f20033 |
#global gitdate 20130524
|
|
|
f20033 |
%global gitversion a3bdd2b09
|
|
|
f20033 |
|
|
|
f20033 |
Summary: Core X11 protocol client library
|
|
|
f20033 |
Name: libX11
|
|
|
f20033 |
Version: 1.6.8
|
|
|
798623 |
Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
|
|
f20033 |
License: MIT
|
|
|
f20033 |
Group: System Environment/Libraries
|
|
|
f20033 |
URL: http://www.x.org
|
|
|
f20033 |
|
|
|
f20033 |
%if 0%{?gitdate}
|
|
|
f20033 |
Source0: %{tarball}-%{gitdate}.tar.bz2
|
|
|
f20033 |
Source1: make-git-snapshot.sh
|
|
|
f20033 |
Source2: commitid
|
|
|
f20033 |
%else
|
|
|
f20033 |
Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
|
|
|
f20033 |
%endif
|
|
|
f20033 |
|
|
|
f20033 |
Patch2: dont-forward-keycode-0.patch
|
|
|
f20033 |
Patch3: 0001-Fix-XTS-regression-in-XCopyColormapAndFree.patch
|
|
|
f20033 |
Patch4: 0001-Fix-poll_for_response-race-condition.patch
|
|
|
f20033 |
|
|
|
fe4c4e |
# CVE-2020-14363
|
|
|
fe4c4e |
Patch5: 0001-Fix-an-integer-overflow-in-init_om.patch
|
|
|
798623 |
Patch6: CVE-2021-31535.patch
|
|
|
fe4c4e |
|
|
|
f20033 |
BuildRequires: xorg-x11-util-macros >= 1.11
|
|
|
f20033 |
BuildRequires: pkgconfig(xproto) >= 7.0.15
|
|
|
f20033 |
BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
|
|
|
f20033 |
BuildRequires: libxcb-devel >= 1.2
|
|
|
f20033 |
BuildRequires: pkgconfig(xau) pkgconfig(xdmcp)
|
|
|
f20033 |
BuildRequires: perl(Pod::Usage)
|
|
|
f20033 |
|
|
|
f20033 |
Requires: %{name}-common >= %{version}-%{release}
|
|
|
f20033 |
|
|
|
f20033 |
%description
|
|
|
f20033 |
Core X11 protocol client library.
|
|
|
f20033 |
|
|
|
f20033 |
%package common
|
|
|
f20033 |
Summary: Common data for libX11
|
|
|
f20033 |
Group: System Environment/Libraries
|
|
|
f20033 |
BuildArch: noarch
|
|
|
f20033 |
|
|
|
f20033 |
%description common
|
|
|
f20033 |
libX11 common data
|
|
|
f20033 |
|
|
|
f20033 |
%package devel
|
|
|
f20033 |
Summary: Development files for %{name}
|
|
|
f20033 |
Group: Development/Libraries
|
|
|
f20033 |
Requires: %{name} = %{version}-%{release}
|
|
|
f20033 |
Requires: %{name}-xcb = %{version}-%{release}
|
|
|
f20033 |
|
|
|
f20033 |
%description devel
|
|
|
f20033 |
X.Org X11 libX11 development package
|
|
|
f20033 |
|
|
|
f20033 |
%package xcb
|
|
|
f20033 |
Summary: XCB interop for libX11
|
|
|
f20033 |
Group: System Environment/Libraries
|
|
|
f20033 |
Conflicts: %{name} < %{version}-%{release}
|
|
|
f20033 |
|
|
|
f20033 |
%description xcb
|
|
|
f20033 |
libX11/libxcb interoperability library
|
|
|
f20033 |
|
|
|
f20033 |
%prep
|
|
|
f20033 |
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
|
|
f20033 |
%patch2 -p1 -b .dont-forward-keycode-0
|
|
|
f20033 |
%patch3 -p1 -b .copycolormapandfree
|
|
|
f20033 |
%patch4 -p1 -b .race
|
|
|
fe4c4e |
%patch5 -p1 -b .fix-an-integer-overflow-in-init_om
|
|
|
798623 |
%patch6 -p1 -b .cve-2021-31535
|
|
|
f20033 |
|
|
|
f20033 |
%build
|
|
|
f20033 |
autoreconf -v --install --force
|
|
|
f20033 |
%configure --disable-silent-rules --disable-static
|
|
|
f20033 |
|
|
|
f20033 |
make %{?_smp_mflags}
|
|
|
f20033 |
|
|
|
f20033 |
%install
|
|
|
f20033 |
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
|
|
f20033 |
|
|
|
f20033 |
# create/own compose cache dir
|
|
|
f20033 |
mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
|
|
|
f20033 |
|
|
|
f20033 |
# We intentionally don't ship *.la files
|
|
|
f20033 |
find $RPM_BUILD_ROOT -type f -name '*.la' -delete
|
|
|
f20033 |
|
|
|
f20033 |
# FIXME: Don't install Xcms.txt - find out why upstream still ships this.
|
|
|
f20033 |
find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
|
|
|
f20033 |
|
|
|
f20033 |
# FIXME package these properly
|
|
|
f20033 |
rm -rf $RPM_BUILD_ROOT%{_docdir}
|
|
|
f20033 |
|
|
|
f20033 |
%check
|
|
|
f20033 |
make %{?_smp_mflags} check
|
|
|
f20033 |
|
|
|
f20033 |
%ldconfig_post
|
|
|
f20033 |
%ldconfig_postun
|
|
|
f20033 |
|
|
|
f20033 |
%files
|
|
|
f20033 |
%{_libdir}/libX11.so.6
|
|
|
f20033 |
%{_libdir}/libX11.so.6.3.0
|
|
|
f20033 |
|
|
|
f20033 |
%files xcb
|
|
|
f20033 |
%{_libdir}/libX11-xcb.so.1
|
|
|
f20033 |
%{_libdir}/libX11-xcb.so.1.0.0
|
|
|
f20033 |
|
|
|
f20033 |
%files common
|
|
|
f20033 |
%doc AUTHORS COPYING README.md NEWS
|
|
|
f20033 |
%{_datadir}/X11/locale/
|
|
|
f20033 |
%{_datadir}/X11/XErrorDB
|
|
|
f20033 |
%dir /var/cache/libX11
|
|
|
f20033 |
%dir /var/cache/libX11/compose
|
|
|
f20033 |
|
|
|
f20033 |
%files devel
|
|
|
f20033 |
%{_includedir}/X11/ImUtil.h
|
|
|
f20033 |
%{_includedir}/X11/XKBlib.h
|
|
|
f20033 |
%{_includedir}/X11/Xcms.h
|
|
|
f20033 |
%{_includedir}/X11/Xlib.h
|
|
|
f20033 |
%{_includedir}/X11/XlibConf.h
|
|
|
f20033 |
%{_includedir}/X11/Xlibint.h
|
|
|
f20033 |
%{_includedir}/X11/Xlib-xcb.h
|
|
|
f20033 |
%{_includedir}/X11/Xlocale.h
|
|
|
f20033 |
%{_includedir}/X11/Xregion.h
|
|
|
f20033 |
%{_includedir}/X11/Xresource.h
|
|
|
f20033 |
%{_includedir}/X11/Xutil.h
|
|
|
f20033 |
%{_includedir}/X11/cursorfont.h
|
|
|
f20033 |
%{_libdir}/libX11.so
|
|
|
f20033 |
%{_libdir}/libX11-xcb.so
|
|
|
f20033 |
%{_libdir}/pkgconfig/x11.pc
|
|
|
f20033 |
%{_libdir}/pkgconfig/x11-xcb.pc
|
|
|
f20033 |
%{_mandir}/man3/*.3*
|
|
|
f20033 |
%{_mandir}/man5/*.5*
|
|
|
f20033 |
|
|
|
f20033 |
%changelog
|
|
|
798623 |
* Thu Aug 12 2021 Adam Jackson <ajax@redhat.com> - 1.6.8-5
|
|
|
798623 |
- Fix CVE-2021-31535 (#1962439)
|
|
|
798623 |
|
|
|
fe4c4e |
* Tue Nov 3 2020 Michel Dänzer <mdaenzer@redhat.com> - 1.6.8-4
|
|
|
fe4c4e |
- Fix CVE-2020-14363 (#1873923)
|
|
|
fe4c4e |
|
|
|
f20033 |
* Mon Feb 24 2020 Adam Jackson <ajax@redhat.com> - 1.6.8-3
|
|
|
f20033 |
- Fix race condition in poll_for_reponse
|
|
|
f20033 |
|
|
|
f20033 |
* Fri Dec 13 2019 Adam Jackson <ajax@redhat.com> - 1.6.8-2
|
|
|
f20033 |
- Fix assertion on error in XCopyColormapAndFree
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Nov 19 2019 Adam Jackson <ajax@redhat.com> - 1.6.8-1
|
|
|
f20033 |
- libX11 1.6.8
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Oct 09 2018 Adam Jackson <ajax@redhat.com> - 1.6.7-1
|
|
|
f20033 |
- libX11 1.6.7
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Aug 21 2018 Adam Jackson <ajax@redhat.com> - 1.6.6-1
|
|
|
f20033 |
- libX11 1.6.6
|
|
|
f20033 |
|
|
|
f20033 |
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-9
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 1.6.5-8
|
|
|
f20033 |
- Use ldconfig scriptlet macros
|
|
|
f20033 |
|
|
|
f20033 |
* Fri Mar 23 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.6.5-7
|
|
|
f20033 |
- Fix FTBS caused by fake size in the XimCacheStruct (#1556616)
|
|
|
f20033 |
|
|
|
f20033 |
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-6
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Oct 17 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.5-5
|
|
|
f20033 |
- run make check as part of the build (#1502658)
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Aug 01 2017 Adam Jackson <ajax@redhat.com> - 1.6.5-4
|
|
|
f20033 |
- Split libX11-xcb to its own subpackage. This doesn't have much effect at
|
|
|
f20033 |
the moment because x11-xcb.pc still lists both libX11 and libxcb in
|
|
|
f20033 |
Requires, but once that's fixed eg. libEGL should be able to be installed
|
|
|
f20033 |
without libX11.
|
|
|
f20033 |
|
|
|
f20033 |
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-3
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Fri May 12 2017 Hans de Goede <hdegoede@redhat.com> - 1.6.5-2
|
|
|
f20033 |
- Rebuild against new xproto to pick up support for new keysyms
|
|
|
f20033 |
|
|
|
f20033 |
* Wed Apr 26 2017 Adam Jackson <ajax@redhat.com> - 1.6.5-1
|
|
|
f20033 |
- libX11 1.6.5
|
|
|
f20033 |
|
|
|
f20033 |
* Thu Feb 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.6.4-6
|
|
|
f20033 |
- create/own /var/cache/libx11/compose (#962764)
|
|
|
f20033 |
- %%build: --disable-silent-rules
|
|
|
f20033 |
|
|
|
f20033 |
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-5
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Fri Jan 20 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-4
|
|
|
f20033 |
- Actually apply the patch from 1.6.4-3
|
|
|
f20033 |
|
|
|
f20033 |
* Mon Jan 09 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-3
|
|
|
f20033 |
- Fix a bug in the memory leak fix from 1.6.4-2
|
|
|
f20033 |
|
|
|
f20033 |
* Thu Jan 05 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-2
|
|
|
f20033 |
- Plug a memory leak in XListFonts()
|
|
|
f20033 |
|
|
|
f20033 |
* Wed Oct 05 2016 Adam Jackson <ajax@redhat.com> - 1.6.4-1
|
|
|
f20033 |
- libX11 1.6.4
|
|
|
f20033 |
|
|
|
f20033 |
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Thu Jan 28 2016 Peter Hutterer <peter.hutterer@redhat.com>
|
|
|
f20033 |
- Remove unnecessary defattr
|
|
|
f20033 |
|
|
|
f20033 |
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-2
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Mar 10 2015 Adam Jackson <ajax@redhat.com> 1.6.3-1
|
|
|
f20033 |
- libX11 1.6.3
|
|
|
f20033 |
|
|
|
f20033 |
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Mon Jun 30 2014 Adam Jackson <ajax@redhat.com> 1.6.2-1
|
|
|
f20033 |
- libX11 1.6.2 plus a fix for interleaved xcb/xlib usage
|
|
|
f20033 |
- Use >= for the -common Requires
|
|
|
f20033 |
|
|
|
f20033 |
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
|
|
|
f20033 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Jul 30 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.6.1-1
|
|
|
f20033 |
- libX11 1.6.1
|
|
|
f20033 |
|
|
|
f20033 |
* Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-1
|
|
|
f20033 |
- libX11 1.6.0
|