x11/xorg-server: update to version 21.1.4

4 files changed, 10 insertions, 10 deletions

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index ca7c971..5846bef 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.3
+DISTNAME =	xorg-server-21.1.4
 CATEGORIES =	x11
 
 HOMEPAGE =	https://gitlab.freedesktop.org/xorg/xserver
diff --git a/x11/xorg-server/distinfo b/x11/xorg-server/distinfo
index 9687fa9..d695ab9 100644
--- a/x11/xorg-server/distinfo
+++ b/x11/xorg-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg-server-21.1.3.tar.gz) = xSQDpmk1CS2oahgFL/3Lk6J2KhRpAfY8EmF0SnCLEuI=
-SIZE (xorg-server-21.1.3.tar.gz) = 8942053
+SHA256 (xorg-server-21.1.4.tar.gz) = y9Wh91iB6KNBgj5R5IkoGu4JEscCO07tFwsmsY9hfjY=
+SIZE (xorg-server-21.1.4.tar.gz) = 8990504
diff --git a/x11/xorg-server/patches/patch-os_connection_c b/x11/xorg-server/patches/patch-os_connection_c
index 4d0e3b0..369a741 100644
--- a/x11/xorg-server/patches/patch-os_connection_c
+++ b/x11/xorg-server/patches/patch-os_connection_c
@@ -3,7 +3,7 @@ privsep support
 Index: os/connection.c
 --- os/connection.c.orig
 +++ os/connection.c
-@@ -151,6 +151,9 @@ static int ListenTransCount;
+@@ -153,6 +153,9 @@ static int ListenTransCount;
  
  static void ErrorConnMax(XtransConnInfo /* trans_conn */ );
  
@@ -13,7 +13,7 @@ Index: os/connection.c
  static XtransConnInfo
  lookup_trans_conn(int fd)
  {
-@@ -189,7 +192,10 @@ InitParentProcess(void)
+@@ -191,7 +194,10 @@ InitParentProcess(void)
          RunFromSmartParent = TRUE;
      OsSignal(SIGUSR1, handler);
      ParentProcess = getppid();
@@ -24,7 +24,7 @@ Index: os/connection.c
  }
  
  void
-@@ -205,9 +211,13 @@ NotifyParentProcess(void)
+@@ -207,9 +213,13 @@ NotifyParentProcess(void)
          displayfd = -1;
      }
      if (RunFromSmartParent) {
@@ -41,7 +41,7 @@ Index: os/connection.c
      }
      if (RunFromSigStopParent)
          raise(SIGSTOP);
-@@ -677,6 +687,11 @@ EstablishNewConnections(int curconn, int ready, void *
+@@ -679,6 +689,11 @@ EstablishNewConnections(int curconn, int ready, void *
      if ((trans_conn = lookup_trans_conn(curconn)) == NULL)
          return;
  
@@ -53,7 +53,7 @@ Index: os/connection.c
      if ((new_trans_conn = _XSERVTransAccept(trans_conn, &status)) == NULL)
          return;
  
-@@ -687,7 +702,7 @@ EstablishNewConnections(int curconn, int ready, void *
+@@ -689,7 +704,7 @@ EstablishNewConnections(int curconn, int ready, void *
      if (trans_conn->flags & TRANS_NOXAUTH)
          new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;
  
@@ -62,7 +62,7 @@ Index: os/connection.c
          ErrorConnMax(new_trans_conn);
      }
      return;
-@@ -735,6 +750,8 @@ ConnMaxNotify(int fd, int events, void *data)
+@@ -737,6 +752,8 @@ ConnMaxNotify(int fd, int events, void *data)
      }
      RemoveNotifyFd(trans_conn->fd);
      _XSERVTransClose(trans_conn);
diff --git a/x11/xorg-server/patches/patch-os_utils_c b/x11/xorg-server/patches/patch-os_utils_c
index 7d3a367..9170213 100644
--- a/x11/xorg-server/patches/patch-os_utils_c
+++ b/x11/xorg-server/patches/patch-os_utils_c
@@ -29,7 +29,7 @@ Index: os/utils.c
  /* Force connections to close on SIGHUP from init */
  
  void
-@@ -720,7 +732,8 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -719,7 +731,8 @@ ProcessCommandLine(int argc, char *argv[])
              else
                  UseMsg();
          }