RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/libX11#d75fa801efeda44c9ed40a3f40f57fdb98cb2c96
2020-10-15 15:17:07 +02:00 · 2020-10-15 15:17:07 +02:00 · cf7cd08009
commit cf7cd08009
parent 79e95d42b2
6 changed files with 311 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+/libX11-*.tar.bz2
--- a/1
+++ b/1
@ -0,0 +1 @@
+a3bdd2b090915fe0163b062f0e6576fe05dd332e
--- a/dont-forward-keycode-0.patch
+++ b/dont-forward-keycode-0.patch
@ -0,0 +1,53 @@
+diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c
+--- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx	2015-03-09 18:28:45.000000000 -0400
+++ libX11-1.6.3/modules/im/ximcp/imDefFlt.c	2015-03-10 12:32:31.912149644 -0400
+@@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
+ {
+     Xim		im = (Xim)ic->core.im;
+ 
+-    if (IS_FABRICATED(im)) {
+    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
+ 	_XimPendingFilter(ic);
+ 	UNMARK_FABRICATED(im);
+ 	return NOTFILTERD;
+diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/ximcp/imDefLkup.c
+--- libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx	2015-03-09 18:28:45.000000000 -0400
+++ libX11-1.6.3/modules/im/ximcp/imDefLkup.c	2015-03-10 12:32:31.911149637 -0400
+@@ -332,6 +332,17 @@ _XimForwardEvent(
+     XEvent	*ev,
+     Bool	 sync)
+ {
+    /*
+     * Don't forward a key event which has keycode=0.
+     * keycode=0 is reserved for special purpose to let Xmb/wcLookupString()
+     * functions know that there is a commited string available from IM.
+     */
+    if (((ev->type == KeyPress) || (ev->type == KeyRelease))) {
+        if (((XKeyEvent *)ev)->keycode == 0) {
+            return True;
+        }
+    }
+
+ #ifdef EXT_FORWARD
+     if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
+ 	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
+@@ -604,6 +615,19 @@ _XimUnregCommitInfo(
+     Xfree(info->keysym);
+     ic->private.proto.commit_info = info->next;
+     Xfree(info);
+
+    /*
+     * "Commit" uses fabricated flag to process a commited string
+     * from IM engine.  
+     * Turn off the fabricated flag here (unregister the commited
+     * information function). Otherwise, next regular key press
+     * event will be ignored at _XimProtoKeypressFilter() and it
+     * will not be passed to IM engine.
+     */
+    if (IS_FABRICATED(ic)) {
+        UNMARK_FABRICATED(ic);
+    }
+
+     return;
+ }
+ 
--- a/libX11.spec
+++ b/libX11.spec
@ -0,0 +1,238 @@
+%global tarball libX11
+#global gitdate 20130524
+%global gitversion a3bdd2b09
+
+Summary: Core X11 protocol client library
+Name: libX11
+Version: 1.6.12
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+License: MIT
+URL: http://www.x.org
+
+%if 0%{?gitdate}
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
+Source2:    commitid
+%else
+Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+%endif
+
+Patch2: dont-forward-keycode-0.patch
+
+BuildRequires: xorg-x11-util-macros >= 1.11
+BuildRequires: pkgconfig(xproto) >= 7.0.15
+BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
+BuildRequires: libxcb-devel >= 1.2
+BuildRequires: pkgconfig(xau) pkgconfig(xdmcp)
+BuildRequires: perl(Pod::Usage)
+
+Requires: %{name}-common >= %{version}-%{release}
+
+%description
+Core X11 protocol client library.
+
+%package common
+Summary: Common data for libX11
+BuildArch: noarch
+
+%description common
+libX11 common data
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-xcb = %{version}-%{release}
+
+%description devel
+X.Org X11 libX11 development package
+
+%package xcb
+Summary: XCB interop for libX11
+Conflicts: %{name} < %{version}-%{release}
+
+%description xcb
+libX11/libxcb interoperability library
+
+%prep
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch2 -p1 -b .dont-forward-keycode-0
+
+%build
+autoreconf -v --install --force
+%configure --disable-silent-rules --disable-static
+
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+# create/own compose cache dir
+mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
+
+# We intentionally don't ship *.la files
+find $RPM_BUILD_ROOT -type f -name '*.la' -delete
+
+# FIXME: Don't install Xcms.txt - find out why upstream still ships this.
+find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
+
+# FIXME package these properly
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+
+%check
+make %{?_smp_mflags} check
+
+%ldconfig_post
+%ldconfig_postun
+
+%files
+%{_libdir}/libX11.so.6
+%{_libdir}/libX11.so.6.3.0
+
+%files xcb
+%{_libdir}/libX11-xcb.so.1
+%{_libdir}/libX11-xcb.so.1.0.0
+
+%files common
+%doc AUTHORS COPYING README.md NEWS
+%{_datadir}/X11/locale/
+%{_datadir}/X11/XErrorDB
+%dir /var/cache/libX11
+%dir /var/cache/libX11/compose
+
+%files devel
+%{_includedir}/X11/ImUtil.h
+%{_includedir}/X11/XKBlib.h
+%{_includedir}/X11/Xcms.h
+%{_includedir}/X11/Xlib.h
+%{_includedir}/X11/XlibConf.h
+%{_includedir}/X11/Xlibint.h
+%{_includedir}/X11/Xlib-xcb.h
+%{_includedir}/X11/Xlocale.h
+%{_includedir}/X11/Xregion.h
+%{_includedir}/X11/Xresource.h
+%{_includedir}/X11/Xutil.h
+%{_includedir}/X11/cursorfont.h
+%{_includedir}/X11/extensions/XKBgeom.h
+%{_libdir}/libX11.so
+%{_libdir}/libX11-xcb.so
+%{_libdir}/pkgconfig/x11.pc
+%{_libdir}/pkgconfig/x11-xcb.pc
+%{_mandir}/man3/*.3*
+%{_mandir}/man5/*.5*
+
+%changelog
+* Wed Aug 26 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.6.12-1
+- libX11 1.6.12 (CVE-2020-14363, CVE 2020-14344)
+
+* Fri Jul 31 2020 Adam Jackson <ajax@redhat.com> - 1.6.9-5
+- Fix server reply validation issue in XIM (CVE 2020-14344)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Dec 11 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.6.9-2
+- handle ssharp in XConvertCase
+
+* Wed Oct 09 2019 Adam Jackson <ajax@redhat.com> - 1.6.9-1
+- libX11 1.6.9
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 20 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.6.8-2
+- rebuild to pick up the new xorgproto keysyms
+
+* Thu Jun 20 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.6.8-1
+- libX11 1.6.8
+
+* Thu Mar 21 2019 Adam Jackson <ajax@redhat.com> - 1.6.7-3
+- Rebuild for xtrans 1.4.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Oct 09 2018 Adam Jackson <ajax@redhat.com> - 1.6.7-1
+- libX11 1.6.7
+
+* Tue Aug 21 2018 Adam Jackson <ajax@redhat.com> - 1.6.6-1
+- libX11 1.6.6
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 1.6.5-8
+- Use ldconfig scriptlet macros
+
+* Fri Mar 23 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.6.5-7
+- Fix FTBS caused by fake size in the XimCacheStruct (#1556616)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Oct 17 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.5-5
+- run make check as part of the build (#1502658)
+
+* Tue Aug 01 2017 Adam Jackson <ajax@redhat.com> - 1.6.5-4
+- Split libX11-xcb to its own subpackage. This doesn't have much effect at
+  the moment because x11-xcb.pc still lists both libX11 and libxcb in
+  Requires, but once that's fixed eg. libEGL should be able to be installed
+  without libX11.
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri May 12 2017 Hans de Goede <hdegoede@redhat.com> - 1.6.5-2
+- Rebuild against new xproto to pick up support for new keysyms
+
+* Wed Apr 26 2017 Adam Jackson <ajax@redhat.com> - 1.6.5-1
+- libX11 1.6.5
+
+* Thu Feb 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.6.4-6
+- create/own /var/cache/libx11/compose (#962764)
+- %%build: --disable-silent-rules
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 20 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-4
+- Actually apply the patch from 1.6.4-3
+
+* Mon Jan 09 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-3
+- Fix a bug in the memory leak fix from 1.6.4-2
+
+* Thu Jan 05 2017 Peter Hutterer <peter.hutterer@redhat.com> 1.6.4-2
+- Plug a memory leak in XListFonts()
+
+* Wed Oct 05 2016 Adam Jackson <ajax@redhat.com> - 1.6.4-1
+- libX11 1.6.4
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jan 28 2016 Peter Hutterer <peter.hutterer@redhat.com>
+- Remove unnecessary defattr
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Mar 10 2015 Adam Jackson <ajax@redhat.com> 1.6.3-1
+- libX11 1.6.3
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Jun 30 2014 Adam Jackson <ajax@redhat.com> 1.6.2-1
+- libX11 1.6.2 plus a fix for interleaved xcb/xlib usage
+- Use >= for the -common Requires
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Jul 30 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.6.1-1
+- libX11 1.6.1
+
+* Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-1
+- libX11 1.6.0
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=libX11-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/lib/libX11 $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+git log | head -1 | awk '{ print $2 }' > ../commitid
+git repack -a -d
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (libX11-1.6.12.tar.bz2) = 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
				`@ -0,0 +1 @@`
				`SHA512 (libX11-1.6.12.tar.bz2) = 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47`