Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

7 files changed, 32 insertions, 13 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cce1eb603..72cebc79e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,21 @@
     -->
 
     <listitem>
+      <para>2022-03-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Stop changing the owner of
+          <filename class='directory'>$LFS/source</filename> to
+          <systemitem class='username'>lfs</systemitem>. Fixes
+          <ulink url="&lfs-ticket-root;5018">#5018</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Add zstd-1.5.2 upstream fixes patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2022-03-02</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index fe9b3b278..e009291ca 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -280,14 +280,9 @@
   <itemizedlist>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
-    <!--
     <listitem>
-      <para>binutils-2.37-upstream_fix-1.patch</para>
+      <para>&zstd-upstream-fixes-patch;</para>
     </listitem>
-    <listitem>
-      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
-    </listitem>
-    -->
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1a6e52338..4b24fad1f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -141,6 +141,13 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&zstd-upstream-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index 49fb43466..535f20b02 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -85,12 +85,6 @@ case $(uname -m) in
   x86_64) chown -v lfs $LFS/lib64 ;;
 esac</userinput></screen>
 
-  <para>If a separate working directory was created as suggested, give
-  user <systemitem class="username">lfs</systemitem> ownership of this
-  directory:</para>
-
-<screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
-
   <note><para>In some host systems, the following command does not complete
   properly and suspends the login to the lfs user to the background.  If the
   prompt "lfs:~$" does not appear immediately, entering the
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 4c62a8d17..16bb5f99f 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -174,7 +174,7 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
     <systemitem class="username">root</systemitem> user and group:</para>
 
 <screen><userinput remap="install">chown -v -R root:root \
-    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput></screen>
+    /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include{,-fixed}</userinput></screen>
 
     <para>Create a symlink required by the <ulink
     url="https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink>
diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml
index 881aba286..cde0b9231 100644
--- a/chapter08/zstd.xml
+++ b/chapter08/zstd.xml
@@ -42,6 +42,10 @@
   <sect2 role="installation">
     <title>Installation of Zstd</title>
 
+    <para>Apply a patch to fix some issues identified by upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&zstd-upstream-fixes-patch;</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
diff --git a/patches.ent b/patches.ent
index cd2fb93e8..7e43f7e0a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -87,3 +87,7 @@
 <!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
 <!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
 <!ENTITY systemd-upstream-fixes-patch-size "20 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">