[pkgsrc/trunk]: pkgsrc/x11/libX11 libX11: update to 1.6.11.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/48b1b88e39bb
branches:  trunk
changeset: 436695:48b1b88e39bb
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Aug 07 20:20:40 2020 +0000

description:
libX11: update to 1.6.11.

Alan Coopersmith (1):
      libX11 1.6.11

Yichao Yu (1):
      Fix size calculation in `_XimAttributeToValue`.

diffstat:

 x11/libX11/Makefile                 |   5 +--
 x11/libX11/distinfo                 |  11 ++++----
 x11/libX11/patches/patch-regression |  45 -------------------------------------
 3 files changed, 7 insertions(+), 54 deletions(-)

diffs (81 lines):

diff -r 7e4fe962b571 -r 48b1b88e39bb x11/libX11/Makefile
--- a/x11/libX11/Makefile       Fri Aug 07 19:39:39 2020 +0000
+++ b/x11/libX11/Makefile       Fri Aug 07 20:20:40 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2020/08/04 15:50:19 maya Exp $
+# $NetBSD: Makefile,v 1.54 2020/08/07 20:20:40 wiz Exp $
 
-DISTNAME=              libX11-1.6.10
-PKGREVISION=           1
+DISTNAME=              libX11-1.6.11
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 7e4fe962b571 -r 48b1b88e39bb x11/libX11/distinfo
--- a/x11/libX11/distinfo       Fri Aug 07 19:39:39 2020 +0000
+++ b/x11/libX11/distinfo       Fri Aug 07 20:20:40 2020 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.32 2020/08/04 15:50:19 maya Exp $
+$NetBSD: distinfo,v 1.33 2020/08/07 20:20:40 wiz Exp $
 
-SHA1 (libX11-1.6.10.tar.bz2) = e28f6bc0a33ca512b1aeb973a1dd8b3a3c48cd9f
-RMD160 (libX11-1.6.10.tar.bz2) = 3d7ecf53bf8d87347857a0a810ce772f97c4b352
-SHA512 (libX11-1.6.10.tar.bz2) = ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff
-Size (libX11-1.6.10.tar.bz2) = 2294095 bytes
+SHA1 (libX11-1.6.11.tar.bz2) = 69ce253b00a56eb8b767ce1080985f32b57304e3
+RMD160 (libX11-1.6.11.tar.bz2) = 1132ed74c5bd5c027e29b7d8a57ae821166cea2e
+SHA512 (libX11-1.6.11.tar.bz2) = 2cb4e215c1e3ccb327e02586844f8c426068536a0f472a39f12191feace607f61a6a08586f03758248199678c2f6897a984b0f1222bc0d68fd2e02702f4ce0bf
+Size (libX11-1.6.11.tar.bz2) = 2389687 bytes
 SHA1 (patch-Makefile.in) = 93d3b8d9882babf70788e984884a9db46a5367ef
 SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
 SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e
-SHA1 (patch-regression) = 55d611dacaa9b64e4275f83bb76843323bc38234
diff -r 7e4fe962b571 -r 48b1b88e39bb x11/libX11/patches/patch-regression
--- a/x11/libX11/patches/patch-regression       Fri Aug 07 19:39:39 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-regression,v 1.1 2020/08/04 15:50:19 maya Exp $
-
-From 93fce3f4e79cbc737d6468a4f68ba3de1b83953b Mon Sep 17 00:00:00 2001
-From: Yichao Yu <yyc1992%gmail.com@localhost>
-Date: Sun, 2 Aug 2020 13:43:58 -0400
-Subject: [PATCH] Fix size calculation in `_XimAttributeToValue`.
-
-The check here guards the read below.
-For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers`
-these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`.
-(There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this
-function and doesn't need to be checked.)
-
-The old code here used the native datatype size instead of the wire protocol size causing
-the check to always fail.
-
-Also fix the size calculation for the header (size). It is 2 x CARD16 for both types
-despite the unused `CARD16` for `XimType_XIMStyles`.
-
-[1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles
-
-This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10.
-
-Fix #116
-
---- modules/im/ximcp/imRmAttr.c.orig
-+++ modules/im/ximcp/imRmAttr.c
-@@ -265,7 +265,7 @@ _XimAttributeToValue(
- 
-           if (num > (USHRT_MAX / sizeof(XIMStyle)))
-               return False;
--          if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len)
-+          if ((2 * sizeof(CARD16) + (num * sizeof(CARD32))) > data_len)
-               return False;
-           alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num;
-           if (alloc_len < sizeof(XIMStyles))
-@@ -379,7 +379,7 @@ _XimAttributeToValue(
- 
-           if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger)))
-               return False;
--          if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len)
-+          if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len)
-               return False;
-           alloc_len = sizeof(XIMHotKeyTriggers)
-                     + sizeof(XIMHotKeyTrigger) * num;