From 9820328a0b9cdbe139f95397dc46cce1e6aa494c Mon Sep 17 00:00:00 2001 From: mr-zhang_zx Date: Thu, 22 Dec 2022 17:55:11 +0800 Subject: [PATCH] Modify data type --- libX11-1.7.2-sw_64.patch | 24 ++++++++++++++++++++++++ libX11.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 libX11-1.7.2-sw_64.patch diff --git a/libX11-1.7.2-sw_64.patch b/libX11-1.7.2-sw_64.patch new file mode 100644 index 0000000..5d4cad8 --- /dev/null +++ b/libX11-1.7.2-sw_64.patch @@ -0,0 +1,24 @@ +diff -Naru libX11-1.7.2/src/xcb_io.c libX11-1.7.2-sw/src/xcb_io.c +--- libX11-1.7.2/src/xcb_io.c 2021-06-06 16:48:53.000000000 +0000 ++++ libX11-1.7.2-sw/src/xcb_io.c 2022-09-01 03:24:00.479452203 +0000 +@@ -533,8 +533,9 @@ + static const xReq dummy_request; + static char const pad[3]; + struct iovec vec[3]; +- uint64_t requests; +- uint64_t dpy_request; ++ //uint64_t requests; ++ unsigned long requests; ++ uint64_t dpy_request; + _XExtension *ext; + xcb_connection_t *c = dpy->xcb->connection; + if(dpy->flags & XlibDisplayIOError) +@@ -554,7 +555,7 @@ + if(dpy->xcb->event_owner != XlibOwnsEventQueue || dpy->async_handlers) + { + uint64_t sequence; +- for(sequence = dpy->xcb->last_flushed + 1; sequence <= dpy_request; ++sequence) ++ for(sequence = dpy->xcb->last_flushed + 1; (unsigned long)sequence <= dpy_request; ++sequence) + append_pending_request(dpy, sequence); + } + requests = dpy_request - dpy->xcb->last_flushed; diff --git a/libX11.spec b/libX11.spec index b296a65..f709e22 100644 --- a/libX11.spec +++ b/libX11.spec @@ -1,6 +1,6 @@ Name: libX11 Version: 1.7.2 -Release: 5 +Release: 6 Summary: Core X11 protocol client library License: MIT URL: http://www.x.org @@ -11,6 +11,7 @@ Patch2: backport-makekeys-handle-the-new-EVDEVK-xorgproto-symbols.patch Patch6001: backport-CVE-2022-3554.patch Patch6002: backport-0001-CVE-2022-3555.patch Patch6003: backport-0002-CVE-2022-3555.patch +patch6004: libX11-1.7.2-sw_64.patch BuildRequires: xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel BuildRequires: libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4 @@ -76,6 +77,9 @@ make %{?_smp_mflags} check %{_mandir}/*/* %changelog +* Thu Dec 22 2022 zhangzhixin - 1.7.2-6 +- Modify data type + * Fri Nov 04 2022 wangkerong - 1.7.2-5 - disable static library -- Gitee