From 770e78952755c89d4a68d22e5245a97438ffa089 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 5 Mar 2023 10:06:48 +0800
Subject: [PATCH] Package updates

- Update to systemd-253
- Update to bc-6.3.1
- Update to linux-6.2.2
- Update to procps-ng-4.0.3
- Update to iproute2-6.2.0
- Update to meson-1.0.1
- Update to make-4.4.1
- Update to elfutils-0.189
---
 appendices/dependencies.xml |  5 ++--
 chapter01/changelog.xml     | 32 +++++++++++++++++++++
 chapter01/whatsnew.xml      | 38 ++++++++++++-------------
 chapter03/patches.xml       |  4 +--
 chapter06/make.xml          |  6 ----
 chapter08/make.xml          |  6 ----
 chapter08/systemd.xml       |  6 ----
 packages.ent                | 56 ++++++++++++++++++-------------------
 patches.ent                 |  4 +--
 9 files changed, 86 insertions(+), 71 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 697d0d1d7..e97588da3 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1685,7 +1685,7 @@
       <segmentedlist id="libelf-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, GCC, Glibc, and Make</seg>
+          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3282,7 +3282,8 @@
       <segmentedlist id="zstd-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>GCC <phrase revision='systemd'>and Systemd</phrase></seg>
+          <seg><phrase revision='sysv'>GCC and Libelf</phrase>
+          <phrase revision='systemd'>GCC, Libelf, and Systemd</phrase></seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9b388342a..97b342299 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,38 @@
     <listitem>
       <para>2023-03-04</para>
       <itemizedlist>
+        <listitem revision='systemd'>
+          <para>[xry111] - Update to systemd-253.  Fixes
+          <ulink url='&lfs-ticket-root;5206'>#5206</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.3.1.  Fixes
+          <ulink url='&lfs-ticket-root;5217'>#5217</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.2.2.  Fixes
+          <ulink url='&lfs-ticket-root;5218'>#5218</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to procps-ng-4.0.3.  Fixes
+          <ulink url='&lfs-ticket-root;5220'>#5220</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iproute2-6.2.0.  Fixes
+          <ulink url='&lfs-ticket-root;5221'>#5221</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to meson-1.0.1.  Fixes
+          <ulink url='&lfs-ticket-root;5222'>#5222</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to make-4.4.1.  Fixes
+          <ulink url='&lfs-ticket-root;5223'>#5223</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to libelf-0.189.  Fixes
+          <ulink url='&lfs-ticket-root;5224'>#5224</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Change to a better host requirements script in Chapter 2.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index fcd286f79..21722a863 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -49,9 +49,9 @@
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bc &bc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Binutils-&binutils-version;</para>
     </listitem>-->
@@ -139,9 +139,9 @@
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2-&iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="systemd">
       <para>Jinja2-&jinja2-version;</para>
     </listitem>-->
@@ -160,9 +160,9 @@
     <!--<listitem>
       <para>Libcap-&libcap-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Libffi-&libffi-version;</para>
     </listitem>-->
@@ -172,15 +172,15 @@
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Make-&make-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Man-DB-&man-db-version;</para>
     </listitem>-->
@@ -190,9 +190,9 @@
     <!--<listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Meson-&meson-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>-->
@@ -217,9 +217,9 @@
     <!--<listitem>
       <para>Pkg-config-&pkgconfig-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Procps-ng-&procps-ng-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Psmisc-&psmisc-version;</para>
     </listitem>-->
@@ -238,9 +238,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>-->
@@ -309,9 +309,9 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <!--<listitem>
-      <para>zstd-1.5.2-upstream_fixes-1.patch</para>
-    </listitem>-->
+    <listitem>
+      <para>systemd-252-security_fix-1.patch</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 44367898f..5f1bbf0c2 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -143,7 +143,7 @@
       </listitem>
     </varlistentry>
 
-
+<!--
     <varlistentry revision="systemd">
       <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
       <listitem>
@@ -151,7 +151,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>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 242aaebe1..cf0dbce18 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -42,12 +42,6 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para>First, fix an issue identified upstream:</para>
-
-<screen><userinput remap="pre">sed -e '/ifdef SIGPIPE/,+2 d' \
-    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \
-    -i src/main.c</userinput></screen>
-
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr   \
diff --git a/chapter08/make.xml b/chapter08/make.xml
index 04abbc695..180c6e591 100644
--- a/chapter08/make.xml
+++ b/chapter08/make.xml
@@ -41,12 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para>First, fix some issues identified upstream:</para>
-
-<screen><userinput remap="pre">sed -e '/ifdef SIGPIPE/,+2 d' \
-    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \
-    -i src/main.c</userinput></screen>
-
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 5b1fc1fe5..6c844c603 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -40,12 +40,6 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
-
-    <para>First, fix a security issue in systemd-coredump:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
-
-
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
     <systemitem class="groupname">sgx</systemitem>, from the default udev
diff --git a/packages.ent b/packages.ent
index 6889f1432..ce26b0be5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bash-fin-du "52 MB">
 <!ENTITY bash-fin-sbu "1.2 SBU">
 
-<!ENTITY bc-version "6.2.4">
-<!ENTITY bc-size "447 KB">
+<!ENTITY bc-version "6.3.1">
+<!ENTITY bc-size "448 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "5245ff400df17b66be7621c7a6498953">
+<!ENTITY bc-md5 "70caa7c8a273d7152ad015823e887455">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
 <!ENTITY bc-fin-du "7.6 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -148,10 +148,10 @@
 <!ENTITY e2fsprogs-fin-du "95 MB">
 <!ENTITY e2fsprogs-fin-sbu "2.4 SBU on a spinning disk, 0.4 SBU on an SSD">
 
-<!ENTITY elfutils-version "0.188"> <!-- libelf -->
-<!ENTITY elfutils-size "8,900 KB">
+<!ENTITY elfutils-version "0.189"> <!-- libelf -->
+<!ENTITY elfutils-size "8,936 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-<!ENTITY elfutils-md5 "efb25a91873b2eec4df9f31e6a4f4e5c">
+<!ENTITY elfutils-md5 "5cfaa711a90cb670406cd495aeaa6030">
 <!ENTITY elfutils-home "https://sourceware.org/elfutils/">
 <!ENTITY elfutils-fin-du "120 MB">
 <!ENTITY elfutils-fin-sbu "0.3 SBU">
@@ -342,10 +342,10 @@
 <!ENTITY intltool-fin-du "1.5 MB">
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "6.1.0">
-<!ENTITY iproute2-size "885 KB">
+<!ENTITY iproute2-version "6.2.0">
+<!ENTITY iproute2-size "892 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "f3ff4461e25dbc5ef1fb7a9167a9523d">
+<!ENTITY iproute2-md5 "85861856a856f6d358c6d9a4fc9088c9">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "17 MB">
 <!ENTITY iproute2-fin-sbu "0.1 SBU">
@@ -423,13 +423,13 @@
 <!ENTITY libtool-fin-sbu "1.4 SBU">
 
 <!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "1">
-<!ENTITY linux-patch-version "11">
+<!ENTITY linux-minor-version "2">
+<!ENTITY linux-patch-version "2">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "131,653 KB">
+<!ENTITY linux-size "133,236 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "f91621912cd58ac6d4128d4057980e7d">
+<!ENTITY linux-md5 "03b17feb98f92131a465b09f3a12e715">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
  allnoconfig rounded down to allow for ongoing cleanups,
@@ -450,10 +450,10 @@
 <!ENTITY m4-fin-du "49 MB">
 <!ENTITY m4-fin-sbu "0.3 SBU">
 
-<!ENTITY make-version "4.4">
-<!ENTITY make-size "2,254 KB">
+<!ENTITY make-version "4.4.1">
+<!ENTITY make-size "2,300 KB">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.gz">
-<!ENTITY make-md5 "d7575a26a94ee8427130e9db23cdaa78">
+<!ENTITY make-md5 "c8469a3713cbbe04d955d4ae4be23eeb">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-tmp-du "15 MB">
 <!ENTITY make-tmp-sbu "less than 0.1 SBU">
@@ -484,10 +484,10 @@
 <!ENTITY markupsafe-fin-du "544 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "1.0.0">
-<!ENTITY meson-size "2,051 KB">
+<!ENTITY meson-version "1.0.1">
+<!ENTITY meson-size "2,056 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "009b78125467cd9ee4d467175a5c12e1">
+<!ENTITY meson-md5 "843ba549bb2a199d9e04092116a7e749">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "41 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -566,10 +566,10 @@
 <!ENTITY pkgconfig-fin-du "29 MB">
 <!ENTITY pkgconfig-fin-sbu "0.1 SBU">
 
-<!ENTITY procps-ng-version "4.0.2">
-<!ENTITY procps-ng-size "1250 KB">
+<!ENTITY procps-ng-version "4.0.3">
+<!ENTITY procps-ng-size "1,268 KB">
 <!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
-<!ENTITY procps-ng-md5 "691748c4767f19b9d94ed9d088e40c4d">
+<!ENTITY procps-ng-md5 "22b287bcd758831cbaf3356cd3054fe7">
 <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
 <!ENTITY procps-ng-fin-du "26 MB">
 <!ENTITY procps-ng-fin-sbu "0.1 SBU">
@@ -634,20 +634,20 @@
 <!ENTITY sysklogd-fin-du "0.7 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "252">
+<!ENTITY systemd-version  "253">
 <!--<!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     "11,488 KB">
+<!ENTITY systemd-size     "11,708 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      "b9456750a212dd54d81caeb3c38134b6">
+<!ENTITY systemd-md5      "7cf12ee8a91a04306fc6cf290eed42e8">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "252-2">
-<!ENTITY systemd-man-size "628 KB">
+<!ENTITY systemd-man-version "253">
+<!ENTITY systemd-man-size "600 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  "c1df1aefdbc4840b5f82a8783f3b72c1">
+<!ENTITY systemd-man-md5  "8b54792c9433fc8db8e5d10db326802d">
 <!ENTITY systemd-fin-du   "258 MB">
 <!ENTITY systemd-fin-sbu  "0.7 SBU">
 
diff --git a/patches.ent b/patches.ent
index c381cd0a8..7c0009583 100644
--- a/patches.ent
+++ b/patches.ent
@@ -89,11 +89,11 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">
 <!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
 
-
+<!--
 <!ENTITY systemd-upstream-patch "systemd-&systemd-version;-security_fix-1.patch">
 <!ENTITY systemd-upstream-patch-md5 "da817e69e897d35cdffd7c45ea06be39">
 <!ENTITY systemd-upstream-patch-size "76.0 KB">
-
+-->
 <!--
 <!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
 <!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">