Changeset 1d69418

Timestamp:

04/15/2022 07:01:35 PM (2 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

03cd145, 7a0687c, b826273

Parents:

75bab32

Message:

Patch xz for the xzgrep vulnerability.

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (1 diff)
• chapter08/xz.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -45 +45 @@
       <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>

chapter01/whatsnew.xml

@@ -282 +282 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <listitem>
+      <para>&xz-upstream-fix-patch;</para>
+    </listitem>
+    <listitem>
       <para>&zstd-upstream-fixes-patch;</para>
     </listitem>

chapter03/patches.xml

@@ -152 +152 @@
 
     <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>

chapter08/xz.xml

@@ -44 +44 @@
   <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>

patches.ent

@@ -94 +94 @@
 <!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">