Thu Oct 5 15:34:13 2017 UTC ()
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


(wiz)
diff -r1.113 -r1.114 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.17 -r1.18 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.83 -r1.84 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.3 -r0 pkgsrc/x11/modular-xorg-server/patches/patch-Xi_sendexev.c
diff -r1.1 -r0 pkgsrc/x11/modular-xorg-server/patches/patch-dix_events.c
diff -r1.1 -r0 pkgsrc/x11/modular-xorg-server/patches/patch-dix_swapreq.c

cvs diff -r1.113 -r1.114 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2017/07/28 21:10:00 1.113
+++ pkgsrc/x11/modular-xorg-server/Makefile 2017/10/05 15:34:13 1.114
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.113 2017/07/28 21:10:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.114 2017/10/05 15:34:13 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 2 
6 5
7MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modular X11 server from modular X.org 7COMMENT= Modular X11 server from modular X.org
9 8
10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 9SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
11 10
12NOT_FOR_PLATFORM= Darwin-*-* 11NOT_FOR_PLATFORM= Darwin-*-*
13 12
14.include "Makefile.common" 13.include "Makefile.common"
15 14
16CONFIGURE_ARGS+= --enable-xorg 15CONFIGURE_ARGS+= --enable-xorg
17CONFIGURE_ARGS+= --disable-xephyr 16CONFIGURE_ARGS+= --disable-xephyr
18CONFIGURE_ARGS+= --disable-kdrive 17CONFIGURE_ARGS+= --disable-kdrive

cvs diff -r1.17 -r1.18 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2017/04/10 13:10:19 1.17
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2017/10/05 15:34:13 1.18
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.17 2017/04/10 13:10:19 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.18 2017/10/05 15:34:13 wiz Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4 4
5XORG_VERSION= 1.19.3 5XORG_VERSION= 1.19.4
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES+= c99 16USE_LANGUAGES+= c99
17 17
18PKGCONFIG_OVERRIDE+= xorg-server.pc.in 18PKGCONFIG_OVERRIDE+= xorg-server.pc.in

cvs diff -r1.83 -r1.84 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2017/07/28 21:10:00 1.83
+++ pkgsrc/x11/modular-xorg-server/distinfo 2017/10/05 15:34:13 1.84
@@ -1,21 +1,18 @@ @@ -1,21 +1,18 @@
1$NetBSD: distinfo,v 1.83 2017/07/28 21:10:00 wiz Exp $ 1$NetBSD: distinfo,v 1.84 2017/10/05 15:34:13 wiz Exp $
2 2
3SHA1 (xorg-server-1.19.3.tar.bz2) = 77f580ffa22a8bbcc3536e74e19114e446417a9c 3SHA1 (xorg-server-1.19.4.tar.bz2) = 7a47d5f927ea69681e279c6e5f5e8ff3a21c7152
4RMD160 (xorg-server-1.19.3.tar.bz2) = afa8708054016d4fa3632bf1db0bc462731717b4 4RMD160 (xorg-server-1.19.4.tar.bz2) = 140c2e2e2a95ecf5b24e237f6e7672a2e6b542e8
5SHA512 (xorg-server-1.19.3.tar.bz2) = b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 5SHA512 (xorg-server-1.19.4.tar.bz2) = ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b
6Size (xorg-server-1.19.3.tar.bz2) = 6050221 bytes 6Size (xorg-server-1.19.4.tar.bz2) = 5962834 bytes
7SHA1 (patch-Xi_sendexev.c) = 46a165049d4b15c472736d3863aa4efad39418bc 
8SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f 7SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
9SHA1 (patch-dix_events.c) = a7ede761198583f1d59c4def49db48725a46bd21 
10SHA1 (patch-dix_swapreq.c) = 66643fbd396d0b4222ba4a3f09c4bbe3f0083a33 
11SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd 8SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
12SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
13SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
14SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 11SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
15SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
16SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 13SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
17SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60 14SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
18SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e 15SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
19SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 16SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
20SHA1 (patch-hw_xfree86_sdksyms.sh) = c403149ad35ffb70ee44f70de94b4497b751c118 17SHA1 (patch-hw_xfree86_sdksyms.sh) = c403149ad35ffb70ee44f70de94b4497b751c118
21SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e 18SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e

File Deleted: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-Xi_sendexev.c

File Deleted: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-dix_events.c

File Deleted: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-dix_swapreq.c