modular-xorg-server: update to 1.19.4.

A collection of stability fixes from the development branch, including
two minor CVEs. Thanks to all who sent in patches!

Aaron Plattner (1):
      randr: Use RRTransformEqual in RRCrtcPendingTransform

Adam Jackson (11):
      parser: Fix crash when xf86nameCompare(s1 = x, s2 = NULL)
      xinerama: Implement graphics exposures for window->pixmap copies (v4)
      ephyr: Don't clobber bitsPerPixel when using glamor
      xephyr: Check for host XVideo support before trying to use it
      modesetting: Validate the atom for enum properties
      wayland: Sync drm.xml with Mesa
      os: Fix warning in LockServer
      xfree86: Silence a new glibc warning
      dmx: Silence an unused-result warning
      dmx: Remove some not-very-interesting debug prints
      xserver 1.19.4

Carlos Garnacho (5):
      xwayland: Allow pointer warp on root/None window
      xwayland: "Accept" confineTo on InputOnly windows
      xwayland: Update root window size when desktop size changes
      xwayland: Lock the pointer if it is confined and has no cursor
      Xi: Use WarpPointerProc hook on XI pointer warping implementation

Daniel Stone (1):
      modesetting: Set correct DRM event context version

Dawid Kurek (1):
      modesetting: Blacklist EVDI devices from PRIME sync

Eric Anholt (1):
      glamor: Fix dashed line rendering.

Jason Gerecke (1):
      xfree86: Fix interpretation of xf86WaitForInput timeout

Jon TURNEY (1):
      Move statically linked xorgxkb files from dixmods to a separate directory

Keith Packard (6):
      os: un-duplicate code to close client on write failure
      os: Mark client as ready to read when closing due to write failure [100863]
      dix: Remove clients from input and output ready queues after closing
      modesetting: Skip no-longer-present connectors when resetting BAD links
      xkb: Handle xkb formated string output safely (CVE-2017-13723)
      xf86-video-modesetting: Add ms_queue_vblank helper [v3]

Kenneth Graunke (1):
      dri2: Sync i965_pci_ids.h from Mesa.

Louis-Francis Ratté-Boulianne (1):
      present: Check the whole exec queue on event

Lyude (1):
      xwayland: Don't load extension list more than once

Martin Peres (1):
      modesetting: re-set the crtc's mode when link-status goes BAD

Michal Srb (7):
      Xi: Zero target buffer in SProcXSendExtensionEvent.
      dix: Disallow GenericEvent in SendEvent request.
      Xi: Verify all events in ProcXSendExtensionEvent.
      Xi: Do not try to swap GenericEvent.
      Xi: Test exact size of XIBarrierReleasePointer
      Xext/shm: Validate shmseg resource id (CVE-2017-13721)
      xkb: Escape non-printable characters correctly.

Michel Dänzer (5):
      xfree86/modes: Make colormap/gamma glue code work with RandR disabled
      os: Handle SIGABRT
      glamor: Store the actual EGL/GLX context pointer in lastGLContext
      glamor: Fix temporary pixmap coordinate offsets
      xfree86/modes: Use RRTransformEqual in xf86RandR12CrtcSet

Nick Sarnie (1):
      suid: Include sysmacros.h to fix build after glibc-2.25

Olivier Fourdan (9):
      glamor: Check for NULL pixmap in glamor_get_pixmap_texture()
      Xephyr: Check screen resources creation success
      glamor: glamor_set_destination_drawable() can fail
      glamor: Check glamor_set_destination_drawable() return value
      glamor: avoid a crash if texture allocation failed
      glamor: an FBO is not needed for Xv pixmaps
      xwayland: Fix a segfault with pointer locking
      glamor: handle NULL source picture
      glamor: Avoid overflow between box32 and box16 box

Peter Hutterer (2):
      test: fix compiler warning
      xfree86: up the path name size to 512 in xf86MatchDriverFromFiles

Rodrigo Vivi (1):
      dri2: Sync i965_pci_ids.h from Mesa.

Tobias Stoeckmann (2):
      record: Fix OOB access in ProcRecordUnregisterClients
      dmx: Fix null pointer dereference

6 files changed, 8 insertions, 126 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 444174df5e0..77bb2c01815 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2017/07/28 21:10:00 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2017/10/05 15:34:13 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Modular X11 server from modular X.org
diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index e16916f3216..1a92f4ebb80 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.17 2017/04/10 13:10:19 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.18 2017/10/05 15:34:13 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=	1.19.3
+XORG_VERSION=	1.19.4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 9380292717c..9283207f6c2 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.83 2017/07/28 21:10:00 wiz Exp $
+$NetBSD: distinfo,v 1.84 2017/10/05 15:34:13 wiz Exp $
 
-SHA1 (xorg-server-1.19.3.tar.bz2) = 77f580ffa22a8bbcc3536e74e19114e446417a9c
-RMD160 (xorg-server-1.19.3.tar.bz2) = afa8708054016d4fa3632bf1db0bc462731717b4
-SHA512 (xorg-server-1.19.3.tar.bz2) = b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669
-Size (xorg-server-1.19.3.tar.bz2) = 6050221 bytes
-SHA1 (patch-Xi_sendexev.c) = 46a165049d4b15c472736d3863aa4efad39418bc
+SHA1 (xorg-server-1.19.4.tar.bz2) = 7a47d5f927ea69681e279c6e5f5e8ff3a21c7152
+RMD160 (xorg-server-1.19.4.tar.bz2) = 140c2e2e2a95ecf5b24e237f6e7672a2e6b542e8
+SHA512 (xorg-server-1.19.4.tar.bz2) = ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b
+Size (xorg-server-1.19.4.tar.bz2) = 5962834 bytes
 SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
-SHA1 (patch-dix_events.c) = a7ede761198583f1d59c4def49db48725a46bd21
-SHA1 (patch-dix_swapreq.c) = 66643fbd396d0b4222ba4a3f09c4bbe3f0083a33
 SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
diff --git a/x11/modular-xorg-server/patches/patch-Xi_sendexev.c b/x11/modular-xorg-server/patches/patch-Xi_sendexev.c
deleted file mode 100644
index 385e5575949..00000000000
--- a/x11/modular-xorg-server/patches/patch-Xi_sendexev.c
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-Xi_sendexev.c,v 1.3 2017/07/28 21:10:00 wiz Exp $
-
-CVE-2017-10971 and CVE-2017-10972: apply fixes to the event loop from
-
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=ba336b24052122b136486961c82deac76bbde455
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=8caed4df36b1f802b4992edcfd282cbeeec35d9d
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=215f894965df5fb0bb45b107d84524e700d2073c
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=05442de962d3dc624f79fc1a00eca3ffc5489ced
-
---- Xi/sendexev.c.orig	2017-03-15 18:05:25.000000000 +0000
-+++ Xi/sendexev.c
-@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr clien
- {
-     CARD32 *p;
-     int i;
--    xEvent eventT;
-+    xEvent eventT = { .u.u.type = 0 };
-     xEvent *eventP;
-     EventSwapPtr proc;
- 
-@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr clien
- 
-     eventP = (xEvent *) &stuff[1];
-     for (i = 0; i < stuff->num_events; i++, eventP++) {
-+        if (eventP->u.u.type == GenericEvent) {
-+            client->errorValue = eventP->u.u.type;
-+            return BadValue;
-+        }
-+
-         proc = EventSwapVector[eventP->u.u.type & 0177];
--        if (proc == NotImplemented)     /* no swapping proc; invalid event type? */
-+        /* no swapping proc; invalid event type? */
-+        if (proc == NotImplemented) {
-+            client->errorValue = eventP->u.u.type;
-             return BadValue;
-+        }
-         (*proc) (eventP, &eventT);
-         *eventP = eventT;
-     }
-@@ -117,7 +125,7 @@ SProcXSendExtensionEvent(ClientPtr clien
- int
- ProcXSendExtensionEvent(ClientPtr client)
- {
--    int ret;
-+    int ret, i;
-     DeviceIntPtr dev;
-     xEvent *first;
-     XEventClass *list;
-@@ -141,10 +149,12 @@ ProcXSendExtensionEvent(ClientPtr client
-     /* The client's event type must be one defined by an extension. */
- 
-     first = ((xEvent *) &stuff[1]);
--    if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
--          (first->u.u.type < lastEvent))) {
--        client->errorValue = first->u.u.type;
--        return BadValue;
-+    for (i = 0; i < stuff->num_events; i++) {
-+        if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) &&
-+            (first[i].u.u.type < lastEvent))) {
-+            client->errorValue = first[i].u.u.type;
-+            return BadValue;
-+        }
-     }
- 
-     list = (XEventClass *) (first + stuff->num_events);
diff --git a/x11/modular-xorg-server/patches/patch-dix_events.c b/x11/modular-xorg-server/patches/patch-dix_events.c
deleted file mode 100644
index 5962da44551..00000000000
--- a/x11/modular-xorg-server/patches/patch-dix_events.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-dix_events.c,v 1.1 2017/07/28 21:10:00 wiz Exp $
-
-CVE-2017-10971 and CVE-2017-10972: apply fixes to the event loop from
-
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=ba336b24052122b136486961c82deac76bbde455
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=8caed4df36b1f802b4992edcfd282cbeeec35d9d
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=215f894965df5fb0bb45b107d84524e700d2073c
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=05442de962d3dc624f79fc1a00eca3ffc5489ced
-
---- dix/events.c.orig	2017-03-15 18:05:25.000000000 +0000
-+++ dix/events.c
-@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client)
-         client->errorValue = stuff->event.u.u.type;
-         return BadValue;
-     }
-+    /* Generic events can have variable size, but SendEvent request holds
-+       exactly 32B of event data. */
-+    if (stuff->event.u.u.type == GenericEvent) {
-+        client->errorValue = stuff->event.u.u.type;
-+        return BadValue;
-+    }
-     if (stuff->event.u.u.type == ClientMessage &&
-         stuff->event.u.u.detail != 8 &&
-         stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) {
diff --git a/x11/modular-xorg-server/patches/patch-dix_swapreq.c b/x11/modular-xorg-server/patches/patch-dix_swapreq.c
deleted file mode 100644
index 8c1a2efde5a..00000000000
--- a/x11/modular-xorg-server/patches/patch-dix_swapreq.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-dix_swapreq.c,v 1.1 2017/07/28 21:10:00 wiz Exp $
-
-CVE-2017-10971 and CVE-2017-10972: apply fixes to the event loop from
-
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=ba336b24052122b136486961c82deac76bbde455
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=8caed4df36b1f802b4992edcfd282cbeeec35d9d
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=215f894965df5fb0bb45b107d84524e700d2073c
-   https://cgit.freedesktop.org/xorg/xserver/commit/?id=05442de962d3dc624f79fc1a00eca3ffc5489ced
-
---- dix/swapreq.c.orig	2017-03-15 18:05:25.000000000 +0000
-+++ dix/swapreq.c
-@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client)
-     swapl(&stuff->destination);
-     swapl(&stuff->eventMask);
- 
-+    /* Generic events can have variable size, but SendEvent request holds
-+       exactly 32B of event data. */
-+    if (stuff->event.u.u.type == GenericEvent) {
-+        client->errorValue = stuff->event.u.u.type;
-+        return BadValue;
-+    }
-+
-     /* Swap event */
-     proc = EventSwapVector[stuff->event.u.u.type & 0177];
-     if (!proc || proc == NotImplemented)        /* no swapping proc; invalid event type? */