Pullup ticket #5823 - requested by bsiegert

x11/libX11: security update

Revisions pulled up:
- x11/libX11/Makefile                                           1.46
- x11/libX11/PLIST                                              1.14
- x11/libX11/distinfo                                           1.28

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Tue Aug 21 19:29:48 UTC 2018

   Modified Files:
           pkgsrc/x11/libX11: Makefile PLIST distinfo

   Log Message:
   libX11: update to 1.6.6.

   Security fix release.

   Alan Coopersmith (6):
         Make Xkb{Get,Set}NamedIndicator spec & manpages match code
         Clarify state parameter to XkbSetNamedDeviceIndicator
         Improve table formatting in XkbChangeControls & XkbKeyNumGroups man pages
         If XGetImage fails to create image, don't dereference it to bounds check
         Use size_t for buffer sizes in SetHints.c
         Change fall through comment in lcDB.c to match gcc's requirements

   Arthur Huillet (1):
         _XDefaultError: set XlibDisplayIOError flag before calling exit

   Bhavi Dhingra (1):
         Fix possible memory leak in cmsProp.c:140

   Martin Natano (1):
         Don't rebuild ks_tables.h if nothing changed.

   Matthieu Herrb (2):
         Remove statement with no effect.
         libX11 1.6.6

   Michal Srb (1):
         Use flexible array member instead of fake size.

   Ryan C. Gordon (1):
         Valgrind fix for XStoreColor and XStoreColors.

   Samuel Thibault (1):
         XkbOpenDisplay.3: fix typo

   Tobias Stoeckmann (4):
         Validation of server response in XListHosts.
         Fixed off-by-one writes (CVE-2018-14599).
         Fixed out of boundary write (CVE-2018-14600).
         Fixed crash on invalid reply (CVE-2018-14598).

   walter harms (13):
         fix shadow warning
         _XIOError(dpy); will never return so remore dead
         remove argument check for free() adjust one inden
         fix shadow char_size
         fix more shadow warning
         no need to check argument for _XkbFree()
         remove stray extern
         no need to check args for Xfree()
         fix memleak in error path
         fix memleak in error path
         no need to check XFree arguments
         mark _XDefaultIOError as no_return
         Fixes: warning: variable 'req' set but not,used

   wharms (3):
         add _X_UNUSED to avoid unused variable warnings
         remove empty line
         silence gcc warning assignment discards 'const' qualifier from
   pointer target type


   To generate a diff of this commit:
   cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/libX11/Makefile
   cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libX11/PLIST
   cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/libX11/distinfo

3 files changed, 10 insertions, 9 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 77313f665c8..592b276f9da 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2018/03/07 11:57:35 wiz Exp $
+# $NetBSD: Makefile,v 1.45.4.1 2018/09/10 07:14:59 spz Exp $
 
-DISTNAME=		libX11-1.6.5
-PKGREVISION=		1
+DISTNAME=		libX11-1.6.6
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 5fa131eac9d..25c4cec477f 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/10/04 21:58:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13.16.1 2018/09/10 07:14:59 spz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -678,6 +678,7 @@ man/man3/XkbGetKeyboard.3
 man/man3/XkbGetKeyboardByName.3
 man/man3/XkbGetMap.3
 man/man3/XkbGetNameChanges.3
+man/man3/XkbGetNamedDeviceIndicator.3
 man/man3/XkbGetNamedGeometry.3
 man/man3/XkbGetNamedIndicator.3
 man/man3/XkbGetNames.3
@@ -758,6 +759,7 @@ man/man3/XkbSetIgnoreLockMods.3
 man/man3/XkbSetIndicatorMap.3
 man/man3/XkbSetMap.3
 man/man3/XkbSetModActionVMods.3
+man/man3/XkbSetNamedDeviceIndicator.3
 man/man3/XkbSetNamedIndicator.3
 man/man3/XkbSetNames.3
 man/man3/XkbSetPtrActionX.3
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 422c0e7a8b0..28fafd935be 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.27 2017/02/27 09:09:50 wiz Exp $
+$NetBSD: distinfo,v 1.27.14.1 2018/09/10 07:14:59 spz Exp $
 
-SHA1 (libX11-1.6.5.tar.bz2) = c32155467508dfe783f9296ef22ee6ed53cae7df
-RMD160 (libX11-1.6.5.tar.bz2) = 2839f7f1510e5f7da5744a693c2a577d1390c84b
-SHA512 (libX11-1.6.5.tar.bz2) = 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0
-Size (libX11-1.6.5.tar.bz2) = 2361556 bytes
+SHA1 (libX11-1.6.6.tar.bz2) = b29cf4362b58188cb27fed2294788004af7428a9
+RMD160 (libX11-1.6.6.tar.bz2) = 9a770d0209c2e6ea77aa8e73e699772dc58d685e
+SHA512 (libX11-1.6.6.tar.bz2) = 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
+Size (libX11-1.6.6.tar.bz2) = 2342730 bytes
 SHA1 (patch-Makefile.in) = 93d3b8d9882babf70788e984884a9db46a5367ef
 SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
 SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e