Update to 1.17.2:

This picks up a pile of fixes from master.  Notable highlights:

- Fix for CVE-2015-3164 in Xwayland
- Fix int10 setup for vesa
- Fix regression in server-interpreted auth
- Fix fb setup on big-endian CPUs
- Build fix for for gcc5

Complete changelog:

Aaron Plattner (2):
      xfree86: Fix xf86_check_platform_slot's handling of PCI
      xfree86: Add GPU screens even if there are no active GDevs

Adam Jackson (1):
      xserver 1.17.2

Adel Gadllah (1):
      modesetting: Fix software cursor fallback

Alan Coopersmith (2):
      Clear ListenTransConns entries in CloseWellKnownConnections
      Accept x86_64 as well as i*86 for $host_cpu in Solaris on x86

Brent Collins (1):
      shm: Fix xselinux resource initialization for xinerama pixmaps

Chris Wilson (2):
      shm: Fix use-after-free in ShmDestroyPixmap
      present: Copy unflip contents back to the Screen Pixmap

Colin Harrison (2):
      os/xdmcp.c: Include Xtrans.h when building for WIN32
      os/utils.c: Don't try to build os_move_fd() for WIN32

Dave Airlie (2):
      os/access: fix regression in server interpreted auth
      glamor: don't do render ops with matching source/dest (v2)

Dima Ryazanov (1):
      xwayland: Implement smooth scrolling

Egbert Eich (6):
      symbols: Fix sdksyms.sh to cope with gcc5
      Xephyr: Don't crash when no command line argument is specified
      Xephyr: Print default server display number if none is specified
      Xephyr: Fix compile when debugging is enabled
      Xephyr: Fix screen image draw for the non-Glamor & non-XHSM case
      Xephyr: Fix broken image when endianess of client machine and host-Xserver differ

Emil Velikov (2):
      randr: remove chatty error messages
      randr: use randr: prefix in ErrorF()

Hans de Goede (1):
      Re-enable non serverfd input devices immediately on vtenter

Jason Gerecke (2):
      xfree86: Return NULL from xf86CompatOutput if no compat_output is defined
      dix: Do not allow device transform to be set on valuatorless devices

Jon TURNEY (9):
      ephyr: Avoid a segfault with 'DISPLAY= Xephy -glamor'
      os: XDMCP options like -query etc. should imply -listen tcp
      os: Teach vpnprintf() how to handle "%*.*s"
      hw/xwin/glx: Refactor parsing of the <proto> XML element
      hw/xwin/glx: Improve code generator to deal with latest Khronos OpenGL registry XML
      hw/xwin: Report Cygwin version information in log
      glamor: Fix build when configured --enable-glamor --disable-xshmfence
      hw/xwin/winclipboard: Link xwinclip with -lpthread
      hw/xnest: Fix build for MinGW

Jonathan Gray (2):
      glamor: remove const from the return type of glamor_get_drawable_location()
      glamor: fix build when DRI3 is not defined

Jürg Billeter (1):
      int10: Fix error check for pci_device_map_legacy

Keith Packard (1):
      mi: Partial pie-slice filled arcs may need more space for spans

Maarten Lankhorst (4):
      glamor: only use (un)pack_subimage when available
      glamor: do not check for gl errors in glamor_build_program
      glamor: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER
      glamor: GL_TEXTURE_MAX_LEVEL is not available on GLES2

Michal Srb (1):
      Expose GetMaster to modules.

Michel Dänzer (2):
      Add AC_SYS_LARGEFILE defines to dix-config.h
      modesetting: Include dix-config.h from dumb_bo.c

Olivier Fourdan (4):
      ephyr: Fail if glamor is requested but not usable
      xwayland: Add dependency on glamor libs
      glamor: check max native ALU instructions
      dix: Fix image byte order on big endian hardware

Ray Strode (5):
      systemd-logind: filter out non-signal messages from message filter
      systemd-logind: don't second guess D-Bus default timeout
      xwayland: Enable access control on open sockets [CVE-2015-3164 1/3]
      os: support new implicit local user access mode [CVE-2015-3164 2/3]
      xwayland: default to local user if no xauth file given. [CVE-2015-3164 3/3]

Robert Ancell (1):
      xwayland: Fix error strings

Rui Matos (2):
      dix/events: Set currentTime to the given time stamp in NoticeTime
      xwayland: Throttle our cursor surface updates with a frame callback

Vicente Olivert Riera (1):
      backtrace.c: Fix word cast to a pointer

6 files changed, 14 insertions, 74 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 88ccd5f1d17..397ab811f25 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2015/06/27 18:46:35 sevan Exp $
+# $NetBSD: Makefile,v 1.96 2015/06/29 11:12:45 wiz Exp $
 
-DISTNAME=	xorg-server-1.17.1
+DISTNAME=	xorg-server-1.17.2
 PKGNAME=	modular-${DISTNAME}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 1fb42eb081d..0421896e8d8 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.59 2015/04/25 11:47:03 tnn Exp $
+$NetBSD: distinfo,v 1.60 2015/06/29 11:12:45 wiz Exp $
 
-SHA1 (xorg-server-1.17.1.tar.bz2) = 490118810a54e91c8814245c99d6285caf4985dd
-RMD160 (xorg-server-1.17.1.tar.bz2) = 425a3a1f60d68750812d8cb3a341f27a8ff2e1be
-Size (xorg-server-1.17.1.tar.bz2) = 5852385 bytes
-SHA1 (patch-configure) = 0dd7b81199a9b0d7b23eb938cdebfeaf0e961558
+SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
+RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
+Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
+SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
 SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8
 SHA1 (patch-hw_xfree86_common_compiler.h) = c6f2a1ec352e3577dcd46acc8c9c45d81a0c3964
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
-SHA1 (patch-hw_xfree86_int10_generic.c) = 46dd9ae14cd5a8ed362c398001c9e62eb1a09c33
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
 SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 499e536a1189b88bc17e3df44a9ae2397decdc8b
-SHA1 (patch-hw_xfree86_os-support_linux_int10_linux.c) = f553c1232e7af2ae239f6ed6dfca513a0baf1eab
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-include_servermd.h) = b23759e39717965c34652e5caff0870cc6a8f124
+SHA1 (patch-include_servermd.h) = 301a1cd902490b5512a430204e7a05eda8d9097f
diff --git a/x11/modular-xorg-server/patches/patch-configure b/x11/modular-xorg-server/patches/patch-configure
index 624e360e517..2704aeafbfa 100644
--- a/x11/modular-xorg-server/patches/patch-configure
+++ b/x11/modular-xorg-server/patches/patch-configure
@@ -1,6 +1,5 @@
-$NetBSD: patch-configure,v 1.2 2015/04/25 11:47:03 tnn Exp $
+$NetBSD: patch-configure,v 1.3 2015/06/29 11:12:45 wiz Exp $
 
-Allow x86_64 as a SunOS arch.
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
 
@@ -15,12 +14,3 @@ Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
  
  				SYS_LIBS=-lx86_64
  				;;
-@@ -28341,7 +28341,7 @@ fi
- 		  sparc*)
- 			SOLARIS_INOUT_ARCH="sparcv8plus"
- 			;;
--		  i*86)
-+		  i*86|x86_64)
- 			if test x$SOLARIS_64 = xyes ; then
- 				SOLARIS_INOUT_ARCH="amd64"
- 			else
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c
deleted file mode 100644
index a4f5ad9fe39..00000000000
--- a/x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-hw_xfree86_int10_generic.c,v 1.1 2015/04/25 11:47:03 tnn Exp $
-
-From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Sat, 7 Feb 2015 18:13:21 +0100
-Subject: int10: Fix error check for pci_device_map_legacy
-
-pci_device_map_legacy returns 0 on success.
-
-Signed-off-by: Jürg Billeter <j@bitron.ch>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
---- hw/xfree86/int10/generic.c.orig	2014-09-18 22:53:19.000000000 +0000
-+++ hw/xfree86/int10/generic.c
-@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsig
- {
-     void *map;
- 
--    if (!pci_device_map_legacy(dev, 0, len, 0, &map))
-+    if (pci_device_map_legacy(dev, 0, len, 0, &map))
-         return FALSE;
- 
-     memcpy(buf, map, len);
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c
deleted file mode 100644
index ab9b9c38b0d..00000000000
--- a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-hw_xfree86_os-support_linux_int10_linux.c,v 1.1 2015/04/25 11:47:03 tnn Exp $
-
-From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Sat, 7 Feb 2015 18:13:21 +0100
-Subject: int10: Fix error check for pci_device_map_legacy
-
-pci_device_map_legacy returns 0 on success.
-
-Signed-off-by: Jürg Billeter <j@bitron.ch>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
---- hw/xfree86/os-support/linux/int10/linux.c.orig	2014-09-18 22:53:19.000000000 +0000
-+++ hw/xfree86/os-support/linux/int10/linux.c
-@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsig
- {
-     void *map;
- 
--    if (!pci_device_map_legacy(dev, base, len, 0, &map))
-+    if (pci_device_map_legacy(dev, base, len, 0, &map))
-         return FALSE;
- 
-     memcpy(buf, map, len);
diff --git a/x11/modular-xorg-server/patches/patch-include_servermd.h b/x11/modular-xorg-server/patches/patch-include_servermd.h
index c99db521921..f113104686f 100644
--- a/x11/modular-xorg-server/patches/patch-include_servermd.h
+++ b/x11/modular-xorg-server/patches/patch-include_servermd.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-include_servermd.h,v 1.1 2015/04/25 11:47:03 tnn Exp $
+$NetBSD: patch-include_servermd.h,v 1.2 2015/06/29 11:12:45 wiz Exp $
 
 Try to fix broken X_BYTE_ORDER handling for big endian.
 Probably broken here:
 http://cgit.freedesktop.org/xorg/xserver/commit/?id=4302484ef2e67b2e05756c7ee0834dce938f1b44
 
---- include/servermd.h.orig	2015-01-17 23:42:52.000000000 +0000
+--- include/servermd.h.orig	2015-06-16 15:21:07.000000000 +0000
 +++ include/servermd.h
-@@ -52,10 +52,16 @@ SOFTWARE.
- #error xserver code must include dix-config.h before any other headers
- #endif
+@@ -54,10 +54,16 @@ SOFTWARE.
+ 
+ #include <X11/Xarch.h>		/* for X_LITTLE_ENDIAN/X_BIG_ENDIAN */
  
 -#if X_BYTE_ORDER == X_LITTLE_ENDIAN
 +#ifndef X_LITTLE_ENDIAN