From 02d0c359bbd95dbc745e31e07da1405dd7a36b0d Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Thu, 27 Jan 2022 20:59:42 +0800
Subject: [PATCH 1/3] dependencies: systemd does not depends on Intltool now

---
 appendices/dependencies.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 3d5787a33..57301c5ad 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2751,7 +2751,7 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
          <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
-         GCC, Glibc, Gperf, Grep, Intltool, Jinja2, Libcap, Meson, Sed, and
+         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Meson, Sed, and
          Util-linux</seg>
         </seglistitem>
       </segmentedlist>

From 8c3872af6c11ae952ecb69f86bc3913dcf1d1e93 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Fri, 28 Jan 2022 02:36:45 +0800
Subject: [PATCH 2/3] dependencies: systemd uses zstd

It's used for compressing journals and coredumps.
---
 appendices/dependencies.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 57301c5ad..9278b724a 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2751,8 +2751,8 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
          <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
-         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Meson, Sed, and
-         Util-linux</seg>
+         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Meson, Sed, Util-linux,
+         and Zstd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3218,7 +3218,7 @@
       <segmentedlist id="zstd-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>GCC</seg>
+          <seg>GCC and Systemd</seg>
         </seglistitem>
       </segmentedlist>
 

From e1ebbef46a60aefd2cb48c6fc82ac3c1414a4054 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 27 Jan 2022 21:29:56 -0600
Subject: [PATCH 3/3] Package updates. Update to vim-8.2.4236. Update to
 zstd-1.5.2. Update to util-linux-2.37.3 (security fix). Update to
 Python-3.10.2. Update to linux-5.16.2. Update to libcap-2.63. Update to
 iproute2-5.16.0. Update to iana-etc-20220120.

---
 chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  4 ++--
 packages.ent            | 52 ++++++++++++++++++++---------------------
 3 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f6c1b30ac..f5f295111 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,44 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2022-01-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.4236. Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zstd-1.5.2. Fixes
+          <ulink url="&lfs-ticket-root;4988">#4988</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.37.3 (security fix). Fixes
+          <ulink url="&lfs-ticket-root;4989">#4989</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.10.2. Fixes
+          <ulink url="&lfs-ticket-root;4987">#4987</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.16.2. Fixes
+          <ulink url="&lfs-ticket-root;4979">#4979</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.63. Fixes
+          <ulink url="&lfs-ticket-root;4990">#4990</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-5.16.0. Fixes
+          <ulink url="&lfs-ticket-root;4982">#4982</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20220120. Fixes
+          <ulink url="&lfs-ticket-root;4975">#4975</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-01-20</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 7467ff140..a0b40efef 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -252,9 +252,9 @@
     <listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Vim-&vim-version;</para>
     </listitem>
diff --git a/packages.ent b/packages.ent
index 3ddca0fb0..6af0c96cb 100644
--- a/packages.ent
+++ b/packages.ent
@@ -321,10 +321,10 @@
 <!ENTITY gzip-fin-du "19 MB">
 <!ENTITY gzip-fin-sbu "0.1 SBU">
 
-<!ENTITY iana-etc-version "20211224">
-<!ENTITY iana-etc-size "581 KB">
+<!ENTITY iana-etc-version "20220120">
+<!ENTITY iana-etc-size "582 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 "f5082bd2d566f753f7e3aa8882339472">
+<!ENTITY iana-etc-md5 "046bf3f53cbe30636fe50dbf5bfa1c17">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.7 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@@ -346,10 +346,10 @@
 <!ENTITY intltool-fin-du "1.5 MB">
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "5.15.0">
-<!ENTITY iproute2-size "838 KB">
+<!ENTITY iproute2-version "5.16.0">
+<!ENTITY iproute2-size "843 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "8a598a61c054a3ce538b47c40b010552">
+<!ENTITY iproute2-md5 "994c1bad2a24aa9d70e89670c5b5dfcb">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "15 MB">
 <!ENTITY iproute2-fin-sbu "0.2 SBU">
@@ -394,10 +394,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.62">
+<!ENTITY libcap-version "2.63">
 <!ENTITY libcap-size "171 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "342c7560ed2103899f6914d1de75a89f">
+<!ENTITY libcap-md5 "18410cec436f827e698ee9ea16ada9b7">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "3.2 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -427,13 +427,13 @@
 <!ENTITY libtool-fin-sbu "1.5 SBU">
 
 <!ENTITY linux-major-version "5">
-<!ENTITY linux-minor-version "15">
-<!ENTITY linux-patch-version "12">
+<!ENTITY linux-minor-version "16">
+<!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 "119,091 KB">
+<!ENTITY linux-size "124,536 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "7c3faf14ec344d6d0219b6a8b2475726">
+<!ENTITY linux-md5 "fd00badc3b53d42da3d84a7cf6f53f17">
 <!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,
@@ -592,19 +592,19 @@
 <!-- If python minor version changes, updates in python and
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.10.1">
+<!ENTITY python-version "3.10.2">
 <!ENTITY python-minor "3.10">
-<!ENTITY python-size "18,336 KB">
+<!ENTITY python-size "18,341 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "789210934745a65247a3ebf5da9adb64">
+<!ENTITY python-md5 "14e8c22458ed7779a1957b26cde01db9">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "347 MB">
 <!ENTITY python-tmp-sbu "1.2 SBU">
 <!ENTITY python-fin-du "260 MB">
 <!ENTITY python-fin-sbu "4.4 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 "d8e05bfe7e1327938690ac8a3d3b897d">
-<!ENTITY python-docs-size "7,105 KB">
+<!ENTITY python-docs-md5 "ffa52f0017baf72df9d32dec785fd6ab">
+<!ENTITY python-docs-size "7,102 KB">
 
 <!ENTITY readline-version "8.1.2">
 <!ENTITY readline-soversion "8.1"><!-- used for stripping -->
@@ -711,23 +711,23 @@
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-minor "2.37">
-<!ENTITY util-linux-version "2.37.2"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "5,490 KB">
+<!ENTITY util-linux-version "2.37.3"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "5,983 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "d659bf7cd417d93dc609872f6334b019">
+<!ENTITY util-linux-md5 "36fe209806ede050ce124e4a2e6e66d4">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "128 MB">
 <!ENTITY util-linux-tmp-sbu "0.7 SBU">
 <!ENTITY util-linux-fin-du "261 MB">
 <!ENTITY util-linux-fin-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.3704">
+<!ENTITY vim-version "8.2.4236">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "15,535 KB">
+<!ENTITY vim-size "15,630 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.gz">
-<!ENTITY vim-md5 "c17fa95d80e1bda12c1fb11682f9e162">
+<!ENTITY vim-md5 "62f4d45fcb8051469c9b08874b6a5e0d">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "199 MB">
 <!ENTITY vim-fin-sbu "2.3 SBU">
@@ -758,10 +758,10 @@
 <!ENTITY zlib-fin-du "5.0 MB">
 <!ENTITY zlib-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY zstd-version "1.5.1">
-<!ENTITY zstd-size "1,890 KB">
+<!ENTITY zstd-version "1.5.2">
+<!ENTITY zstd-size "1,892 KB">
 <!ENTITY zstd-url "https://github.com/facebook/zstd/releases/download/v&zstd-version;/zstd-&zstd-version;.tar.gz">
-<!ENTITY zstd-md5 "b97d53547220355907dedec7de9a4f29">
+<!ENTITY zstd-md5 "072b10f71f5820c24761a65f31f43e73">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
 <!ENTITY zstd-fin-du "60 MB">
 <!ENTITY zstd-fin-sbu "1.4 SBU">