From 1d694184b375b493c2926f291e4a696882db78ae Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Fri, 15 Apr 2022 20:01:35 +0100
Subject: [PATCH] Patch xz for the xzgrep vulnerability.

---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 3 +++
 chapter03/patches.xml   | 8 ++++++++
 chapter08/xz.xml        | 4 ++++
 patches.ent             | 4 ++++
 5 files changed, 23 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b1152d3db..6b2244bdd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,10 @@
     <listitem>
       <para>2022-04-15</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch Xz for a security fix.  Fixes
+          <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to libcap-2.64.  Fixes
           <ulink url="&lfs-ticket-root;5044">#5044</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 4c4e239f9..8acd99833 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -280,6 +280,9 @@
   <itemizedlist>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
+    <listitem>
+      <para>&xz-upstream-fix-patch;</para>
+    </listitem>
     <listitem>
       <para>&zstd-upstream-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 0e22d26c0..83ada1927 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -150,6 +150,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&xz-upstream-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/xz.xml b/chapter08/xz.xml
index e4c43131c..bf108ad34 100644
--- a/chapter08/xz.xml
+++ b/chapter08/xz.xml
@@ -44,6 +44,10 @@
   <sect2 role="installation">
     <title>Installation of Xz</title>
 
+    <para>Apply a patch to fix an issue in xzgrep:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&xz-upstream-fix-patch;</userinput></screen>
+
     <para>Prepare Xz for compilation with:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
diff --git a/patches.ent b/patches.ent
index 8f4f0d188..dbbfdc2a6 100644
--- a/patches.ent
+++ b/patches.ent
@@ -93,6 +93,10 @@
 <!ENTITY systemd-kernel-fixes-patch-md5 "34cee987b35d5d522fd3317e08057c1d">
 <!ENTITY systemd-kernel-fixes-patch-size "2.7 KB">
 
+<!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
+<!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">
+<!ENTITY xz-upstream-fix-patch-size "3.7 KB">
+
 <!ENTITY zstd-upstream-fixes-patch "zstd-&zstd-version;-upstream_fixes-1.patch">
 <!ENTITY zstd-upstream-fixes-patch-md5 "a7e576e3f87415fdf388392b257cdcf3">
 <!ENTITY zstd-upstream-fixes-patch-size "4 KB">