Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -40,6 +40,44 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-06-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.1.0478. Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20240607. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to systemd-256. Fixes
+          <ulink url='&lfs-ticket-root;5504'>#5504</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to python3-3.12.4. Fixes
+          <ulink url='&lfs-ticket-root;5502'>#5502</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.40.0. Fixes
+          <ulink url='&lfs-ticket-root;5503'>#5503</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.3.1 (Security fix). Fixes
+          <ulink url='&lfs-ticket-root;5500'>#5500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.9.4. Fixes
+          <ulink url='&lfs-ticket-root;5491'>#5505</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to findutils-4.10.0. Fixes
+          <ulink url='&lfs-ticket-root;5499'>#5499</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-05-31</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -80,9 +80,9 @@
     <!--<listitem>
        <para>File-&file-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Findutils-&findutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Flex-&flex-version;</para>
     </listitem>-->
@@ -206,9 +206,9 @@
     <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Perl-&perl-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Pkgconf-&pkgconf-version;</para>
     </listitem>
@@ -236,9 +236,9 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>-->

chapter03/patches.xml

@@ -141,7 +141,7 @@
         <para>MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry revision="systemd">
       <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-patch-size;</token>:</term>
       <listitem>
@@ -149,6 +149,7 @@
         <para>MD5 sum: <literal>&systemd-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 <!--
     <varlistentry>
       <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>

chapter07/createfiles.xml

@@ -181,6 +181,10 @@ EOF</userinput></screen>
   unnamed ID.  But other distros may treat this ID differently, so any
   portable program should not depend on this assignment.</para>
 
+  <para>Some packages need a locale.</para>
+
+<screen><userinput>localedef -i C -f UTF-8 C.UTF-8</userinput></screen>
+
   <para>Some tests in <xref linkend="chapter-building-system"/> need a regular
   user. We add this user here and delete this account at the end of that
   chapter.</para>

chapter07/creatingdirs.xml

@@ -28,6 +28,7 @@
 mkdir -pv /lib/firmware
 mkdir -pv /media/{floppy,cdrom}
 mkdir -pv /usr/{,local/}{include,src}
+mkdir -pv /usr/lib/locale
 mkdir -pv /usr/local/{bin,lib,sbin}
 mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}

chapter08/glibc.xml

@@ -363,8 +363,7 @@ install -v -Dm644 ../nscd/nscd.service /usr/lib/systemd/system/nscd.service</use
     The following instructions will install the minimum set of
     locales necessary for the optimal coverage of tests:</para>
 
-<screen role="nodump"><userinput remap="locale-test">mkdir -pv /usr/lib/locale
+<screen role="nodump"><userinput remap="locale-test">localedef -i C -f UTF-8 C.UTF-8
-localedef -i C -f UTF-8 C.UTF-8
 localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
 localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro

chapter08/systemd.xml

@@ -48,26 +48,6 @@
  <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
- <para>Next, fix compatibility with API headers from linux-6.9 and later:</para>
-
- <screen><userinput remap="pre">sed -i '/DEVMEM_MAGIC 0/{n;n;a \
-/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ \
-#ifndef PID_FS_MAGIC \
-#define PID_FS_MAGIC 0x50494446 \
-#endif
-}' src/basic/missing_magic.h
-
-sed -i '/OVERLAYFS_SUPER_MAGIC/a \
-pidfs,           {PID_FS_MAGIC}' src/basic/filesystems-gperf.gperf</userinput></screen>
-
-    <!-- https://github.com/systemd/systemd/pull/30549 -->
-    <para>Now fix a security vulnerability in the DNSSEC verification of
-    <command>systemd-resolved</command> and a bug breaking running
-    <command>systemd-analyze verify</command> on an instantiated systemd
-    unit:</para>
-
-<screen><userinput remap='pre'>patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
-
     <para>Prepare systemd for compilation:</para>
 
 <screen><userinput remap="configure">mkdir -p build
@@ -244,10 +224,11 @@ meson setup \
 <screen><userinput remap="test">echo 'NAME="Linux From Scratch"' &gt; /etc/os-release
 ninja test</userinput></screen>
 
-    <!-- This test needs /run/systemd/inaccessible/sock, which only exists
+    <!-- test-namespace needs /run/systemd/inaccessible/sock, which only exists
          after initializing the system with systemd.  -->
-    <para>One test named <literal>systemd:core / test-namespace</literal>
+    <para>Three tests: <literal>systemd:core / test-namespace</literal>,
-    is known to fail in the LFS chroot environment.  Some other tests may
+    <literal>test-chase</literal>, and <literal>test-systemd-tmpfiles</literal>,
+    are known to fail in the LFS chroot environment.  Some other tests may
     fail because they depend on various kernel configuration options.</para>
 
     <para>Install the package:</para>

chapter08/udev.xml

@@ -55,18 +55,6 @@
 
  <screen><userinput remap="pre">sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in</userinput></screen>
 
- <para>Next, fix compatibility with API headers from linux-6.9 and later:</para>
-
- <screen><userinput remap="pre">sed -i '/DEVMEM_MAGIC 0/{n;n;a \
-/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ \
-#ifndef PID_FS_MAGIC \
-#define PID_FS_MAGIC 0x50494446 \
-#endif
-}' src/basic/missing_magic.h
-
-sed -i '/OVERLAYFS_SUPER_MAGIC/a \
-pidfs,           {PID_FS_MAGIC}' src/basic/filesystems-gperf.gperf</userinput></screen>
-
     <para>Adjust the hardcoded paths to network configuration files for the
     standalone udev installation:</para>
 

packages.ent

@@ -182,10 +182,10 @@
 <!ENTITY file-fin-du "17 MB">
 <!ENTITY file-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY findutils-version "4.9.0">
+<!ENTITY findutils-version "4.10.0">
-<!ENTITY findutils-size "1,999 KB">
+<!ENTITY findutils-size "2,189 KB">
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.xz">
-<!ENTITY findutils-md5 "4a4a547e888a944b2f3af31d789a1137">
+<!ENTITY findutils-md5 "870cfd71c07d37ebe56f9f4aaf4ad872">
 <!ENTITY findutils-home "&gnu-software;findutils/">
 <!ENTITY findutils-tmp-du "42 MB">
 <!ENTITY findutils-tmp-sbu "0.1 SBU">
@@ -230,7 +230,7 @@
 <!ENTITY gcc-fin-du "5.5 GB ">
 <!ENTITY gcc-fin-sbu "42 SBU (with tests)">
 <!ENTITY libquadmath-version "0.0.0">
-<!ENTITY libstdcpp-version   "6.0.32">
+<!ENTITY libstdcpp-version   "6.0.33">
 <!ENTITY libitm-version      "1.0.0">
 <!ENTITY libatomic-version   "1.2.0">
 
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20240502">
+<!ENTITY iana-etc-version "20240607">
 <!ENTITY iana-etc-size "590 KB">
 <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
-<!ENTITY iana-etc-md5 "73921d46a934eb5ac4286fc8111c2174">
+<!ENTITY iana-etc-md5 "924a0799dc0342ce82dc4fc95c0f1a1e">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.8 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@@ -441,12 +441,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "9">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "4">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "140,661 KB">
+<!ENTITY linux-size "140,683 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "1cedde7aa0f267c61897cead90a74788">
+<!ENTITY linux-md5 "b4d1dd34887178ad0b90973f779e238b">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
  allnoconfig + some configs we recommend for the users, rounded down to
@@ -554,10 +554,10 @@
 <!ENTITY ninja-fin-du "75 MB">
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "3.3.0">
+<!ENTITY openssl-version "3.3.1">
-<!ENTITY openssl-size "17,616 KB">
+<!ENTITY openssl-size "17,633 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "c8b063afbea85d867e161ecb8816cfa9">
+<!ENTITY openssl-md5 "8a4342b399c18f870ca6186299195984">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "805 MB">
 <!ENTITY openssl-fin-sbu "1.8 SBU">
@@ -573,13 +573,13 @@
 <!ENTITY patch-fin-sbu "0.1 SBU">
 
 <!ENTITY perl-version-major "5">
-<!ENTITY perl-version-minor "38">
+<!ENTITY perl-version-minor "40">
-<!ENTITY perl-version-patch "2">
+<!ENTITY perl-version-patch "0">
 <!ENTITY perl-version-min "&perl-version-major;.&perl-version-minor;">
 <!ENTITY perl-version "&perl-version-major;.&perl-version-minor;.&perl-version-patch;">
-<!ENTITY perl-size "13,359 KB">
+<!ENTITY perl-size "13,481 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "d3957d75042918a23ec0abac4a2b7e0a">
+<!ENTITY perl-md5 "cfe14ef0709b9687f9c514042e8e1e82">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-tmp-du "280 MB">
 <!ENTITY perl-tmp-sbu "0.6 SBU">
@@ -613,19 +613,19 @@
 <!-- If python minor version changes, updates in python and
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.12.3">
+<!ENTITY python-version "3.12.4">
 <!ENTITY python-minor "3.12">
-<!ENTITY python-size "20,142 KB">
+<!ENTITY python-size "20,176 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "8defb33f0c37aa4bdd3a38ba52abde4e">
+<!ENTITY python-md5 "d68f25193eec491eb54bc2ea664a05bd">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "598 MB">
 <!ENTITY python-tmp-sbu "0.5 SBU">
 <!ENTITY python-fin-du "485 MB">
 <!ENTITY python-fin-sbu "1.8 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "6025ee63c0ded34aac874f5da8f1a90c">
+<!ENTITY python-docs-md5 "cca155c92f53882cf45a69364315640d">
-<!ENTITY python-docs-size "8,110 KB">
+<!ENTITY python-docs-size "8,258 KB">
 
 <!ENTITY readline-version "8.2">
 <!ENTITY readline-soversion "8.2"><!-- used for stripping -->
@@ -670,20 +670,20 @@
 <!ENTITY sysklogd-fin-du "680 KB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "255">
+<!ENTITY systemd-version  "256">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "14,516 KB">
+<!ENTITY systemd-size     "15,274 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "521cda27409a9edf0370c128fae3e690">
+<!ENTITY systemd-md5      "4796b6eb1e23d809a1f11426d171b065">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "255">
+<!ENTITY systemd-man-version "256">
-<!ENTITY systemd-man-size "652 KB">
+<!ENTITY systemd-man-size "675 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
-<!ENTITY systemd-man-md5  "1ebe54d7a80f9abf8f2d14ddfeb2432d">
+<!ENTITY systemd-man-md5  "dc1b3a86479f50740f6591b4a1fb2c2a">
 <!ENTITY systemd-fin-du   "247 MB">
 <!ENTITY systemd-fin-sbu  "0.7 SBU">
 
@@ -753,10 +753,10 @@
 <!ENTITY util-linux-fin-du "313 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.1.0405">
+<!ENTITY vim-version "9.1.0478">
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim91">
-<!ENTITY vim-size "17,428 KB">
+<!ENTITY vim-size "17,508 KB">
 <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
 <!-- N.B. LFS 9.0 uses
      https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz
@@ -770,7 +770,7 @@
      example, https://github.com/vim/vim/tags?after=v8.1.1847 will show
      us v8.1.1846. -->
 <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-md5 "5379f5542310ee7ffbd6aea312407042">
+<!ENTITY vim-md5 "7d56919d58592c041ab61f45584e6f90">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "236 MB">
 <!ENTITY vim-fin-sbu "2.5 SBU">

patches.ent

@@ -37,7 +37,8 @@
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">
 <!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
-
+<!--
 <!ENTITY systemd-upstream-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
 <!ENTITY systemd-upstream-patch-md5 "8d9c1014445c463cf7c24c162b1e0686">
 <!ENTITY systemd-upstream-patch-size "7.2 KB">
+-->