Automatic merge of trunk into multilib

bootscripts/ChangeLog

@@ -1,3 +1,8 @@
+2023-10-04 Pierre Labastie <pierre.labastie@neuf.fr>
+   * After the changes done on 2022-03-24, several "halt stop" should
+     have been changed to "halt start". Done now. Fortunately, those
+     occur only when something wrong happens with disks or devices.
+
 2023-07-28 Xi Ruoyao <xry111@xry111.site>
    * In mountvirtfs, mount /sys/fs/cgroup for udev from systemd-254.
 
@@ -24,7 +29,7 @@
    * New semantics for K and S scripts:
      - S scripts only started if not already marked S in the previous runlevel
      - K scripts only started if not already marked K in the previous runlevel
-     - remove the convention of running S scripts ith "stop" in rl 0/6
+     - remove the convention of running S scripts with "stop" in rl 0/6
 2021-06-08 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * When shutting down the network, ignore invalid interfaces
      or interfaces that are not UP.

bootscripts/lfs/init.d/checkfs

@@ -63,7 +63,7 @@ case "${1}" in
 
          log_info_msg "Press Enter to continue..."
          wait_for_user
-         /etc/rc.d/init.d/halt stop
+         /etc/rc.d/init.d/halt start
       else
          log_success_msg2
       fi
@@ -127,7 +127,7 @@ case "${1}" in
 
          log_info_msg "Press Enter to continue..."
          wait_for_user
-         /etc/rc.d/init.d/halt stop
+         /etc/rc.d/init.d/halt start
       fi
 
       if [ "${error_value}" -ge 16 ]; then

bootscripts/lfs/init.d/udev

@@ -41,7 +41,7 @@ case "${1}" in
          log_info_msg "$msg"
          log_info_msg "Press Enter to continue..."
          wait_for_user
-         /etc/rc.d/init.d/halt stop
+         /etc/rc.d/init.d/halt start
       fi
 
       # Start the udev daemon to continually watch for, and act on,

chapter01/changelog.xml

@@ -40,6 +40,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-10-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update Glibc upstream fixes patch to fix
+          CVE-2023-4911.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-10-01</para>
       <itemizedlist>

patches.ent

@@ -14,8 +14,8 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
-<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-2.patch">
-<!ENTITY glibc-upstream-fixes-patch-md5 "a5a06adb7f61dcc901f35d810ac8a1c0">
+<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-3.patch">
+<!ENTITY glibc-upstream-fixes-patch-md5 "545977e0b5c341ba945cf4b5de92f1e2">
 <!ENTITY glibc-upstream-fixes-patch-size "28 KB">
 
 <!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">