Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -40,6 +40,24 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2022-05-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to vim-8.2.5014 (security fixes).
+          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to ninja-1.11.0.  Fixes
+          <ulink url="&lfs-ticket-root;5062">#5062</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to systemd-251.  Fixes
+          <ulink url="&lfs-ticket-root;5064">#5064</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-05-16</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -194,9 +194,9 @@
     <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Ninja-&ninja-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Openssl-&openssl-version;</para>
     </listitem>
@@ -230,9 +230,9 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>
@@ -298,6 +298,12 @@
     <listitem>
       <para>perl-5.34.0-upstream_fixes-1.patch</para>
     </listitem>
+    <listitem>
+      <para>systemd-250-kernel_5.17_fixes-1.patch</para>
+    </listitem>
+    <listitem>
+      <para>systemd-250-upstream_fixes-1.patch</para>
+    </listitem>
 
   </itemizedlist>
 

chapter03/patches.xml

@@ -135,22 +135,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry revision="systemd">
-      <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-upstream-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-upstream-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry revision="systemd">
-      <term>Systemd Kernel Fixes Patch - <token>&systemd-kernel-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-kernel-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-kernel-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>
       <listitem>

chapter08/check.xml

@@ -92,7 +92,7 @@
       </varlistentry>
 
       <varlistentry id="libcheck">
-        <term><filename class="libraryfile">libcheck.{a,so}</filename></term>
+        <term><filename class="libraryfile">libcheck.so</filename></term>
         <listitem>
           <para>Contains functions that allow Check to be called from a test
           program</para>

chapter08/openssl.xml

@@ -81,12 +81,15 @@ make MANSUFFIX=ssl install</userinput></screen>
     <note>
       <para>
         You should update OpenSSL when a new version which fixes vulnerabilities
-        is announced. The releases run in series, with a letter for each release
+        is announced.  Since OpenSSL 3.0.0, the OpenSSL versioning scheme
-        after the initial release (e.g. 1.1.1, 1.1.1a, 1.1.1b, etc). Because LFS
+        follows the MAJOR.MINOR.PATCH format.  API/ABI compatibility
-        installs only the shared libraries, there is no need to recompile packages
+        are guaranteed for the same MAJOR version number.  Because LFS
-        which link to <filename class="libraryfile">libcrypto.so</filename> or
+        installs only the shared libraries, there is no need to recompile
+        packages which link to
+        <filename class="libraryfile">libcrypto.so</filename> or
         <filename class="libraryfile">libssl.so</filename>
-        <emphasis>when upgrading in the same series.</emphasis>
+        <emphasis>when upgrading to a version with MAJOR version number
+        unchanged</emphasis>.
       </para>
 
       <para>

chapter08/systemd.xml

@@ -40,16 +40,6 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
-    <para>First, apply a patch to fix a security vulnerability and regressions
-    with hostnames and idle units:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>Now, apply a patch to fix a problem with the linux kernel's headers in 
-    version 5.17 and later:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-kernel_5.17_fixes-1.patch</userinput></screen>
-
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
     <systemitem class="groupname">sgx</systemitem>, from the default udev
@@ -64,21 +54,18 @@
 cd       build
 
 meson --prefix=/usr                 \
-      --sysconfdir=/etc             \
-      --localstatedir=/var          \
       --buildtype=release           \
-      -Dblkid=true                  \
       -Ddefault-dnssec=no           \
       -Dfirstboot=false             \
       -Dinstall-tests=false         \
       -Dldconfig=false              \
       -Dsysusers=false              \
-      -Db_lto=false                 \
       -Drpmmacrosdir=no             \
       -Dhomed=false                 \
       -Duserdb=false                \
       -Dman=false                   \
       -Dmode=release                \
+      -Dpamconfdir=no               \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
 
@@ -173,6 +160,13 @@ meson --prefix=/usr                 \
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Dpamconfdir=no</parameter></term>
+        <listitem>
+          <para>Prevent the installation of a PAM configuration file not
+          functional on LFS.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
@@ -185,11 +179,9 @@ meson --prefix=/usr                 \
 
     <para>Install the man pages:</para>
 
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man</userinput></screen>
+    <!-- Please make sure systemd man pages tarball has a common leading
-
+         component in the path.  -->
-    <para>Remove a useless directory:</para>
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
-
-<screen><userinput remap="install">rm -rf /usr/lib/pam.d</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
     <command>systemd-journald</command>:</para>
@@ -200,6 +192,12 @@ meson --prefix=/usr                 \
 
 <screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
 
+    <para>Disable a service for upgrading binary distros.  It's useless for
+    a basic Linux system built from source, and it will report an error if
+    it's enabled but not configured:</para>
+
+<screen><userinput remap="adjust">systemctl disable systemd-sysupdate</userinput></screen>
+
 <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.
           If it causes any trouble, we can add this back and also copy it into BLFS -->
 <!--

chapter09/networkd.xml

@@ -27,6 +27,17 @@
     of a static <filename>/etc/resolv.conf</filename> file. Both services are
     enabled by default.</para>
 
+    <note>
+      <para>
+        If you will not use <command>systemd-networkd</command> for network
+        configuration (for example, when the system is not connected to
+        network, or you want to use another utility like NetworkManager
+        for network configuration), disable a service to prevent an error
+        message during boot:
+      </para>
+      <screen role='nodump'><userinput>systemctl disable systemd-networkd-wait-online</userinput></screen>
+    </note>
+
     <para>Configuration files for <command>systemd-networkd</command> (and
     <command>systemd-resolved</command>) can be placed in
     <filename class="directory">/usr/lib/systemd/network</filename>

packages.ent

@@ -533,10 +533,10 @@
 <!ENTITY ncurses-fin-du "45 MB">
 <!ENTITY ncurses-fin-sbu "0.4 SBU">
 
-<!ENTITY ninja-version "1.10.2">
+<!ENTITY ninja-version "1.11.0">
-<!ENTITY ninja-size "209 KB">
+<!ENTITY ninja-size "228 KB">
 <!ENTITY ninja-url "&github;/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
-<!ENTITY ninja-md5 "639f75bc2e3b19ab893eaf2c810d4eb4">
+<!ENTITY ninja-md5 "7d1a1a2f5cdc06795b3054df5c17d5ef">
 <!ENTITY ninja-home "https://ninja-build.org/">
 <!ENTITY ninja-fin-du "64 MB">
 <!ENTITY ninja-fin-sbu "0.2 SBU">
@@ -649,20 +649,20 @@
 <!ENTITY sysklogd-fin-du "0.6 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "250">
+<!ENTITY systemd-version  "251">
 <!--<!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     "10,856 KB">
+<!ENTITY systemd-size     "11,168 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      "8929beb037c587ada4ed201f19756fe2">
+<!ENTITY systemd-md5      "8090fcccc3a2ec20995e89d56fed61b1">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "250">
+<!ENTITY systemd-man-version "251">
 <!ENTITY systemd-man-size "596 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  "af3aca39abe4e990cb2a9ac63dcdf506">
+<!ENTITY systemd-man-md5  "87053ffef1cfb74e4fe28f627e12a2a4">
 <!ENTITY systemd-fin-du   "273 MB">
 <!ENTITY systemd-fin-sbu  "2.2 SBU">
 
@@ -729,13 +729,13 @@
 <!ENTITY util-linux-fin-du "261 MB">
 <!ENTITY util-linux-fin-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.4814">
+<!ENTITY vim-version "8.2.5014">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "10,486 KB">
+<!ENTITY vim-size "10,568 KB">
 <!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
 <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
-<!ENTITY vim-md5 "3ffc16fd72de90ab72f7d94dee30a806">
+<!ENTITY vim-md5 "5b27e59fa53b74611422af6fa4149957">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "206 MB">
 <!ENTITY vim-fin-sbu "2.4 SBU">

patches.ent

@@ -85,14 +85,6 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
-<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
-<!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
-<!ENTITY systemd-upstream-fixes-patch-size "20 KB">
-
-<!ENTITY systemd-kernel-fixes-patch "systemd-&systemd-version;-kernel_5.17_fixes-1.patch">
-<!ENTITY systemd-kernel-fixes-patch-md5 "34cee987b35d5d522fd3317e08057c1d">
-<!ENTITY systemd-kernel-fixes-patch-size "2.7 KB">
-
 <!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
 <!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">
 <!ENTITY xz-upstream-fix-patch-size "3.7 KB">