Changeset a494cc5

Timestamp:

10/04/2023 10:30:10 PM (11 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

5a33506

Parents:

cf9ba3c (diff), 623081a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• bootscripts/ChangeLog (modified) (2 diffs)
• bootscripts/lfs/init.d/checkfs (modified) (2 diffs)
• bootscripts/lfs/init.d/udev (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+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.
@@ -25 +30 @@
      - 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

bootscripts/lfs/init.d/checkfs

@@ -64 +64 @@
          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
@@ -128 +128 @@
          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
 

bootscripts/lfs/init.d/udev

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

chapter01/changelog.xml

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

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