From 2dd09032eba6097f2adbfc1f02fae640094e1d46 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Tue, 15 Mar 2022 16:10:57 +0800
Subject: [PATCH] package update

* update to expat-2.4.7 (#5019)
* update to bc-5.2.3 (#5020)
* update to linux-5.16.14 (#5021)
* update to perl-5.34.1 (#5022)
* update to vim-8.2.4567 (#4500)
---
 chapter01/changelog.xml | 26 ++++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 18 +++++++++---------
 chapter03/patches.xml   |  3 ++-
 chapter08/perl.xml      |  4 ++--
 packages.ent            | 26 +++++++++++++-------------
 patches.ent             |  3 ++-
 6 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 72cebc79e..4e7715d51 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,32 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2022-03-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to expat-2.4.7. Fixes
+          <ulink url="&lfs-ticket-root;5019">#5019</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-5.2.3. Fixes
+          <ulink url="&lfs-ticket-root;5020">#5020</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-5.16.14 (security fix). Fixes
+          <ulink url="&lfs-ticket-root;5021">#5021</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to perl-5.34.1. Fixes
+          <ulink url="&lfs-ticket-root;5022">#5022</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to vim-8.2.4567 (security fix).
+          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-03-05</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0ea65684c..89746b9d1 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -41,9 +41,9 @@
    <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
       <para>Bc &bc-version;</para>
-    </listitem>-->
+    </listitem>
    <!--<listitem>
       <para>Binutils-&binutils-version;</para>
     </listitem>-->
@@ -74,9 +74,9 @@
     <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
        <para>Expect-&expect-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>Pkg-config-&pkgconfig-version;</para>
     </listitem>-->
@@ -292,9 +292,9 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <!--<listitem>
-      <para>bash-5.0-upstream_fixes-1.patch</para>
-    </listitem>-->
+    <listitem>
+      <para>perl-5.34.0-upstream_fixes-1.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4b24fad1f..c4dae4abb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -108,7 +108,7 @@
       </listitem>
     </varlistentry>
 -->
-
+<!--
     <varlistentry>
       <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
       <listitem>
@@ -116,6 +116,7 @@
         <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 <!--
     <varlistentry>
       <term>Shadow Segfault Fix Patch - <token>&shadow-segfault-patch-size;</token>:</term>
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index d22614a56..4b754387c 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -40,12 +40,12 @@
 
   <sect2 role="installation">
     <title>Installation of Perl</title>
-
+<!--
     <para>First, apply a patch that fixes an issue highlighted by recent
     versions of gdbm:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
-
+-->
     <para>This version of Perl now builds the Compress::Raw::Zlib and
     Compress::Raw::BZip2 modules. By
     default Perl will use an internal copy of the sources for the build.
diff --git a/packages.ent b/packages.ent
index ad71479e8..d4b4b2891 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bash-fin-du "50 MB">
 <!ENTITY bash-fin-sbu "1.5 SBU">
 
-<!ENTITY bc-version "5.2.2">
+<!ENTITY bc-version "5.2.3">
 <!ENTITY bc-size "428 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "632344cdb052af0e06087bd3b0034126">
+<!ENTITY bc-md5 "804afda772aad9f8dd77847f8944a17d">
 <!ENTITY bc-home "https://git.yzena.com/gavin/bc">
 <!ENTITY bc-fin-du "7.1 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -163,10 +163,10 @@
 <!ENTITY eudev-fin-du "83 MB">
 <!ENTITY eudev-fin-sbu "0.2 SBU">
 
-<!ENTITY expat-version "2.4.6">
+<!ENTITY expat-version "2.4.7">
 <!ENTITY expat-size "444 KB">
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
-<!ENTITY expat-md5 "22a30c888752fdda9f8dd1b7281c54b0">
+<!ENTITY expat-md5 "75a1f475e30281a00cb6f083ea481159">
 <!ENTITY expat-home "https://libexpat.github.io/">
 <!ENTITY expat-fin-du "12 MB">
 <!ENTITY expat-fin-sbu "0.1 SBU">
@@ -436,12 +436,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "12">
+<!ENTITY linux-patch-version "14">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "124,572 KB">
+<!ENTITY linux-size "124,584 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "e859941968400c4437bd62b4fe39b7b7">
+<!ENTITY linux-md5 "e972cda9b33bbd70737bfccb365410f8">
 <!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,
@@ -561,12 +561,12 @@
 
 <!ENTITY perl-version-major "5">
 <!ENTITY perl-version-minor "34">
-<!ENTITY perl-version-patch "0">
+<!ENTITY perl-version-patch "1">
 <!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 "12,580 KB">
+<!ENTITY perl-size "12,464 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "df7ecb0653440b26dc951ad9dbfab517">
+<!ENTITY perl-md5 "7d2ece7f50775ea1ff739831935a24bd">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-tmp-du "272 MB">
 <!ENTITY perl-tmp-sbu "1.6 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.4489">
+<!ENTITY vim-version "8.2.4567">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "10,380 KB">
+<!ENTITY vim-size "10,436 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 "41e97917fc46d044ffe951c197509efe">
+<!ENTITY vim-md5 "939fdfad067dec0e67bc4f8ad219cb4e">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "206 MB">
 <!ENTITY vim-fin-sbu "2.4 SBU">
diff --git a/patches.ent b/patches.ent
index 7e43f7e0a..5dd7ffcaa 100644
--- a/patches.ent
+++ b/patches.ent
@@ -71,10 +71,11 @@
 <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
 <!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
 -->
-
+<!--
 <!ENTITY perl-fix-patch "perl-&perl-version;-upstream_fixes-1.patch">
 <!ENTITY perl-fix-patch-md5 "fb42558b59ed95ee00eb9f1c1c9b8056">
 <!ENTITY perl-fix-patch-size "1.6 KB">
+-->
 <!--
 <!ENTITY shadow-segfault-patch "shadow-&shadow-version;-useradd_segfault-1.patch">
 <!ENTITY shadow-segfault-patch-md5 "66b299c0c9ac66fdb7c91b40df5984c0">