From 4cd0193c962548f5d2188144ee8ccd5be5af76e9 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 30 Jun 2023 12:58:10 -0500
Subject: [PATCH 1/3] Package Updates. Update to iana-etc-20230615. Update to
 vim-9.0.1671. Update to util-linux-2.39.1. Update to linux-6.3.10. Update to
 kbd-2.6.1. Update to gettext-0.22.

---
 chapter01/changelog.xml | 30 ++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  8 ++++----
 packages.ent            | 34 +++++++++++++++++-----------------
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e2b70f617..42d617192 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,36 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-07-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230615.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.0.1671.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.39.1.  Addresses
+          <ulink url='&lfs-ticket-root;5278'>#5278</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.10.  Addresses
+          <ulink url='&lfs-ticket-root;5276'>#5276</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[rahul] - Update to kbd-2.6.1.  Fixes
+          <ulink url='&lfs-ticket-root;5279'>#5279</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.22.  Fixes
+          <ulink url='&lfs-ticket-root;5275'>#5275</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-06-17</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ded7e7df0..302f2d43f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -121,9 +121,9 @@
     <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext-&gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc-&glibc-version;</para>
     </listitem>-->
@@ -160,9 +160,9 @@
     <!--<listitem revision="systemd">
       <para>Jinja2-&jinja2-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Kbd-&kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kmod-&kmod-version;</para>
     </listitem>-->
diff --git a/packages.ent b/packages.ent
index 315c67fc7..bd7e78860 100644
--- a/packages.ent
+++ b/packages.ent
@@ -253,10 +253,10 @@
 <!ENTITY gdbm-fin-du "13 MB">
 <!ENTITY gdbm-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY gettext-version "0.21.1">
-<!ENTITY gettext-size "9,819 KB">
+<!ENTITY gettext-version "0.22">
+<!ENTITY gettext-size "9,775 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "27fcc8a42dbc8f334f23a08f1f2fe00a">
+<!ENTITY gettext-md5 "db2f3daf34fd5b85ab1a56f9033e42d1">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-tmp-du "287 MB">
 <!ENTITY gettext-tmp-sbu "1.0 SBU">
@@ -325,10 +325,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20230524">
+<!ENTITY iana-etc-version "20230615">
 <!ENTITY iana-etc-size "587 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 "16d24a6c990cc98fea65eec05738a5a5">
+<!ENTITY iana-etc-md5 "ac85479065338ce53fbf0e7184e64b87">
 <!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">
@@ -366,10 +366,10 @@
 <!ENTITY jinja2-fin-du "3.4 MB">
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY kbd-version "2.6.0">
-<!ENTITY kbd-size "1,560 KB">
+<!ENTITY kbd-version "2.6.1">
+<!ENTITY kbd-size "1,554 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
-<!ENTITY kbd-md5 "a8331144fc8e9421108c10311f28e078">
+<!ENTITY kbd-md5 "986241b5d94c6bd4ed2f6d2a5ab4320b">
 <!ENTITY kbd-home "https://kbd-project.org/">
 <!ENTITY kbd-fin-du "35 MB">
 <!ENTITY kbd-fin-sbu "0.1 SBU">
@@ -432,12 +432,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "3">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-patch-version "10">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "133,708 KB">
+<!ENTITY linux-size "133,750 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "237a5269575160fed17c7f55d93cc46c">
+<!ENTITY linux-md5 "c3c1d7ab7644ad3d3ad10919c679243f">
 <!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,
@@ -712,23 +712,23 @@
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-minor "2.39">
-<!ENTITY util-linux-version "2.39"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "7,914 KB">
+<!ENTITY util-linux-version "2.39.1"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "8,156 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 "16579e594a8ef2e6236b38b9ab36cccf">
+<!ENTITY util-linux-md5 "c542cd7c0726254e4b3006a9b428201a">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "150 MB">
 <!ENTITY util-linux-tmp-sbu "0.2 SBU">
 <!ENTITY util-linux-fin-du "283 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.0.1503">
+<!ENTITY vim-version "9.0.1671">
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim90">
-<!ENTITY vim-size "16,612 KB">
+<!ENTITY vim-size "16,669 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 "2214efcad25b1f31c89c33f932fa8dc1">
+<!ENTITY vim-md5 "243fce49db0dd93af7c2b12163f47fcf">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "235 MB">
 <!ENTITY vim-fin-sbu "2.4 SBU">

From d6e7cda825b9ddc2c9685cc1bb083923f18906b7 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Jul 2023 16:00:20 +0800
Subject: [PATCH 2/3] kbd: Simplify the instruction for doc installation

---
 chapter08/kbd.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chapter08/kbd.xml b/chapter08/kbd.xml
index 522ddbd72..28685015a 100644
--- a/chapter08/kbd.xml
+++ b/chapter08/kbd.xml
@@ -97,8 +97,7 @@ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput></screen>
 
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">mkdir -pv           /usr/share/doc/kbd-&kbd-version;
-cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+<screen><userinput remap="install">cp -R -v docs/doc -T /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
 

From cc5eb637aad1025368417cfd5f8cf2f560036f17 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 2 Jul 2023 20:31:17 +0800
Subject: [PATCH 3/3] pkgconf: Use the Gentoo mirror for now :(

BugLink: https://github.com/pkgconf/pkgconf/issues/302
---
 packages.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages.ent b/packages.ent
index bd7e78860..cc6365abf 100644
--- a/packages.ent
+++ b/packages.ent
@@ -568,7 +568,7 @@
 
 <!ENTITY pkgconf-version "1.9.5">
 <!ENTITY pkgconf-size "304 KB">
-<!ENTITY pkgconf-url "https://distfiles.dereferenced.org/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
+<!ENTITY pkgconf-url "https://gentoo.osuosl.org/distfiles/pkgconf-&pkgconf-version;.tar.xz">
 <!ENTITY pkgconf-md5 "0a8b69723bef4ebad83e9c8b43a75cc7">
 <!ENTITY pkgconf-home "http://pkgconf.org/">
 <!ENTITY pkgconf-fin-du "8.1 MB">