From 04038ad828fc6299e9392d22c62d535a1940daaa Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Fri, 31 Mar 2023 11:01:58 +0200
Subject: [PATCH 01/12] Clarify a sentence in "stripping"

Also fix a typo
Report by Rainer Fiebig
---
 chapter08/stripping.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml
index bbd1ed94d..70e0d6ebb 100644
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@ -54,10 +54,10 @@
 
   <important>
     <para>
-      If any package of which the version is different from the version
+      If there is any package whose version is different from the version
       specified by the book (either following a security advisory or
       satisfying personal preference), it may be necessary to update the
-      the library file name in <envar>save_usrlib</envar> or
+      library file name in <envar>save_usrlib</envar> or
       <envar>online_usrlib</envar>.
       <emphasis role='bold'>Failing to do so may render the system
       completely unusable.</emphasis>

From 92dbe964f1e726ddf6589d5083819780f49fdf23 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 31 Mar 2023 22:05:15 +0800
Subject: [PATCH 02/12] Add a script to generate ChangeLog from "git diff"

---
 gen-changelog.py | 105 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100755 gen-changelog.py

diff --git a/gen-changelog.py b/gen-changelog.py
new file mode 100755
index 000000000..91909b254
--- /dev/null
+++ b/gen-changelog.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+
+# LFS ChangeLog generator for trivial package addition, removal, and update
+
+from subprocess import Popen, PIPE
+from urllib.request import urlopen
+from os import getenv
+
+def get_entity(line):
+    line = line[1:]
+    if not line.startswith("<!ENTITY "):
+        return None
+    quote_pos = line.find(' "')
+    key = line[len("<!ENTITY "):quote_pos]
+    value = line[quote_pos + 2:]
+    value = value[:value.find('"')]
+    return (key, value)
+
+def expand_entity(ent, key):
+    value = ent[key]
+    out = ""
+    sub_ent = ""
+    for c in value:
+        if c == '&':
+            sub_ent = c
+        elif sub_ent:
+            sub_ent += c
+            if c == ';':
+                out += expand_entity(ent, sub_ent[1:-1])
+                sub_ent = ""
+        else:
+            out += c
+    return out
+
+git_diff = Popen(["git", "diff", "-U999999", "packages.ent"],
+                 stdout = PIPE,
+                 text = True)
+stdout, _ = git_diff.communicate()
+
+lines = stdout.rstrip().split("\n")
+ent = [get_entity(i) for i in lines if i[0] != '-']
+ent = dict(i for i in ent if i)
+
+add = set()
+rem = set()
+
+for l in lines:
+    if l[0] in '+-':
+        pair = get_entity(l)
+        if pair:
+            key, _ = pair
+            if key.endswith('-md5'):
+                pkg = key[:-len('-md5')]
+                if l[0] == '+':
+                    add.add(pkg)
+                else:
+                    rem.add(pkg)
+
+upd = add.intersection(rem)
+add = add.symmetric_difference(upd)
+rem = rem.symmetric_difference(upd)
+
+ticket = {}
+security = set()
+url = 'https://wiki.linuxfromscratch.org/lfs/report/1?format=tab'
+tsv = urlopen(url)
+for i in tsv:
+    fields = i.decode().split('\t')
+    if len(fields) >= 2:
+        pkg = fields[1].lower()
+        pos = pkg.find(' ')
+        if pos > 0:
+            pkg = pkg[:pos]
+        tic = fields[0]
+        sec = len(fields) >= 3 and fields[2].startswith("high")
+        ticket[pkg] = tic
+        security.add(pkg)
+
+print("Plain Text:")
+for (s, act) in [(upd, "Update to "), (add, "Add ")]:
+    for i in s:
+        pkgver = i + "-" + expand_entity(ent, i + "-version")
+        out = act + pkgver
+        if pkgver in ticket:
+            out += ' (#' + ticket[pkgver] + ')'
+        print(out)
+for i in rem:
+    print("Remove", i)
+
+print("---------------------")
+
+print("XML")
+name = getenv("USER")
+for (s, act) in [(upd, "Update to "), (add, "Add ")]:
+    for i in s:
+        print('        <listitem>')
+        pkgver = i + "-" + expand_entity(ent, i + "-version")
+        out = '          <para>[' + name + '] - ' + act + pkgver + "."
+        if pkgver in ticket:
+            out += "  Fixes\n          "
+            out += "<ulink url='&lfs-ticket-root;" + ticket[pkgver] + "'>#"
+            out += ticket[pkgver] + "</ulink>."
+        out += "</para>"
+        print(out)
+        print('        </listitem>')

From af612e9a199b621382a46377104a538e8c89b210 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 31 Mar 2023 22:22:38 +0800
Subject: [PATCH 03/12] Package updates

Update to linux-6.2.8 (#5230)
Update to xz-5.4.2 (#5233)
Update to coreutils-9.2 (#5232)
Update to libcap-2.68 (#5236)
Update to bc-6.5.0 (#5228)
Update to openssl-3.1.0 (#5227)
Update to texinfo-7.0.3 (#5235)
Update to grep-3.10 (#5234)
Update to tzdata-2023c (#5237)
Update to wheel-0.40.0 (#5229)
Add flit-core-3.8.0
---
 chapter01/changelog.xml |  49 +++++++++++++++++
 chapter08/chapter08.xml |   1 +
 chapter08/flit-core.xml | 115 ++++++++++++++++++++++++++++++++++++++++
 packages.ent            |  67 ++++++++++++-----------
 4 files changed, 202 insertions(+), 30 deletions(-)
 create mode 100644 chapter08/flit-core.xml

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 24634ea69..8c24e1607 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,55 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2023-03-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to grep-3.10.  Fixes
+          <ulink url='&lfs-ticket-root;5234'>#5234</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to wheel-0.40.0.  Fixes
+          <ulink url='&lfs-ticket-root;5229'>#5229</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.5.0.  Fixes
+          <ulink url='&lfs-ticket-root;5228'>#5228</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to texinfo-7.0.3.  Fixes
+          <ulink url='&lfs-ticket-root;5235'>#5235</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to coreutils-9.2.  Fixes
+          <ulink url='&lfs-ticket-root;5232'>#5232</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to libcap-2.68.  Fixes
+          <ulink url='&lfs-ticket-root;5236'>#5236</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to tzdata-2023c.  Fixes
+          <ulink url='&lfs-ticket-root;5237'>#5237</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to xz-5.4.2.  Fixes
+          <ulink url='&lfs-ticket-root;5233'>#5233</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.2.8.  Fixes
+          <ulink url='&lfs-ticket-root;5230'>#5230</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to openssl-3.1.0.  Fixes
+          <ulink url='&lfs-ticket-root;5227'>#5227</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Add flit-core-3.8.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-03-15</para>
       <itemizedlist>
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 902d1bf48..91827b88e 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -63,6 +63,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flit-core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wheel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
diff --git a/chapter08/flit-core.xml b/chapter08/flit-core.xml
new file mode 100644
index 000000000..ef62034ab
--- /dev/null
+++ b/chapter08/flit-core.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-flit-core" role="wrap" revision="systemd">
+  <?dbhtml filename="flit-core.html"?>
+
+  <sect1info condition="script">
+    <productname>flit-core</productname>
+    <productnumber>&flit-core-version;</productnumber>
+    <address>&flit-core-url;</address>
+  </sect1info>
+
+  <title>Flit-Core-&flit-core-version;</title>
+
+  <indexterm zone="ch-system-flit-core">
+    <primary sortas="a-flit-core">Flit-core</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Flit-core is the distribution-building parts of Flit (a packaging
+    tool for simple Python modules).</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+      <seglistitem>
+        <seg>&flit-core-fin-sbu;</seg>
+        <seg>&flit-core-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Flit-core</title>
+
+    <para>Build the package:</para>
+
+<screen><userinput remap="install">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">pip3 install --no-index --no-user --find-links dist flit_core</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the pip3 configuration options and commands:</title>
+
+      <varlistentry>
+        <term><command>wheel</command></term>
+        <listitem>
+           <para>This command builds the wheel archive for this package.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-w dist</parameter></term>
+        <listitem>
+           <para>Instructs pip to put the created wheel into the
+           <filename class='directory'>dist</filename> directory.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>install</command></term>
+        <listitem>
+           <para>This command installs the package.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--no-build-isolation</parameter>,
+              <parameter>--no-deps</parameter>, and
+              <parameter>--no-index</parameter></term>
+        <listitem>
+          <para>These options prevent fetching files from the online package
+          repository (PyPI). If packages are installed in the correct order,
+          pip won't need to fetch any files in the first place; these
+          options add some safety in case of user error.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--find-links dist</parameter></term>
+        <listitem>
+           <para>Instructs pip to search for wheel archives in the
+           <filename class='directory'>dist</filename> directory.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+  <sect2 id="contents-flit-core" role="content">
+    <title>Contents of Flit-Core</title>
+
+    <segmentedlist>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+         <seg>
+            /usr/lib/python&python-minor;/site-packages/flit_core and
+            /usr/lib/python&python-minor;/site-packages/flit_core-&flit-core-version;.dist-info
+         </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
+
diff --git a/packages.ent b/packages.ent
index 592402c1c..884a9aa68 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.4.0">
-<!ENTITY bc-size "450 KB">
+<!ENTITY bc-version "6.5.0">
+<!ENTITY bc-size "452 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "b10f1832f169610db6ebd313c432f69e">
+<!ENTITY bc-md5 "e4757f48340dfe74af0d5be7ea56f7c7">
 <!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">
@@ -104,10 +104,10 @@
 <!ENTITY check-fin-du "12 MB">
 <!ENTITY check-fin-sbu "0.1 SBU (about 1.7 SBU with tests)">
 
-<!ENTITY coreutils-version "9.1">
-<!ENTITY coreutils-size "5,570 KB">
+<!ENTITY coreutils-version "9.2">
+<!ENTITY coreutils-size "5,644 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "8b1ca4e018a7dce9bb937faec6618671">
+<!ENTITY coreutils-md5 "4a8a5097d8d7315ccfd6be7eafc8c862">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-tmp-du "162 MB">
 <!ENTITY coreutils-tmp-sbu "0.3 SBU">
@@ -207,6 +207,13 @@
 <!ENTITY flex-fin-du "33 MB">
 <!ENTITY flex-fin-sbu "0.1 SBU">
 
+<!ENTITY flit-core-version "3.8.0">
+<!ENTITY flit-core-size "44 KB">
+<!ENTITY flit-core-url "&pypi-src;/f/flit-core/flit_core-&flit-core-version;.tar.gz">
+<!ENTITY flit-core-md5 "7c41da13273f7787709a24f74e0f5a99">
+<!ENTITY flit-core-fin-du "736 KB">
+<!ENTITY flit-core-fin-sbu "less than 0.1 SBU">
+
 <!ENTITY gawk-version "5.2.1">
 <!ENTITY gawk-size "3,332 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
@@ -281,10 +288,10 @@
 <!ENTITY gperf-fin-du "6.1 MB">
 <!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "3.9">
-<!ENTITY grep-size "1,641 KB">
+<!ENTITY grep-version "3.10">
+<!ENTITY grep-size "1,652 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "ee315ef80638e0ca3fd5e0c8526b7b2a">
+<!ENTITY grep-md5 "ab3f063ad4596b7d094fb5f66cf327d6">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-tmp-du "25 MB">
 <!ENTITY grep-tmp-sbu "0.2 SBU">
@@ -390,10 +397,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.67">
-<!ENTITY libcap-size "183 KB">
+<!ENTITY libcap-version "2.68">
+<!ENTITY libcap-size "188 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "06333f4301657298890fd8d6f1fb4793">
+<!ENTITY libcap-md5 "ffb9e9c87704f92ac75201327841e753">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "2.9 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -424,12 +431,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "2">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-patch-version "8">
 <!--<!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,263 KB">
+<!ENTITY linux-size "133,284 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "b1e4f3e49a05c6e26c0e18e363a3dc9a">
+<!ENTITY linux-md5 "56fcbe2057a826630e6f776bd5c532a5">
 <!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,
@@ -526,10 +533,10 @@
 <!ENTITY ninja-fin-du "77 MB">
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "3.0.8">
-<!ENTITY openssl-size "14,800 KB">
+<!ENTITY openssl-version "3.1.0">
+<!ENTITY openssl-size "15,164 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "61e017cf4fea1b599048f621f1490fbd">
+<!ENTITY openssl-md5 "f6c520aa2206d4d1fa71ea30b5e9a56d">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "520 MB">
 <!ENTITY openssl-fin-sbu "3.2 SBU">
@@ -681,20 +688,20 @@
 <!ENTITY tcl-tmp-du "89 MB">
 <!ENTITY tcl-tmp-sbu "2.7 SBU">
 
-<!ENTITY texinfo-version "7.0.2">
-<!ENTITY texinfo-size "4,762 KB">
+<!ENTITY texinfo-version "7.0.3">
+<!ENTITY texinfo-size "4,776 KB">
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
-<!ENTITY texinfo-md5 "be9500f3a361525622850ecb1b1fc024">
+<!ENTITY texinfo-md5 "37bf94fd255729a14d4ea3dda119f81a">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
 <!ENTITY texinfo-tmp-du "116 MB">
 <!ENTITY texinfo-tmp-sbu "0.2 SBU">
 <!ENTITY texinfo-fin-du "128 MB">
 <!ENTITY texinfo-fin-sbu "0.3 SBU">
 
-<!ENTITY tzdata-version "2022g">
-<!ENTITY tzdata-size "430 KB">
+<!ENTITY tzdata-version "2023c">
+<!ENTITY tzdata-size "436 KB">
 <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "884250fd2a8a55f6322900ad4ab94d7b">
+<!ENTITY tzdata-md5 "5aa672bf129b44dd915f8232de38e49a">
 <!ENTITY tzdata-home "https://www.iana.org/time-zones">
 
 <!ENTITY udev-lfs-version "udev-lfs-20171102">
@@ -725,10 +732,10 @@
 <!ENTITY vim-fin-du "235 MB">
 <!ENTITY vim-fin-sbu "2.4 SBU">
 
-<!ENTITY wheel-version "0.38.4">
-<!ENTITY wheel-size "66 KB">
+<!ENTITY wheel-version "0.40.0">
+<!ENTITY wheel-size "96 KB">
 <!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
-<!ENTITY wheel-md5 "83bb4e7bd4d687d398733f341a64ab91">
+<!ENTITY wheel-md5 "ec5004c46d1905da98bb5bc1a10ddd21">
 <!ENTITY wheel-home "&pypi-home;/wheel/">
 <!ENTITY wheel-fin-du "1.3 MB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">
@@ -741,10 +748,10 @@
 <!ENTITY xml-parser-fin-du "2.3 MB">
 <!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.4.1">
-<!ENTITY xz-size "1,451 KB">
+<!ENTITY xz-version "5.4.2">
+<!ENTITY xz-size "1,576 KB">
 <!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "47d831c659e94071d5dd384d0d1ed4c6">
+<!ENTITY xz-md5 "1dcdf002d9a69f48ff67be84964af0d8">
 <!ENTITY xz-home "https://tukaani.org/xz">
 <!ENTITY xz-tmp-du "20 MB">
 <!ENTITY xz-tmp-sbu "0.1 SBU">

From 0e3eb0bee49e5e5eab7e1bff7721197bb55bb97a Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 31 Mar 2023 22:26:06 +0800
Subject: [PATCH 04/12] wheel: Remove magic PYTHONPATH=src (unneeded with
 flit-core) and ...

duplicated pip3 explanation (already in flit-core page).
---
 chapter08/wheel.xml | 55 +--------------------------------------------
 1 file changed, 1 insertion(+), 54 deletions(-)

diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml
index 57457dacc..88e47d556 100644
--- a/chapter08/wheel.xml
+++ b/chapter08/wheel.xml
@@ -42,65 +42,12 @@
 
     <para>Compile Wheel with the following command:</para>
 
-<screen><userinput remap="make">PYTHONPATH=src pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install Wheel with the following command:</para>
 
 <screen><userinput remap="install">pip3 install --no-index --find-links=dist wheel</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the pip3 configuration options and commands:</title>
-
-      <varlistentry>
-        <term><envar>PYTHONPATH=src</envar></term>
-        <listitem>
-           <para>Allows this package (not installed yet) to build a
-           wheel archive for itself, to avoid a chicken-or-egg problem.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>wheel</command></term>
-        <listitem>
-           <para>This command builds the wheel archive for this package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-w dist</parameter></term>
-        <listitem>
-           <para>Instructs pip to put the created wheel into the
-           <filename class='directory'>dist</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>install</command></term>
-        <listitem>
-           <para>This command installs the package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--no-build-isolation</parameter>,
-              <parameter>--no-deps</parameter>, and
-              <parameter>--no-index</parameter></term>
-        <listitem>
-          <para>These options prevent fetching files from the online package
-          repository (PyPI). If packages are installed in the correct order,
-          pip won't need to fetch any files in the first place; these
-          options add some safety in case of user error.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--find-links dist</parameter></term>
-        <listitem>
-           <para>Instructs pip to search for wheel archives in the
-           <filename class='directory'>dist</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
   </sect2>
 
   <sect2 id="contents-wheel" role="content">

From bdaf4239efea2c0c4c0c18c2d90864a5440d197b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 31 Mar 2023 22:45:34 +0800
Subject: [PATCH 05/12] patches: Bump coreutils i18n patch md5sum for 9.2

---
 patches.ent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches.ent b/patches.ent
index 7c0009583..c9d483de5 100644
--- a/patches.ent
+++ b/patches.ent
@@ -23,7 +23,7 @@
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "c1ac7edf095027460716577633da9fc5">
+<!ENTITY coreutils-i18n-patch-md5 "3c6340b3ddd62f4acdf8d3caa6fad6b0">
 <!ENTITY coreutils-i18n-patch-size "166 KB">
 <!--
 <!ENTITY coreutils-chmod-patch "coreutils-&coreutils-version;-chmod_fix-1.patch">

From 22f0edf6ba3fb95bdc4f3e8b132d6e7f9f0f4fa1 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 31 Mar 2023 22:46:00 +0800
Subject: [PATCH 06/12] coreutils: Fix a bug in checksum utilities for failure
 reporting

---
 chapter08/coreutils.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 77c6a7a92..7c528d6c4 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -53,14 +53,12 @@
       those bugs are reproducible without this patch.</para>
     </note>
 
-   <!-- this has been fixed in upstream gnulib, when a new version of
-   coreutils is released, please check #4055 to see if the change has been
-   picked up in this package -->
-<!--
-   <para>Now, fix a problem with chmod return values:</para>
+    <!-- https://bugs.gnu.org/62403 -->
+    <para>Fix a bug in checksum utilities causing failed checks not
+    reported correctly:</para>
+
+<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-chmod-patch;</userinput></screen>
--->
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">autoreconf -fiv

From 13eb8a3ce139293722c2b6408a079a7e03b5df71 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Apr 2023 00:55:06 +0800
Subject: [PATCH 07/12] packages: Add flit-core into download page

---
 chapter03/packages.xml | 9 +++++++++
 packages.ent           | 1 +
 2 files changed, 10 insertions(+)

diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 92d44afaf..87238724d 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -227,6 +227,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Flit-core (&flit-core-version;) - <token>&flit-core-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&flit-core-home;"/></para>
+        <para>Download: <ulink url="&flit-core-url;"/></para>
+        <para>MD5 sum: <literal>&flit-core-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Gawk (&gawk-version;) - <token>&gawk-size;</token>:</term>
       <listitem>
diff --git a/packages.ent b/packages.ent
index 884a9aa68..dddcaf5fc 100644
--- a/packages.ent
+++ b/packages.ent
@@ -211,6 +211,7 @@
 <!ENTITY flit-core-size "44 KB">
 <!ENTITY flit-core-url "&pypi-src;/f/flit-core/flit_core-&flit-core-version;.tar.gz">
 <!ENTITY flit-core-md5 "7c41da13273f7787709a24f74e0f5a99">
+<!ENTITY flit-core-home "&pypi-home;/flit-core/">
 <!ENTITY flit-core-fin-du "736 KB">
 <!ENTITY flit-core-fin-sbu "less than 0.1 SBU">
 

From 38eab97b1e599a87ac362a386cdf6944b12cf5b4 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Apr 2023 01:22:40 +0800
Subject: [PATCH 08/12] dependencies: Add flit-core

---
 appendices/dependencies.xml | 44 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 66c6ca6f2..6387743a7 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -876,6 +876,48 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Flit-core dependency info -->
+  <bridgehead renderas="sect2" id="flit-core-dep">Flit-Core</bridgehead>
+
+      <segmentedlist id="flit-core-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="flit-core-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="flit-core-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="flit-core-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Wheel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="flit-core-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>
+            <ulink url='&blfs-book;general/python-modules.html#pytest'>pytest</ulink>
+            and
+            <ulink url='&pypi-home;/testpath'>testpath</ulink>
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Gawk dependency info -->
   <bridgehead renderas="sect2" id="gawk-dep">Gawk</bridgehead>
 
@@ -3104,7 +3146,7 @@
       <segmentedlist id="wheel-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Python</seg>
+          <seg>Python and Flit-core</seg>
         </seglistitem>
       </segmentedlist>
 

From d98496d20c2e1b933cd8b01fdc53996013b204cb Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Apr 2023 01:45:36 +0800
Subject: [PATCH 09/12] gen-changelog: Mark security fix correctly

---
 gen-changelog.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gen-changelog.py b/gen-changelog.py
index 91909b254..2932dd9ec 100755
--- a/gen-changelog.py
+++ b/gen-changelog.py
@@ -72,9 +72,9 @@ for i in tsv:
         if pos > 0:
             pkg = pkg[:pos]
         tic = fields[0]
-        sec = len(fields) >= 3 and fields[2].startswith("high")
+        if len(fields) >= 3 and fields[2].startswith("high"):
+            security.add(pkg)
         ticket[pkg] = tic
-        security.add(pkg)
 
 print("Plain Text:")
 for (s, act) in [(upd, "Update to "), (add, "Add ")]:
@@ -95,7 +95,10 @@ for (s, act) in [(upd, "Update to "), (add, "Add ")]:
     for i in s:
         print('        <listitem>')
         pkgver = i + "-" + expand_entity(ent, i + "-version")
-        out = '          <para>[' + name + '] - ' + act + pkgver + "."
+        out = '          <para>[' + name + '] - ' + act + pkgver
+        if pkgver in security:
+            out += " (security fix)"
+        out += "."
         if pkgver in ticket:
             out += "  Fixes\n          "
             out += "<ulink url='&lfs-ticket-root;" + ticket[pkgver] + "'>#"

From b57a3babaa2d3c8a4847881910ebafecca39414a Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Apr 2023 01:51:19 +0800
Subject: [PATCH 10/12] Update to linux-6.2.9 (#5230)

---
 chapter01/changelog.xml | 8 ++++----
 packages.ent            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8c24e1607..3f8583217 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,10 @@
     <listitem>
       <para>2023-03-31</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to linux-6.2.9 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5230'>#5230</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Update to grep-3.10.  Fixes
           <ulink url='&lfs-ticket-root;5234'>#5234</ulink>.</para>
@@ -74,10 +78,6 @@
           <para>[xry111] - Update to xz-5.4.2.  Fixes
           <ulink url='&lfs-ticket-root;5233'>#5233</ulink>.</para>
         </listitem>
-        <listitem>
-          <para>[xry111] - Update to linux-6.2.8.  Fixes
-          <ulink url='&lfs-ticket-root;5230'>#5230</ulink>.</para>
-        </listitem>
         <listitem>
           <para>[xry111] - Update to openssl-3.1.0.  Fixes
           <ulink url='&lfs-ticket-root;5227'>#5227</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index dddcaf5fc..88ddfe414 100644
--- a/packages.ent
+++ b/packages.ent
@@ -432,12 +432,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "2">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-patch-version "9">
 <!--<!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,284 KB">
+<!ENTITY linux-size "133,256 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "56fcbe2057a826630e6f776bd5c532a5">
+<!ENTITY linux-md5 "f54e2a251b1abd5b56e46ed0de569275">
 <!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,

From 4e3fe1da0f5ce69d19460e7508e7441a03ba928f Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Apr 2023 03:42:52 +0800
Subject: [PATCH 11/12] whatsnew: Add Flit-core

Also use the Normal Case for Flit-Core in a section title.
---
 chapter01/whatsnew.xml  | 4 ++++
 chapter08/flit-core.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 6153628ac..4f38a75a7 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -292,6 +292,10 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <listitem>
+      <para>Flit-core-&flit-core-version;</para>
+    </listitem>
+
     <!--<listitem>
       <para>&grub-upstream-fixes-patch;</para>
     </listitem>-->
diff --git a/chapter08/flit-core.xml b/chapter08/flit-core.xml
index ef62034ab..229a369ed 100644
--- a/chapter08/flit-core.xml
+++ b/chapter08/flit-core.xml
@@ -38,7 +38,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Flit-core</title>
+    <title>Installation of Flit-Core</title>
 
     <para>Build the package:</para>
 

From fd531b84c94f504f604c37f397f46c381e88841a Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 1 Apr 2023 05:47:17 +0800
Subject: [PATCH 12/12] flit-core: Kill revision='systemd'

I copied from jinja2 and edited the file, but forgot to remove this.
---
 chapter08/flit-core.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/flit-core.xml b/chapter08/flit-core.xml
index 229a369ed..641ff73b7 100644
--- a/chapter08/flit-core.xml
+++ b/chapter08/flit-core.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-flit-core" role="wrap" revision="systemd">
+<sect1 id="ch-system-flit-core" role="wrap">
   <?dbhtml filename="flit-core.html"?>
 
   <sect1info condition="script">