From bd003a8a8c6bd262b5f00ebea8387ebc4cc2657b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 24 Feb 2024 13:15:49 +0800
Subject: [PATCH 1/3] glibc: Correctly mark revision='systemd' for a paragraph
 in update note

---
 chapter08/glibc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 10fccb3a9..486164cf9 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -258,7 +258,7 @@ esac</userinput></screen>
 
           <screen role='nodump'><userinput>rm -f /usr/sbin/nscd</userinput></screen>
 
-          <para>
+          <para revision='systemd'>
             If this system (prior to LFS 12.1, exclusive) is based on
             Systemd, it's also needed to disable and stop the
             <command>nscd</command> service now:

From 4aa6831f14175db6e3792cf84bb992fcfde832bd Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 24 Feb 2024 13:24:20 +0800
Subject: [PATCH 2/3] glibc: Don't "overwrite" libcrypt.so.1* when updating

As we've already concluded, overwriting a shared object can crash
running processes using code or data from this shared object.  For
example if gdm is crashed, we may leave the system unusable :(.
---
 chapter08/glibc.xml     | 2 +-
 chapter08/libxcrypt.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 486164cf9..49eeceb1c 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -240,7 +240,7 @@ esac</userinput></screen>
             <emphasis role='bold'>you MUST follow the note in Libxcrypt
             section to install
             <filename class='libraryfile'>libcrypt.so.1*</filename>
-            (overwritting
+            (replacing
             <filename class='libraryfile'>libcrypt.so.1</filename> from the
             prior Glibc installation)</emphasis>.
           </para>
diff --git a/chapter08/libxcrypt.xml b/chapter08/libxcrypt.xml
index 7c6cc15ba..fb4c4adaa 100644
--- a/chapter08/libxcrypt.xml
+++ b/chapter08/libxcrypt.xml
@@ -110,7 +110,7 @@
             --disable-static             \
             --disable-failure-tokens
 make
-cp -av .libs/libcrypt.so.1* /usr/lib</userinput></screen>
+cp -av --remove-destination .libs/libcrypt.so.1* /usr/lib</userinput></screen>
     </note>
 
   </sect2>

From 64be5a4bfa0cde2defacc744d2f137edbea64c12 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 25 Feb 2024 00:53:31 +0800
Subject: [PATCH 3/3] dependencies: Gettext may use system libunistring

When system libunistring is not installed (for eg building LFS), a
shipped copy of libunistring is used.
---
 appendices/dependencies.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 2fb197ffa..d3fd94707 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1047,7 +1047,15 @@
       <segmentedlist id="gettext-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg><ulink url='&blfs-book;general/libxml2.html'>libxml2</ulink></seg>
+          <seg>
+            <ulink url='&blfs-book;general/libunistring.html'>
+              libunistring
+            </ulink>
+            and
+            <ulink url='&blfs-book;general/libxml2.html'>
+              libxml2
+            </ulink>
+          </seg>
         </seglistitem>
       </segmentedlist>