Update to xorg-server 1.20.10

8 files changed, 21 insertions, 113 deletions

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index b4954cc..c085bf7 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
 COMMENT =	the X.Org X server
 
-DISTNAME =	xorg-server-1.20.8
+DISTNAME =	xorg-server-1.20.10
 REVISION =	0
 CATEGORIES =	x11
 
diff --git a/x11/xorg-server/distinfo b/x11/xorg-server/distinfo
index dd0a9dd..c014f9b 100644
--- a/x11/xorg-server/distinfo
+++ b/x11/xorg-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg-server-1.20.8.tar.gz) = Hh+SRTAcs7fonLOseumsUT42KWP66S0hU3YuOpV1jws=
-SIZE (xorg-server-1.20.8.tar.gz) = 8681844
+SHA256 (xorg-server-1.20.10.tar.gz) = AvIZhgi2GRt/jGUVi9RhNzTsHFw9Z4TFF39Btc0tMKM=
+SIZE (xorg-server-1.20.10.tar.gz) = 8700722
diff --git a/x11/xorg-server/patches/patch-configure_ac b/x11/xorg-server/patches/patch-configure_ac
index a107d8f..37aa17d 100644
--- a/x11/xorg-server/patches/patch-configure_ac
+++ b/x11/xorg-server/patches/patch-configure_ac
@@ -111,7 +111,7 @@ Index: configure.ac
  if test "x$CONFIG_UDEV" = xyes && test "x$CONFIG_HAL" = xyes; then
  	AC_MSG_ERROR([Hotplugging through both libudev and hal not allowed])
  fi
-@@ -1269,6 +1310,15 @@ if test "x$PRESENT" = xyes; then
+@@ -1274,6 +1315,15 @@ if test "x$PRESENT" = xyes; then
  	PRESENT_LIB='$(top_builddir)/present/libpresent.la'
  fi
  
@@ -127,7 +127,7 @@ Index: configure.ac
  AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
  if test "x$XINERAMA" = xyes; then
  	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
-@@ -1668,6 +1718,18 @@ AC_SUBST([UTILS_SYS_LIBS])
+@@ -1673,6 +1723,18 @@ AC_SUBST([UTILS_SYS_LIBS])
  # Some platforms require extra flags to do this.   libtool should set the
  # necessary flags for each platform when -export-dynamic is passed to it.
  LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
@@ -146,7 +146,7 @@ Index: configure.ac
  LD_NO_UNDEFINED_FLAG=
  XORG_DRIVER_LIBS=
  case "$host_os" in
-@@ -1839,7 +1901,14 @@ if test "x$XORG" = xyes; then
+@@ -1844,7 +1906,14 @@ if test "x$XORG" = xyes; then
  		esac
  		case $host_cpu in
  		  sparc*)
diff --git a/x11/xorg-server/patches/patch-dix_pixmap_c b/x11/xorg-server/patches/patch-dix_pixmap_c
deleted file mode 100644
index 69fa891..0000000
--- a/x11/xorg-server/patches/patch-dix_pixmap_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD$
-
-Patch for CVE-2020-14347
-
-Index: dix/pixmap.c
---- dix/pixmap.c.orig
-+++ dix/pixmap.c
-@@ -117,7 +117,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
-     if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
-         return NullPixmap;
- 
--    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
-+    pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
-     if (!pPixmap)
-         return NullPixmap;
- 
diff --git a/x11/xorg-server/patches/patch-glamor_glamor_egl_c b/x11/xorg-server/patches/patch-glamor_glamor_egl_c
index 0c94687..2e39283 100644
--- a/x11/xorg-server/patches/patch-glamor_glamor_egl_c
+++ b/x11/xorg-server/patches/patch-glamor_glamor_egl_c
@@ -5,7 +5,7 @@ privsep support
 Index: glamor/glamor_egl.c
 --- glamor/glamor_egl.c.orig
 +++ glamor/glamor_egl.c
-@@ -786,7 +786,11 @@ glamor_dri3_open_client(ClientPtr client,
+@@ -789,7 +789,11 @@ glamor_dri3_open_client(ClientPtr client,
      int fd;
      drm_magic_t magic;
  
diff --git a/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_driver_c b/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_driver_c
index 6660883..43f3e4d 100644
--- a/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_driver_c
+++ b/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_driver_c
@@ -5,7 +5,7 @@ privsep support
 Index: hw/xfree86/drivers/modesetting/driver.c
 --- hw/xfree86/drivers/modesetting/driver.c.orig
 +++ hw/xfree86/drivers/modesetting/driver.c
-@@ -62,6 +62,12 @@
+@@ -63,6 +63,12 @@
  
  #include "driver.h"
  
@@ -18,7 +18,7 @@ Index: hw/xfree86/drivers/modesetting/driver.c
  static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y);
  static Bool CloseScreen(ScreenPtr pScreen);
  static Bool EnterVT(ScrnInfoPtr pScrn);
-@@ -215,12 +221,12 @@ open_hw(const char *dev)
+@@ -216,12 +222,12 @@ open_hw(const char *dev)
          return fd;
  
      if (dev)
diff --git a/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_drmmode_display_c b/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_drmmode_display_c
index 7c28d4f..d54c630 100644
--- a/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_drmmode_display_c
+++ b/x11/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_drmmode_display_c
@@ -14,99 +14,21 @@ Index: hw/xfree86/drivers/modesetting/drmmode_display.c
 +#endif
  #include <unistd.h>
  #include "dumb_bo.h"
- #include "xf86str.h"
-@@ -2598,6 +2601,8 @@ drmmode_property_ignore(drmModePropertyPtr prop)
-     return FALSE;
- }
- 
-+static Atom backlight_atom;
-+
- static void
- drmmode_output_create_resources(xf86OutputPtr output)
- {
-@@ -2717,6 +2722,9 @@ drmmode_output_create_resources(xf86OutputPtr output)
-             }
-         }
-     }
-+
-+    backlight_atom = MakeAtom(RR_PROPERTY_BACKLIGHT,
-+			      strlen(RR_PROPERTY_BACKLIGHT), FALSE);
- }
- 
- static Bool
-@@ -2776,7 +2784,48 @@ drmmode_output_set_property(xf86OutputPtr output, Atom
- static Bool
- drmmode_output_get_property(xf86OutputPtr output, Atom property)
- {
--    return TRUE;
-+    drmmode_output_private_ptr drmmode_output = output->driver_private;
-+    drmmode_ptr drmmode = drmmode_output->drmmode;
-+    drmModeObjectPropertiesPtr props;
-+    int i;
-+
-+    if (property != backlight_atom)
-+	return TRUE;
-+
-+    props = drmModeObjectGetProperties(drmmode->fd, drmmode_output->output_id,
-+				       DRM_MODE_OBJECT_CONNECTOR);
-+    if (!props)
-+	return FALSE;
-+
-+    for (i = 0; i < drmmode_output->num_props; i++) {
-+	drmmode_prop_ptr p = &drmmode_output->props[i];
-+	int j;
-+
-+	if (p->atoms[0] != property)
-+	    continue;
-+
-+	for (j = 0; j < props->count_props; j++) {
-+	    if (props->props[j] == p->mode_prop->prop_id) {
-+		INT32 value;
-+		int err;
-+
-+		value = p->value = props->prop_values[j];
-+		err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
-+					     XA_INTEGER, 32, PropModeReplace, 1,
-+					     &value, FALSE, TRUE);
-+		if (err != 0) {
-+		    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+			       "RRChangeOutputProperty error, %d\n", err);
-+		}
-+
-+		drmModeFreeObjectProperties(props);
-+		return TRUE;
-+	    }
-+	}
-+    }
-+
-+    drmModeFreeObjectProperties(props);
-+    return FALSE;
- }
- 
- static const xf86OutputFuncsRec drmmode_output_funcs = {
-@@ -3606,7 +3655,7 @@ drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr 
-     return TRUE;
- }
+ #include "inputstr.h"
+@@ -3745,7 +3748,7 @@ out:
+ #undef DRM_MODE_LINK_STATUS_BAD
+ #undef DRM_MODE_LINK_STATUS_GOOD
  
 -#ifdef CONFIG_UDEV_KMS
 +#if defined(CONFIG_UDEV_KMS) || defined(CONFIG_KEVENT_KMS)
  
- #define DRM_MODE_LINK_STATUS_GOOD       0
- #define DRM_MODE_LINK_STATUS_BAD        1
-@@ -3616,17 +3665,26 @@ drmmode_handle_uevents(int fd, void *closure)
- {
-     drmmode_ptr drmmode = closure;
-     ScrnInfoPtr scrn = drmmode->scrn;
-+#ifdef CONFIG_UDEV_KMS
+ static void
+ drmmode_handle_uevents(int fd, void *closure)
+@@ -3754,10 +3757,17 @@ drmmode_handle_uevents(int fd, void *closure)
      struct udev_device *dev;
-+#endif
-     drmModeResPtr mode_res;
-     xf86CrtcConfigPtr  config = XF86_CRTC_CONFIG_PTR(scrn);
-     int i, j;
      Bool found = FALSE;
-     Bool changed = FALSE;
  
-+#ifdef CONFIG_UDEV_KMS
++#ifdef CONFIG_UDEV_KMS    
      while ((dev = udev_monitor_receive_device(drmmode->uevent_monitor))) {
          udev_device_unref(dev);
          found = TRUE;
@@ -120,7 +42,7 @@ Index: hw/xfree86/drivers/modesetting/drmmode_display.c
      if (!found)
          return;
  
-@@ -3776,6 +3834,23 @@ drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmm
+@@ -3796,6 +3806,23 @@ drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmm
                                drmmode_handle_uevents, drmmode);
  
      drmmode->uevent_monitor = mon;
@@ -144,7 +66,7 @@ Index: hw/xfree86/drivers/modesetting/drmmode_display.c
  #endif
  }
  
-@@ -3790,6 +3865,14 @@ drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmm
+@@ -3810,6 +3837,14 @@ drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmm
  
          udev_monitor_unref(drmmode->uevent_monitor);
          udev_unref(u);
diff --git a/x11/xorg-server/pkg/PLIST b/x11/xorg-server/pkg/PLIST
index e64214c..adda9ff 100644
--- a/x11/xorg-server/pkg/PLIST
+++ b/x11/xorg-server/pkg/PLIST
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v$
 bin/X
+@bin bin/Xephyr
 @bin bin/Xnest
 @bin bin/Xorg
 @bin bin/Xvfb
@@ -208,6 +209,7 @@ lib/modules/libwfb.la
 lib/pkgconfig/xorg-server.pc
 lib/xorg/
 lib/xorg/protocol.txt
+@man man/man1/Xephyr.1
 @man man/man1/Xnest.1
 @man man/man1/Xorg.1
 @man man/man1/Xserver.1