From 0bfec527d3564723f516289a6626ac058b3048fc Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Wed, 13 Jul 2022 17:38:15 -0500
Subject: [PATCH] Two security updates:

Update to xorg-server-21.1.4
Update to Xwayland-22.1.3
---
 introduction/welcome/changelog.xml | 8 ++++++++
 packages.ent                       | 4 ++--
 x/installing/xorg-server.xml       | 8 +++++---
 x/installing/xwayland.xml          | 6 +++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 63a2576f24..f70e6fd3a5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
     <listitem>
       <para>July 13th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to Xwayland-22.1.3 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16780">#16780</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xorg-server-21.1.4 (Security Update).
+           Fixes <ulink url="&blfs-ticket-root;16779">#16779</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to node.js-16.16.0 (Security Update). Fixes
           <ulink url="&blfs-ticket-root;16750">#16750</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 439e360f57..f408fc54e6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -731,8 +731,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xbitmaps-version             "1.1.2">
 <!ENTITY xcursor-themes-version       "1.0.6">
 <!ENTITY xkeyboard-config-version     "2.36">
-<!ENTITY xorg-server-version          "21.1.3">
-<!ENTITY xwayland-version             "22.1.2">
+<!ENTITY xorg-server-version          "21.1.4">
+<!ENTITY xwayland-version             "22.1.3">
 <!ENTITY twm-version                  "1.0.12">
 <!ENTITY xterm-version                "372">
 <!ENTITY xclock-version               "1.1.1">
diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml
index c0d6baa522..4f3957435e 100644
--- a/x/installing/xorg-server.xml
+++ b/x/installing/xorg-server.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.xz">
-  <!ENTITY xorg-server-md5sum        "66687cf9d5cd1fdaa9bf78fc2a154437">
+  <!ENTITY xorg-server-md5sum        "1fee73752bc08a9d364d5e39f19f464f">
   <!ENTITY xorg-server-size          "4.7 MB">
-  <!ENTITY xorg-server-buildsize     "175 MB (with tests)">
-  <!ENTITY xorg-server-time          "0.3 SBU (using parallelism=4; with tests)">
+  <!ENTITY xorg-server-buildsize     "186 MB (with tests)">
+  <!ENTITY xorg-server-time          "0.5 SBU (using parallelism=4; with tests)">
 ]>
 
 <sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
@@ -133,11 +133,13 @@
 
 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>-->
 
+<!-- Not needed with 21.1.4
     <para>
       Fix an issue with gcc-12 and later:
     </para>
 
 <screen><userinput>sed -i '/(SourcePictPtr)/s/sizeof([^)]*)/sizeof(SourcePict)/' render/picture.c</userinput></screen>
+-->
 
     <para>
       Install the server by running the following commands:
diff --git a/x/installing/xwayland.xml b/x/installing/xwayland.xml
index 7ec858408e..4d41576b1f 100644
--- a/x/installing/xwayland.xml
+++ b/x/installing/xwayland.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xwayland-download-http "&xorg-download-http;/xserver/xwayland-&xwayland-version;.tar.xz">
   <!ENTITY xwayland-download-ftp  "&xorg-download-ftp;/xserver/xwayland-&xwayland-version;.tar.xz">
-  <!ENTITY xwayland-md5sum        "6019af045e3a34ce303c677d3fe98c07">
+  <!ENTITY xwayland-md5sum        "83849961283e8cea32be6740914822e5">
   <!ENTITY xwayland-size          "1.2 MB">
-  <!ENTITY xwayland-buildsize     "76 MB (add 355 MB for tests)">
-  <!ENTITY xwayland-time          "0.2 SBU (with paralellism=4; add 1.0 SBU for tests, not including clone time)">
+  <!ENTITY xwayland-buildsize     "65 MB (add 355 MB for tests)">
+  <!ENTITY xwayland-time          "0.3 SBU (with paralellism=4; add 1.0 SBU for tests, not including clone time)">
 ]>
 
 <sect1 id="xwayland" xreflabel="Xwayland-&xwayland-version;">