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

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

.gitignore

@@ -1,17 +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-*.tar.xz

0001-Fix-XNextRequest-after-direct-usage-of-XCB.patch

@@ -1,87 +0,0 @@
-From 7f8f9a36ef901f31279c385caf960a22daeb33fe Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor@fishsoup.net>
-Date: Fri, 9 May 2014 18:21:05 -0400
-Subject: [PATCH] Fix XNextRequest() after direct usage of XCB
-
-When XCB owns the X socket, dpy->request is not updated, so
-NextRequest() and XNextRequest() return the wrong value. There's
-nothing we can do to fix NextRequest() while retaining ABI compat,
-but change XNextRequest() to grab the socket back from XCB,
-updating dpy->request.
-
-Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
-Reviewed-by: Uli Schlachter <psychon@znc.in>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- src/Macros.c  | 14 +++++++++++++-
- src/Xxcbint.h |  2 ++
- src/xcb_io.c  | 11 +++++++++++
- 3 files changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/src/Macros.c b/src/Macros.c
-index cfc083a..394a764 100644
---- a/src/Macros.c
-+++ b/src/Macros.c
-@@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
- #include "Xlibint.h"
- #define XUTIL_DEFINE_FUNCTIONS
- #include "Xutil.h"
-+#include "Xxcbint.h"
- 
- /*
-  * This file makes full definitions of routines for each macro.
-@@ -135,9 +136,20 @@ int XBitmapPad(Display *dpy) { return (BitmapPad(dpy)); }
- 
- int XImageByteOrder(Display *dpy) { return (ImageByteOrder(dpy)); }
- 
-+/* XNextRequest() differs from the rest of the functions here because it is
-+ * no longer a macro wrapper - when libX11 is being used mixed together
-+ * with direct use of xcb, the next request field of the Display structure will
-+ * not be updated. We can't fix the NextRequest() macro in any easy way,
-+ * but we can at least make XNextRequest() do the right thing.
-+ */
- unsigned long XNextRequest(Display *dpy)
- {
--    return (NextRequest(dpy));
-+    unsigned long next_request;
-+    LockDisplay(dpy);
-+    next_request = _XNextRequest(dpy);
-+    UnlockDisplay(dpy);
-+
-+    return next_request;
- }
- 
- unsigned long XLastKnownRequestProcessed(Display *dpy)
-diff --git a/src/Xxcbint.h b/src/Xxcbint.h
-index a8c9a67..bf41c23 100644
---- a/src/Xxcbint.h
-+++ b/src/Xxcbint.h
-@@ -46,4 +46,6 @@ typedef struct _X11XCBPrivate {
- int _XConnectXCB(Display *dpy, _Xconst char *display, int *screenp);
- void _XFreeX11XCBStructure(Display *dpy);
- 
-+unsigned long _XNextRequest(Display *dpy);
-+
- #endif /* XXCBINT_H */
-diff --git a/src/xcb_io.c b/src/xcb_io.c
-index 727c6c7..5987329 100644
---- a/src/xcb_io.c
-+++ b/src/xcb_io.c
-@@ -774,3 +774,14 @@ void _XEatDataWords(Display *dpy, unsigned long n)
- 		dpy->xcb->reply_consumed = dpy->xcb->reply_length;
- 	_XFreeReplyData(dpy, False);
- }
-+
-+unsigned long
-+_XNextRequest(Display *dpy)
-+{
-+    /* This will update dpy->request. The assumption is that the next thing
-+     * that the application will do is make a request so there's little
-+     * overhead.
-+     */
-+    require_socket(dpy);
-+    return NextRequest(dpy);
-+}
--- 
-2.0.0
-

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,13 +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.3
+Version: 1.8.12
 Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
-License: MIT
-Group: System Environment/Libraries
+License: MIT AND X11
 URL: http://www.x.org
 
 %if 0%{?gitdate}
@@ -15,10 +14,14 @@ Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 %else
-Source0: http://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
@@ -33,7 +36,6 @@ Core X11 protocol client library.
 
 %package common
 Summary: Common data for libX11
-Group: System Environment/Libraries
 BuildArch: noarch
 
 %description common
@@ -41,28 +43,34 @@ libX11 common data
 
 %package devel
 Summary: Development files for %{name}
-Group: Development/Libraries
 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
+%autosetup -p1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
-# sodding libtool
 autoreconf -v --install --force
-%configure --disable-static
+%configure --disable-silent-rules --disable-static
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 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
 
@@ -72,27 +80,28 @@ find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
 # FIXME package these properly
 rm -rf $RPM_BUILD_ROOT%{_docdir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+make %{?_smp_mflags} check
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_post
+%ldconfig_postun
 
 %files
-%defattr(-,root,root,-)
 %{_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
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS
+%doc AUTHORS COPYING README.md
 %{_datadir}/X11/locale/
 %{_datadir}/X11/XErrorDB
+%dir /var/cache/libX11
+%dir /var/cache/libX11/compose
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/X11/ImUtil.h
 %{_includedir}/X11/XKBlib.h
 %{_includedir}/X11/Xcms.h
@@ -105,6 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -113,6 +123,220 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
+
+* 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
 
@@ -134,318 +358,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-1
 - libX11 1.6.0
-
-* Mon May 27 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-1
-- Update to 1.5.99.902 (same code-base, just easier in Requires)
-
-* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-3..20130524gita3bdd2b09
-- Udpate to git snapshot to fix CVEs listed below
-- CVE-2013-1997
-- CVE-2013-1981
-- CVE-2013-2004
-
-* Sun Mar 10 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-2
-- Add BR for Pod::Usage, needed by compose-chart.pl
-
-* Sun Mar 10 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901.-1
-- libX11 1.6RC1
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 12 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.5.0-2
-- run autoreconf to get rid of rpath define (#828513)
-
-* Mon Jun 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.5.0-1
-- libX11 1.5
-
-* Tue May 01 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.901-2
-- Rebuild to pick up new compose symbols from updated x11 proto
-
-* Tue Mar 20 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.901-1
-- libX11 1.5RC1
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.99.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Dec 22 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.1-2
-- fix dont-forward-keycode-0.patch, symbol name change
-
-* Wed Dec 21 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.1-1
-- libX11 1.4.99.1
-
-* Fri Jul 29 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.4.4-1
-- libX11 1.4.4
-
-* Wed Apr 06 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.4.3-1
-- libX11 1.4.3
-
-* Fri Mar 18 2011 Adam Jackson <ajax@redhat.com> 1.4.2-1
-- libX11 1.4.2
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Nov 22 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.4.0-1
-- libX11 1.4
-
-* Mon Nov 01 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.3.99.903-1
-- libX11 1.3.99.903 (1.4 RC1)
-
-* Mon Sep 06 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.3.99.901-1
-- libX11 1.3.99.901 (1.4 RC1)
-
-* Thu Aug 12 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.3.5-1
-- libX11 1.3.5
-- Drop 54a96360 patch, upstream.
-
-* Tue Aug 10 2010 Bill Nottingham <notting@redhat.com> - 1.3.4-3
-- Merge upstream commit 54a96360, fixes use-after-free (fd.o 29412)
-
-* Mon Jul 19 2010 Matěj Cepl <mcepl@redhat.com> - 1.3.4-2
-- don't own /usr/share/X11, filesystem owns it already (#569395)
-
-* Fri Jun 04 2010 Adam Jackson <ajax@redhat.com> 1.3.4-1
-- libX11 1.3.4
-
-* Mon Apr 12 2010 Matěj Cepl <mcepl@redhat.com> - 1.3.1-3
-- Fix XCopyGC manpage (#579102)
-
-* Mon Oct 19 2009 Adam Jackson <ajax@redhat.com> 1.3.1-2
-- libX11 1.3.1
-
-* Tue Oct 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.3-1
-- libX11 1.3
-
-* Thu Aug 13 2009 Parag <paragn@fedoraproject.org> 1.2.99-5.20090805
-- Merge-review cleanups #226062
-
-* Thu Aug 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.99-4.20090805
-- Today's git snapshot
-- minor soname bump to 6.3.0
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.99-3.20090712
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul 23 2009 Adam Jackson <ajax@redhat.com> 1.2.99-2.20090712
-- Un-require xorg-x11-filesystem
-- Remove useless %%dir
-
-* Sun Jul 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.99-1.20090712
-- Today's git snapshot
-- libX11-1.2.1-indic.patch: Drop.
-
-* Mon Jul 06 2009 Adam Jackson <ajax@redhat.com> 1.2.1-3
-- -common subpackage
-
-* Tue May 26 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.1-2
-- libX11-1.2.1-indic.patch: Add new Indic language information to nls
-  directory files (#497971)
-
-* Tue May 26 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.1-1
-- libX11 1.2.1
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Feb 21 2009 Adam Jackson <ajax@redhat.com> 1.2-2
-- Merge review cleanups. (#226062)
-
-* Wed Feb 18 2009 Adam Jackson <ajax@redhat.com> 1.2-1
-- libX11 1.2
-
-* Wed Feb 04 2009 Adam Jackson <ajax@redhat.com> 1.1.99.2-4
-- libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git)
-
-* Mon Feb 02 2009 Caolán McNamara <caolanm@redhat.com> 1.1.99.2-3
-- Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc.
-
-* Thu Dec 18 2008 Adam Jackson <ajax@redhat.com> 1.1.99.2-2
-- BR: util-macros
-
-* Thu Dec 18 2008 Adam Jackson <ajax@redhat.com> 1.1.99.2-1
-- libX11 1.1.99.2
-
-* Tue Nov 18 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.1.4-6
-- libX11-1.1.4-XF86Suspend.patch: add XF86Suspend and XF86Hibernate keysyms.
-
-* Fri Oct 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.1.4-5
-- libX11-1.1.4-keysysm.patch: add a bunch of keysyms for remote controls and
-  special keys.
-
-* Wed Sep 17 2008 Adam Jackson <ajax@redhat.com> 1.1.4-4
-- libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.
-
-* Wed Sep 17 2008 Adam Jackson <ajax@redhat.com> 1.1.4-3
-- libX11-1.1.4-xcb-xreply-leak.patch: Fix a leak when the client has a
-  non-fatal error handler. (mclasen, fdo #17616)
-
-* Tue Jul 15 2008 Adam Jackson <ajax@redhat.com> 1.1.4-2
-- Fix license tag.
-
-* Thu Mar 06 2008 Adam Jackson <ajax@redhat.com> 1.1.4-1
-- libX11 1.1.4
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.1.3-5
-- Autorebuild for GCC 4.3
-
-* Fri Oct 19 2007 Kristian Høgsberg <krh@redhat.com> - 1.1.3-4
-- Add patch from upstream to add keysyms for brightness buttons (#330491).
-
-* Tue Oct 16 2007 Adam Jackson <ajax@redhat.com> 1.1.3-3
-- libX11-devel Requires: libxcb-devel.
-
-* Wed Oct 10 2007 Adam Jackson <ajax@redhat.com> 1.1.3-2
-- libX11-1.1.3-xkb-lock-fix.patch: Don't LockDisplay() recursively.  Fixes
-  Gnome hang at logout. (#326461)
-
-* Mon Sep 24 2007 Adam Jackson <ajax@redhat.com> 1.1.3-1
-- libX11 1.1.3
-
-* Thu Sep 20 2007 Adam Jackson <ajax@redhat.com> 1.1.2-4
-- Update xtrans dep and rebuild.
-
-* Mon Sep 17 2007 Adam Jackson <ajax@redhat.com> 1.1.2-3
-- libX11-1.1.2-GetMotionEvents.patch: Fix the definition of XGetMotionEvents
-  to match the argument order in the headers. (#274671)
-
-* Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.1.2-2
-- Rebuild for build id
-
-* Mon Jul 23 2007 Adam Jackson <ajax@redhat.com> 1.1.2-1
-- libX11 1.1.2.
-- Enable XCB for libX11 transport.
-
-* Sat Apr 21 2007 Matthias Clasen <mclasen@redhat.com> 1.0.3-9
-- Don't install INSTALL
-
-* Fri Apr 06 2007 Adam Jackson <ajax@redhat.com> 1.0.3-8
-- Fix for CVE 2007-1667.
-
-* Mon Jan 29 2007 Adam Jackson <ajax@redhat.com> 1.0.3-7
-- Fix xim fd leak.
-
-* Thu Nov 09 2006 Caius Chance <cchance@redhat.com> 1.0.3-6.fc7
-- Fix XIM hangs when switching input context (Soren Sandmann, #201284)
-
-* Fri Oct 13 2006 Kristian Høgsberg <krh@redhat.com> 1.0.3-5.fc7
-- Add pkgconfig dependency for -devel package.
-
-* Sat Sep 30 2006 Soren Sandmann <sandmann@redhat.com> 1.0.3-4.fc6
-- Fix patch so it actually applies. (#208508)
-
-* Sat Sep 30 2006 Soren Sandmann <sandmann@redhat.com> 1.0.3-4.fc6
-- Fix typos in patch for indic locales (#208580)
-
-* Wed Sep 20 2006 Soren Sandmann <sandmann@redhat.com> 1.0.3-3.fc6
-- Add patch to not forward keycode 0 (#194357).
-
-* Wed Jul 19 2006 Mike A. Harris <mharris@redhat.com> 1.0.3-2.fc6
-- Added libX11-nls-indic-locales-bug185376.patch to add support for various
-  indic locales which have now been committed upstream (#185376)
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> 1.0.3-1.1.fc6
-- rebuild
-
-* Mon Jul 10 2006 Mike A. Harris <mharris@redhat.com> 1.0.3-1.fc6
-- Updated libX11 to version 1.0.3
-- Remove libX11-1.0.1-setuid.diff as it is included in the 1.0.3 release.
-- Added 'dist' tag to "Release:"
-
-* Wed Jun 28 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-1
-- Updated libX11 to version 1.0.2
-- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet
-  new "xproto >= 7.0.6" dependency.
-- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included
-  upstream.
-- Remove autoconf dependency as we no longer need it.
-
-* Tue Jun 20 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
-- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
-- Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
-  so we can control this dep centrally.
-- Added NEWS to doc list.
-
-* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
-- Remove package ownership of mandir/libdir/etc.
-
-* Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
-- Bump to 1.0.1
-
-* Thu Feb 23 2006 Christopher Aillon <caillon@redhat.com> 1.0.0-3
-- Look for the versioned libXcursor.so.1 (fixes 179044)
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Sat Dec 24 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-2
-- Added "Requires: libXau-devel, libXdmcp-devel" to -devel subpackage (#176313)
-
-* Fri Dec 16 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
-- Updated libX11 to version 1.0.0 from X11R7 RC4
-
-* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.4-1
-- Updated libX11 to version 0.99.4 from X11R7 RC3
-- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure
-  that /usr/lib/X11 and /usr/include/X11 pre-exist.
-- Removed 'x' suffix from manpage directories to match RC3 upstream.
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Tue Nov 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-4
-- Added libX11-0.99.3-datadir-locale-dir-fix.patch, to fix build to install
-  the locale data files into datadir instead of libdir. (#173282)
-
-* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 0.99.3-3
-- require newer filesystem package (#172610)
-
-* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-2
-- Moved _smp_mflags from 'make install' to 'make' invocation, duh.
-
-* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
-- Updated libX11 to version 0.99.3 from X11R7 RC2
-- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
-- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
-
-* Mon Nov 07 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
-- Fix devel subpackage summary and description with s/libXdmcp/libX11/
-
-* Fri Oct 21 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
-- Updated to libX11-0.99.2 from the X11R7 RC1 release.
-- Added en_GR.UTF-8 locale to file manifest.
-- Forcibly remove Xcms.txt
-
-* Sun Oct 02 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
-- Added _smp_mflags to make invocation to speed up SMP builds
-
-* Thu Sep 29 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3
-- Renamed package to remove xorg-x11 from the name due to unanimous decision
-  between developers.
-- Use Fedora Extras style BuildRoot tag.
-- Disable static library creation by default.
-- Add missing defattr to devel subpackage
-- Add missing documentation files to doc macro
-
-* Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
-- Renamed package to prepend "xorg-x11" to the name for consistency with
-  the rest of the X11R7 packages.
-- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel
-  subpackage to ensure the devel package matches the installed shared libs.
-- Added virtual "Provides: lib<name>" and "Provides: lib<name>-devel" to
-  allow applications to use implementation agnostic dependencies.
-- Added post/postun scripts which call ldconfig.
-- Added Conflicts with XFree86-libs and xorg-x11-libs to runtime package,
-  and Conflicts with XFree86-devel and xorg-x11-devel to devel package.
-
-* Mon Aug 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1.1
-- Added Requires: xorg-x11-proto-devel to libX11-devel subpackage
-
-* Mon Aug 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1
-- Initial build.

sources

@@ -1 +1 @@
-2e36b73f8a42143142dda8129f02e4e0  libX11-1.6.3.tar.bz2
+SHA512 (libX11-1.8.12.tar.xz) = cb7a284d9081a8b67f7d8568d56dc403a4b787e46ac497b07768d236084c01f80f4ea2ebd814f950ac9738adc3baea3912932fc333858195c4f8217744b6f730