x11/xorg-server: update to 21.1.8

5 files changed, 17 insertions, 65 deletions

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 486b8c7..540ccda 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	the X.Org X server
 
-DISTNAME =	xorg-server-21.1.6
+DISTNAME =	xorg-server-21.1.8
 CATEGORIES =	x11
 
 HOMEPAGE =	https://gitlab.freedesktop.org/xorg/xserver
diff --git a/x11/xorg-server/distinfo b/x11/xorg-server/distinfo
index 790273e..815d691 100644
--- a/x11/xorg-server/distinfo
+++ b/x11/xorg-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg-server-21.1.6.tar.gz) = b5xzzMUOJzGtrBdnHI4zaHc4yM1Va0nsufQQznIXvhE=
-SIZE (xorg-server-21.1.6.tar.gz) = 8977302
+SHA256 (xorg-server-21.1.8.tar.gz) = 2EXR/uLtszy5TzG1Fw8m2Y7TH4U84toh2sp8YMj/Oq4=
+SIZE (xorg-server-21.1.8.tar.gz) = 8981767
diff --git a/x11/xorg-server/patches/patch-configure_ac b/x11/xorg-server/patches/patch-configure_ac
index e75ef8d..e4bb610 100644
--- a/x11/xorg-server/patches/patch-configure_ac
+++ b/x11/xorg-server/patches/patch-configure_ac
@@ -104,7 +104,7 @@ Index: configure.ac
  AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
  AC_ARG_ENABLE(config-wscons,  AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto])
  AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
-@@ -831,6 +874,10 @@ if test "x$WITH_SYSTEMD_DAEMON" = "xyes" -o "x$WITH_SY
+@@ -830,6 +873,10 @@ if test "x$WITH_SYSTEMD_DAEMON" = "xyes" -o "x$WITH_SY
  fi
  AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
  
@@ -115,7 +115,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
-@@ -1252,6 +1299,15 @@ if test "x$PRESENT" = xyes; then
+@@ -1251,6 +1298,15 @@ if test "x$PRESENT" = xyes; then
  	PRESENT_LIB='$(top_builddir)/present/libpresent.la'
  fi
  
@@ -131,7 +131,7 @@ Index: configure.ac
  AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
  if test "x$XINERAMA" = xyes; then
  	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
-@@ -1647,6 +1703,18 @@ AC_SUBST([UTILS_SYS_LIBS])
+@@ -1646,6 +1702,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"
@@ -150,7 +150,7 @@ Index: configure.ac
  LD_NO_UNDEFINED_FLAG=
  XORG_DRIVER_LIBS=
  case "$host_os" in
-@@ -1821,7 +1889,14 @@ if test "x$XORG" = xyes; then
+@@ -1820,7 +1888,14 @@ if test "x$XORG" = xyes; then
  		esac
  		case $host_cpu in
  		  sparc*)
diff --git a/x11/xorg-server/patches/patch-include_do-not-use-config_h_in b/x11/xorg-server/patches/patch-include_do-not-use-config_h_in
index 65aee0f..fc4b524 100644
--- a/x11/xorg-server/patches/patch-include_do-not-use-config_h_in
+++ b/x11/xorg-server/patches/patch-include_do-not-use-config_h_in
@@ -13,7 +13,7 @@ Index: include/do-not-use-config.h.in
  /* Use libudev for input hotplug */
  #undef CONFIG_UDEV
  
-@@ -449,7 +452,8 @@
+@@ -455,7 +458,8 @@
  /* Support os-specific local connections */
  #undef LOCALCONN
  
@@ -23,7 +23,7 @@ Index: include/do-not-use-config.h.in
  #undef LT_OBJDIR
  
  /* Support MIT-SHM extension */
-@@ -509,7 +513,7 @@
+@@ -515,7 +519,7 @@
  /* Default PCI text file ID path */
  #undef PCI_TXT_IDS_PATH
  
@@ -32,7 +32,7 @@ Index: include/do-not-use-config.h.in
  #undef PCVT_SUPPORT
  
  /* Support Present extension */
-@@ -771,6 +775,9 @@
+@@ -845,6 +849,9 @@
  
  /* byte order */
  #undef X_BYTE_ORDER
diff --git a/x11/xorg-server/patches/patch-os_access_c b/x11/xorg-server/patches/patch-os_access_c
index 24c69b1..878b376 100644
--- a/x11/xorg-server/patches/patch-os_access_c
+++ b/x11/xorg-server/patches/patch-os_access_c
@@ -9,63 +9,15 @@ Date:   Wed Aug 11 05:44:02 2021 +0000
 Index: os/access.c
 --- os/access.c.orig
 +++ os/access.c
-@@ -1167,15 +1167,19 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredR
-     XtransConnInfo ci;
-     LocalClientCredRec *lcc;
- 
--#ifdef HAVE_GETPEEREID
-+#if defined(SO_PEERCRED)
+@@ -1175,7 +1175,11 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredR
+     ucred_t *peercred = NULL;
+     const gid_t *gids;
+ #elif defined(SO_PEERCRED)
 +#ifndef __OpenBSD__
-+    struct ucred peercred;
+     struct ucred peercred;
 +#else
 +    struct sockpeercred peercred;
 +#endif
-+    socklen_t so_len = sizeof(peercred);
-+#elif defined(HAVE_GETPEEREID)
+     socklen_t so_len = sizeof(peercred);
+ #elif defined(HAVE_GETPEEREID)
      uid_t uid;
-     gid_t gid;
- #elif defined(HAVE_GETPEERUCRED)
-     ucred_t *peercred = NULL;
-     const gid_t *gids;
--#elif defined(SO_PEERCRED)
--    struct ucred peercred;
--    socklen_t so_len = sizeof(peercred);
- #endif
- 
-     if (client == NULL)
-@@ -1197,7 +1201,17 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredR
-     lcc = *lccp;
- 
-     fd = _XSERVTransGetConnectionNumber(ci);
--#ifdef HAVE_GETPEEREID
-+#if defined(SO_PEERCRED)
-+    if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &peercred, &so_len) == -1) {
-+        FreeLocalClientCreds(lcc);
-+        return -1;
-+    }
-+    lcc->euid = peercred.uid;
-+    lcc->egid = peercred.gid;
-+    lcc->pid = peercred.pid;
-+    lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET | LCC_PID_SET;
-+    return 0;
-+#elif defined(HAVE_GETPEEREID)
-     if (getpeereid(fd, &uid, &gid) == -1) {
-         FreeLocalClientCreds(lcc);
-         return -1;
-@@ -1243,16 +1257,6 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredR
-         lcc->nSuppGids = 0;
-     }
-     ucred_free(peercred);
--    return 0;
--#elif defined(SO_PEERCRED)
--    if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &peercred, &so_len) == -1) {
--        FreeLocalClientCreds(lcc);
--        return -1;
--    }
--    lcc->euid = peercred.uid;
--    lcc->egid = peercred.gid;
--    lcc->pid = peercred.pid;
--    lcc->fieldsSet = LCC_UID_SET | LCC_GID_SET | LCC_PID_SET;
-     return 0;
- #endif
- #else