modular-xorg-server: update to 1.20.9.

Aaron Ma (1):
      xfree86: add drm modes on non-GTF panels

Adam Jackson (2):
      linux: Make platform device probe less fragile
      linux: Fix platform device PCI detection for complex bus topologies

Alan Coopersmith (2):
      Update URL's in man pages
      doc: Update URLs in Xserver-DTrace.xml

Alex Goins (1):
      randr: Check rrPrivKey in RRHasScanoutPixmap()

Hans de Goede (1):
      modesetting: Disable pageflipping when using a swcursor

Huacai Chen (1):
      linux: Fix platform device probe for DT-based PCI

Jose Maria Casanova Crespo (1):
      modesetting: Fix front_bo leak at drmmode_xf86crtc_resize on XRandR rotation

Lyude Paul (1):
      xwayland: Store xwl_tablet_pad in its own private key

Martin Weber (1):
      hw/xfree86: Avoid cursor use after free

Matt Turner (1):
      xserver 1.20.9

Matthieu Herrb (5):
      fix for ZDI-11426
      Correct bounds checking in XkbSetNames()
      Fix XIChangeHierarchy() integer underflow
      Fix XkbSelectEvents() integer underflow
      Fix XRecordRegisterClients() Integer underflow

Michel Dänzer (7):
      present/wnmd: Keep pixmap pointer in present_wnmd_clear_window_flip
      present/wnmd: Free flip_queue entries in present_wnmd_clear_window_flip
      xwayland: Always use xwl_present_free_event for freeing Present events
      xwayland: Free all remaining events in xwl_present_cleanup
      xwayland: Hold a pixmap reference in struct xwl_present_event
      xwayland: Propagate damage x1/y1 coordinates in xwl_present_flip
      xwayland: Handle NULL xwl_seat in xwl_seat_can_emulate_pointer_warp

Olivier Fourdan (4):
      xwayland: Fix infinite loop at startup
      xwayland: Clear private on device removal
      xwayland: Disable the MIT-SCREEN-SAVER extension when rootless
      xwayland: Use a fixed DPI value for core protocol

Roman Gilg (1):
      present: Check valid region in window mode flips

Samuel Thibault (1):
      dix: do not send focus event when grab actually does not change

Simon Ser (2):
      xwayland: import DMA-BUFs with GBM_BO_USE_RENDERING only
      xwayland: only use linux-dmabuf if format/modifier was advertised

SimonP (1):
      xwayland: Initialise values in xwlVidModeGetGamma()

Sjoerd Simons (1):
      xwayland: Fix crashes when there is no pointer

4 files changed, 8 insertions, 37 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index db3c39a0340..77f1a7d0057 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2020/07/31 16:50:57 maya Exp $
+# $NetBSD: Makefile,v 1.129 2020/08/26 10:28:39 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 8c371862a85..0f51a4aeeb7 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.36 2020/03/30 11:49:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.37 2020/08/26 10:28:39 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
 
-XORG_VERSION=	1.20.8
+XORG_VERSION=	1.20.9
 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 b28212e9ffe..a8e6ddd19b2 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.102 2020/07/31 16:50:57 maya Exp $
+$NetBSD: distinfo,v 1.103 2020/08/26 10:28:39 wiz Exp $
 
-SHA1 (xorg-server-1.20.8.tar.bz2) = 077d081f912faf11c87ea1c9d0e29490961b0cd4
-RMD160 (xorg-server-1.20.8.tar.bz2) = 74f2a5ab7b482d2aded54fd412e9c0d673f270ba
-SHA512 (xorg-server-1.20.8.tar.bz2) = ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
-Size (xorg-server-1.20.8.tar.bz2) = 6309640 bytes
+SHA1 (xorg-server-1.20.9.tar.bz2) = 4b70ac63fa864f0569712d634a61496d015c3b86
+RMD160 (xorg-server-1.20.9.tar.bz2) = 33a2370d1d9ce68774d0ac6fa803f2a4ce19b698
+SHA512 (xorg-server-1.20.9.tar.bz2) = d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6
+Size (xorg-server-1.20.9.tar.bz2) = 6302902 bytes
 SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8
-SHA1 (patch-dix_pixmap.c) = 92c9343f71ddc418c0f61e8138e0b209cefcb221
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 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-dix_pixmap.c b/x11/modular-xorg-server/patches/patch-dix_pixmap.c
deleted file mode 100644
index 8711a558c00..00000000000
--- a/x11/modular-xorg-server/patches/patch-dix_pixmap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-dix_pixmap.c,v 1.1 2020/07/31 16:50:57 maya Exp $
-
-From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@herrb.eu>
-Date: Sat, 25 Jul 2020 19:33:50 +0200
-Subject: [PATCH] fix for ZDI-11426
-
-Avoid leaking un-initalized memory to clients by zeroing the
-whole pixmap on initial allocation.
-
-This vulnerability was discovered by:
-Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
-
-Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
---- dix/pixmap.c.orig	2020-03-29 20:21:15.000000000 +0000
-+++ dix/pixmap.c
-@@ -117,7 +117,7 @@ AllocatePixmap(ScreenPtr pScreen, int pi
-     if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
-         return NullPixmap;
- 
--    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
-+    pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
-     if (!pPixmap)
-         return NullPixmap;
-