CVS commit: [pkgsrc-2017Q3] pkgsrc/x11/modular-xorg-server

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun Oct 15 13:00:46 UTC 2017

Modified Files:
        pkgsrc/x11/modular-xorg-server [pkgsrc-2017Q3]: Makefile
            Makefile.common distinfo
Removed Files:
        pkgsrc/x11/modular-xorg-server/patches [pkgsrc-2017Q3]:
            patch-Xi_sendexev.c patch-dix_events.c patch-dix_swapreq.c

Log Message:
Pullup ticket #5576 - requested by taca
x11/modular-xorg-server: security update

Revisions pulled up:
- x11/modular-xorg-server/Makefile                              1.114
- x11/modular-xorg-server/Makefile.common                       1.18-1.19
- x11/modular-xorg-server/distinfo                              1.84-1.85
- x11/modular-xorg-server/patches/patch-Xi_sendexev.c           deleted
- x11/modular-xorg-server/patches/patch-dix_events.c            deleted
- x11/modular-xorg-server/patches/patch-dix_swapreq.c           deleted

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Thu Oct  5 15:34:13 UTC 2017

   Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile Makefile.common distinfo
   Removed Files:
        pkgsrc/x11/modular-xorg-server/patches: patch-Xi_sendexev.c
            patch-dix_events.c patch-dix_swapreq.c

   Log Message:
   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

   To generate a diff of this commit:
   cvs rdiff -u -r1.113 -r1.114 pkgsrc/x11/modular-xorg-server/Makefile
   cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/modular-xorg-server/Makefile.common
   cvs rdiff -u -r1.83 -r1.84 pkgsrc/x11/modular-xorg-server/distinfo
   cvs rdiff -u -r1.3 -r0 \
       pkgsrc/x11/modular-xorg-server/patches/patch-Xi_sendexev.c
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/x11/modular-xorg-server/patches/patch-dix_events.c \
       pkgsrc/x11/modular-xorg-server/patches/patch-dix_swapreq.c

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Thu Oct 12 23:29:58 UTC 2017

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

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

   One regression fix since 1.19.4 (mea culpa), and fixes for CVEs 2017-
   12176 through 2017-12187. C is a terrible language, please stop writing
   code in it.

   To generate a diff of this commit:
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/modular-xorg-server/Makefile.common
   cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/modular-xorg-server/distinfo


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.113.4.1 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.17 -r1.17.6.1 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.83 -r1.83.4.1 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/x11/modular-xorg-server/patches/patch-Xi_sendexev.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/modular-xorg-server/patches/patch-dix_events.c \
    pkgsrc/x11/modular-xorg-server/patches/patch-dix_swapreq.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.113 pkgsrc/x11/modular-xorg-server/Makefile:1.113.4.1
--- pkgsrc/x11/modular-xorg-server/Makefile:1.113       Fri Jul 28 21:10:00 2017
+++ pkgsrc/x11/modular-xorg-server/Makefile     Sun Oct 15 13:00:46 2017
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2017/07/28 21:10:00 wiz Exp $
+# $NetBSD: Makefile,v 1.113.4.1 2017/10/15 13:00:46 spz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org

Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.17 pkgsrc/x11/modular-xorg-server/Makefile.common:1.17.6.1
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.17 Mon Apr 10 13:10:19 2017
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Sun Oct 15 13:00:46 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.17 2017/04/10 13:10:19 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.17.6.1 2017/10/15 13:00:46 spz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-XORG_VERSION=  1.19.3
+XORG_VERSION=  1.19.5
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.83 pkgsrc/x11/modular-xorg-server/distinfo:1.83.4.1
--- pkgsrc/x11/modular-xorg-server/distinfo:1.83        Fri Jul 28 21:10:00 2017
+++ pkgsrc/x11/modular-xorg-server/distinfo     Sun Oct 15 13:00:46 2017
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.83 2017/07/28 21:10:00 wiz Exp $
+$NetBSD: distinfo,v 1.83.4.1 2017/10/15 13:00:46 spz 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.5.tar.bz2) = 307d3405f709f7e41966c850b37deefe7f83eb9b
+RMD160 (xorg-server-1.19.5.tar.bz2) = 7e6247003d5285e89c11d376b86ee7483271ba67
+SHA512 (xorg-server-1.19.5.tar.bz2) = 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
+Size (xorg-server-1.19.5.tar.bz2) = 5965044 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