Pullup ticket #5852 - requested by maya

x11/modular-xorg-server: security update

Revisions pulled up:
- x11/modular-xorg-server/Makefile.common                       1.25-1.26
- x11/modular-xorg-server/distinfo                              1.90-1.91

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Oct 18 18:12:38 UTC 2018

   Modified Files:
           pkgsrc/x11/modular-xorg-server: Makefile.common distinfo

   Log Message:
   modular-xorg-server: update to 1.20.2.

   Lots of bugfixes all over the map. Thanks to all for testing and
   patches!

   Adam Jackson (8):
         modesetting: Lie less in the man page
         modesetting: Document Option "DoubleShadow" in the man page
         xfree86: Fix Option "MaxClients" validation
         modesetting: Don't free(dst) in drmmode_prop_info_copy
         glamor_egl: Don't initialize on llvmpipe
         glamor/egl: Avoid crashing on broken configurations
         fbdevhw: Refuse to touch PCI devices on the fallback probe path
         xserver 1.20.2

   Alex Goins (1):
         randr: rrCheckPixmapBounding should only increase screen size

   Alexander Volkov (1):
         os/xdmcp: Don't create a new socket in XdmcpReset()

   Cedric Roux (1):
         miext/damage: take care of the coordinate mode in damagePolyPoint

   Dave Airlie (9):
         shm: move shmsize verify before allocating the drawable.
         xi: free modifiers_failed on error path. (v2)
         fboverlay: move bpp checks above malloc
         glamor: fix leak of fs_getcolor_source.
         modesetting: get pEnt after error checks
         posix_tty: free leak of xf86SetStrOption return value.
         xkb: fix what looks to be a copy-paste error with first vs firstMM
         mibltblt: free prgnSrcClip on error path.
         devices: break after finding and removing device from lists

   Jim Qu (1):
         modesetting: code refactor for PRIME sync

   Lionel Landwerlin (2):
         present: fix freed pointer access
         xwayland: fix access to invalid pointer

   Olivier Fourdan (3):
         glx: check for indirect context in CreateContextAttribsARB()
         xwayland: Remove xwl_present_window from privates on cleanup
         xwayland: Use `double` for `xwl_tablet_tool`

   Peter Hutterer (1):
         dix: check_modmap_change() returns Success, not true

   Pierre Ossman (1):
         Switch automatic composite update to WorkQueue

   Scott Anderson (1):
         xwayland: use wayland axis_discrete event


   To generate a diff of this commit:
   cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/modular-xorg-server/Makefile.common
   cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/modular-xorg-server/distinfo

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Thu Oct 25 22:40:57 UTC 2018

   Modified Files:
           pkgsrc/x11/modular-xorg-server: Makefile.common distinfo

   Log Message:
   modular-xorg-server: update to 1.20.3, security fix.

   Matthieu Herrb (2):
         Disable -logfile and -modulepath when running with elevated privileges
         LogFilePrep: add a comment to the unsafe format string.

   Peter Hutterer (1):
         xfree86: fix readlink call


   To generate a diff of this commit:
   cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/modular-xorg-server/Makefile.common
   cvs rdiff -u -r1.90 -r1.91 pkgsrc/x11/modular-xorg-server/distinfo

2 files changed, 7 insertions, 7 deletions

diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index 86df1dd02ed..a5bb494d9fc 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2018/08/14 09:35:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24.2.1 2018/10/26 07:00:32 spz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=	1.20.1
+XORG_VERSION=	1.20.3
 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 eed2b2c7081..68f3ed4d532 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.89 2018/08/14 09:35:36 wiz Exp $
+$NetBSD: distinfo,v 1.89.2.1 2018/10/26 07:00:32 spz Exp $
 
-SHA1 (xorg-server-1.20.1.tar.bz2) = fd43367c2b7bbb1a4b1dd90b06a021e68a9db240
-RMD160 (xorg-server-1.20.1.tar.bz2) = 2a8e2e5594ecc2d4d98597901e26f52eaaa9031c
-SHA512 (xorg-server-1.20.1.tar.bz2) = ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
-Size (xorg-server-1.20.1.tar.bz2) = 6103772 bytes
+SHA1 (xorg-server-1.20.3.tar.bz2) = a522cd543606b4d0509d821b8061904951171c50
+RMD160 (xorg-server-1.20.3.tar.bz2) = a57a7e3d0d2e3c84f4743de6890c7d26b502e7a1
+SHA512 (xorg-server-1.20.3.tar.bz2) = ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
+Size (xorg-server-1.20.3.tar.bz2) = 6205000 bytes
 SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
 SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92