Rebuild to pick up latest xorg proto keysyms (#2413818)

Cherry-pick of
https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264.

.gitignore

@@ -1,21 +1 @@
-libX11-1.3.99.901.tar.bz2
-/libX11-1.3.99.903.tar.bz2
-/libX11-1.4.0.tar.bz2
-/libX11-1.4.1.tar.bz2
-/libX11-1.4.2.tar.bz2
-/libX11-1.4.3.tar.bz2
-/libX11-1.4.4.tar.bz2
-/libX11-1.4.99.1.tar.bz2
-/libX11-1.4.99.901.tar.bz2
-/libX11-1.5.0.tar.bz2
-/libX11-1.5.99.901.tar.bz2
-/libX11-20130524.tar.bz2
-/libX11-1.5.99.902.tar.bz2
-/libX11-1.6.0.tar.bz2
-/libX11-1.6.1.tar.bz2
-/libX11-1.6.2.tar.bz2
-/libX11-1.6.3.tar.bz2
-/libX11-1.6.4.tar.bz2
-/libX11-1.6.5.tar.bz2
-/libX11-1.6.6.tar.bz2
-/libX11-1.6.7.tar.bz2
+/libX11-*.tar.xz

dont-forward-keycode-0.patch

@@ -1,19 +1,19 @@
 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(
+@@ -143,7 +143,7 @@ _XimProtoKeypressFilter(
  {
      Xim		im = (Xim)ic->core.im;
  
--    if (IS_FABRICATED(im)) {
-+    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
+-    if (_XimIsFabricatedSerial(im, ev)) {
++    if ((ev->keycode == 0) || _XimIsFabricatedSerial(im, ev)) {
  	_XimPendingFilter(ic);
- 	UNMARK_FABRICATED(im);
+ 	_XimUnfabricateSerial(im, ic, ev);
  	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(
+@@ -333,6 +333,17 @@ _XimForwardEvent(
      XEvent	*ev,
      Bool	 sync)
  {
@@ -31,9 +31,9 @@ diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/xi
  #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;
+@@ -703,6 +714,19 @@ _XimUnregRealCommitInfo(
+     else
+ 	ic->private.proto.commit_info = info->next;
      Xfree(info);
 +
 +    /*

libX11.spec

@@ -1,12 +1,12 @@
 %global tarball libX11
 #global gitdate 20130524
-%global gitversion a3bdd2b09
+#global gitversion a3bdd2b09
 
 Summary: Core X11 protocol client library
 Name: libX11
-Version: 1.6.7
+Version: 1.8.12
 Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
-License: MIT
+License: MIT AND X11
 URL: http://www.x.org
 
 %if 0%{?gitdate}
@@ -14,11 +14,14 @@ 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
+Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
 %endif
 
+
 Patch2: dont-forward-keycode-0.patch
 
+BuildRequires: libtool
+BuildRequires: make
 BuildRequires: xorg-x11-util-macros >= 1.11
 BuildRequires: pkgconfig(xproto) >= 7.0.15
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
@@ -54,8 +57,7 @@ Conflicts: %{name} < %{version}-%{release}
 libX11/libxcb interoperability library
 
 %prep
-%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch2 -p1 -b .dont-forward-keycode-0
+%autosetup -p1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install --force
@@ -86,14 +88,14 @@ make %{?_smp_mflags} check
 
 %files
 %{_libdir}/libX11.so.6
-%{_libdir}/libX11.so.6.3.0
+%{_libdir}/libX11.so.6.4.0
 
 %files xcb
 %{_libdir}/libX11-xcb.so.1
 %{_libdir}/libX11-xcb.so.1.0.0
 
 %files common
-%doc AUTHORS COPYING README NEWS
+%doc AUTHORS COPYING README.md
 %{_datadir}/X11/locale/
 %{_datadir}/X11/XErrorDB
 %dir /var/cache/libX11
@@ -112,6 +114,7 @@ make %{?_smp_mflags} check
 %{_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
@@ -120,6 +123,156 @@ make %{?_smp_mflags} check
 %{_mandir}/man5/*.5*
 
 %changelog
+* Mon Dec 22 2025 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.12-2
+- Rebuild to pick up latest xorg proto keysyms (#2413818)
+
+* Thu Jul 24 2025 Olivier Fourdan <ofourdan@redhat.com> - 1.8.12-1
+- libX11 1.8.12
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Feb 03 2025 José Expósito <jexposit@redhat.com> - 1.8.11-1
+- libX11 1.8.11
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Aug 22 2024 Florian Müllner <fmuellner@redhat.com> - 1.8.10-2
+- Fix spurious Xerror when running synchronized
+
+* Wed Jul 31 2024 José Expósito <jexposit@redhat.com> - 1.8.10-1
+- libX11 1.8.10
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Apr 08 2024 José Expósito <jexposit@redhat.com> - 1.8.9-1
+- libX11 1.8.9
+
+* Mon Apr 01 2024 José Expósito <jexposit@redhat.com> - 1.8.8-1
+- libX11 1.8.8
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Oct 04 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.7-1
+- libX11 1.8.7
+  - CVE-2023-43785 libX11: out-of-bounds memory access in _XkbReadKeySyms()
+  - CVE-2023-43786 libX11: stack exhaustion from infinite recursion in
+    PutSubImage()
+  - CVE-2023-43787 libX11: integer overflow in XCreateImage() leading to
+   a heap overflow
+  - CVE-2023-43788 libXpm: out of bounds read in XpmCreateXpmImageFromBuffer()
+  - CVE-2023-43789 libXpm: out of bounds read on XPM with corrupted colormap
+
+* Thu Sep 07 2023 José Expósito <jexposit@redhat.com> - 1.8.6-3
+- SPDX Migration
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 16 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.6-1
+- libX11 1.8.6 (CVE-2023-3138)
+
+* Mon Jun 05 2023 Peter Hutterer <peter.hutterer@redhat.com> 1.8.5-1
+- libX11 1.8.5
+
+* Wed Feb 08 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.4-1
+- libX11 1.8.4
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.3-2
+- Fix XPutBackEvent() issues (#2161020)
+
+* Fri Jan 06 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.3-1
+- libX11 1.8.3
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jun 16 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.8.1-1
+- libX11 1.8.1
+
+* Mon Apr 04 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.7.5-1
+- libX11 1.7.5
+
+* Thu Mar 31 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.7.4-1
+- libX11 1.7.4
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Dec 10 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.7.3.1-1
+- libX11 1.7.3.1
+
+* Tue Dec 07 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.7.3-1
+- libX11 1.7.3
+- manually add ax_gcc_builtin, it's missing from the tarball
+
+* Tue Jul 27 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.7.2-3
+- Parse the new _EVDEVK symbols
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jun 09 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.7.2-1
+- libX11 1.7.2
+
+* Tue May 18 2021 Adam Jackson <ajax@redhat.com> - 1.7.1-1
+- libX11 1.7.1 (CVE-2021-31535)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 01 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.7.0-2
+- libX11 1.7.0 (with the tarball this time)
+
+* Tue Dec 01 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.7.0-1
+- libX11 1.7.0
+- switch to using the autosetup rpm macro
+
+* Mon Nov 09 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.6.12-3
+- Fix a race-condition in poll_for_response (#1758384)
+
+* Thu Nov  5 11:12:56 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 1.6.12-2
+- Add BuildRequires for make
+
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (libX11-1.6.7.tar.bz2) = edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
+SHA512 (libX11-1.8.12.tar.xz) = cb7a284d9081a8b67f7d8568d56dc403a4b787e46ac497b07768d236084c01f80f4ea2ebd814f950ac9738adc3baea3912932fc333858195c4f8217744b6f730