From 7db37658c277cf4438f80d594d3e9df4ee32b3de Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 26 Apr 2024 19:59:29 +0800
Subject: [PATCH 1/2] chapter06/ncurses: Use ncurses-release instead of
 ncurses-version for library file names

Reported-by: Stefano Moretti <stemoretti@gmx.com>
Closes: https://lists.linuxfromscratch.org/sympa/arc/lfs-dev/2024-04/msg00051.html
---
 chapter06/ncurses.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 0a8c7e166..7f79b5129 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -137,9 +137,9 @@ popd</userinput></screen>
         <term><parameter>--enable-widec</parameter></term>
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
-          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+          class="libraryfile">libncursesw.so.&ncurses-release;</filename>)
           to be built instead of normal ones (e.g., <filename
-          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+          class="libraryfile">libncurses.so.&ncurses-release;</filename>).
           These wide-character libraries are usable in both multibyte and
           traditional 8-bit locales, while normal libraries work properly
           only in 8-bit locales. Wide-character and normal libraries are

From 6e179a90255308dc64eec386fb3ae49ab16acca4 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 27 Apr 2024 12:22:28 +0800
Subject: [PATCH 2/2] changingowner: Add --from lfs for chown root:root
 commands

So if the user has not set $LFS properly, chown will do nothing instead
of wreak havoc in the host distro.

--from <user> has been available for Coreutils chown since 2000 so we
don't need to raise the host system requirement.
---
 chapter07/changingowner.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter07/changingowner.xml b/chapter07/changingowner.xml
index 8f7b5519c..16c052b39 100644
--- a/chapter07/changingowner.xml
+++ b/chapter07/changingowner.xml
@@ -33,9 +33,9 @@
   user <systemitem class="username">root</systemitem> by running the following
   command:</para>
 
-<screen><userinput>chown -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
+<screen><userinput>chown --from lfs -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
-  x86_64) chown -R root:root $LFS/lib64 ;;
+  x86_64) chown --from lfs -R root:root $LFS/lib64 ;;
 esac</userinput></screen>
 
 </sect1>