Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

16 files changed, 161 insertions, 74 deletions

diff --git a/Makefile b/Makefile
index 1c23a55f5..71b82d0c6 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,6 @@ book: validate profile-html
          true;                                        \
          /bin/bash obfuscate.sh $$filename;           \
          sed -e "s@text/html@application/xhtml+xml@g" \
-             -e "s/\xa9/\©/ "                    \
              -i $$filename;                           \
    done;
 
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 73194612c..ed44374ea 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -6,6 +6,7 @@
   <!-- Convenient entity for "Systemd" or "Udev" -->
   <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
                          <phrase revision='sysv'>Udev</phrase>">
+  <!ENTITY bdb "<ulink url='https://www.oracle.com/database/technologies/related/berkeleydb.html'>Berkeley DB</ulink>">
 ]>
 
 <appendix id="appendixc" xreflabel="Appendix C">
@@ -29,10 +30,7 @@
   in addition to those on the first list, need to be available in order to run
   the test suites. The fourth list of dependencies are packages that require
   this package to be built and installed in its final location before they are
-  built and installed. In most cases, this is because these packages will hard
-  code paths to binaries within their scripts. If not built in a certain order,
-  this could result in paths of /tools/bin/[binary] being placed inside scripts
-  installed to the final system. This is obviously not desirable.</para>
+  built and installed.</para>
 
   <para>The last list of dependencies are optional packages that are not
   addressed in LFS, but could be useful to the user. These packages may have
@@ -1486,7 +1484,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            &bdb;,
             <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
             <ulink url="&github;/libbpf/libbpf">libbpf</ulink>,
             <ulink url="&blfs-book;basicnet/libmnl.html">libmnl</ulink>, and
@@ -2486,7 +2484,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
+            &bdb;
           </seg>
         </seglistitem>
       </segmentedlist>
@@ -2655,7 +2653,7 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            &bdb;,
             <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
             <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
             <ulink url="&blfs-book;general/tk.html">Tk</ulink>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8ad5949fb..11df22160 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,82 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2023-12-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Modify commands for install Python docs to avoid
+          too restrictive permissions on the files and dirs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision='sysv'>
+      <para>2023-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Restore NIC naming based on physical system
+          characteristics.  Fixes
+          <ulink url='&lfs-ticket-root;5386'>#5386</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2023-11-30</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Update to vim-9.0.2136. Addresses
+           <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20231117. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.7.3.  Fixes
+          <ulink url='&lfs-ticket-root;5385'>#5385</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wheel-0.42.0 (Python Module).  Fixes
+          <ulink url='&lfs-ticket-root;5384'>#5384</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.38.2.  Fixes
+          <ulink url='&lfs-ticket-root;5383'>#5383</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pkgconf-2.1.0.  Fixes
+          <ulink url='&lfs-ticket-root;5382'>#5382</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to readline patches 002 through 007.  Fixes
+          <ulink url='&lfs-ticket-root;5381'>#5381</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.2.0.  Fixes
+          <ulink url='&lfs-ticket-root;5380'>#5380</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to setuptools-69.0.2.  Fixes
+          <ulink url='&lfs-ticket-root;5379'>#5379</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.6.3.  Fixes
+          <ulink url='&lfs-ticket-root;5378'>#5378</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-1.3.0.  Fixes
+          <ulink url='&lfs-ticket-root;5377'>#5377</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.22.4.  Fixes
+          <ulink url='&lfs-ticket-root;5376'>#5376</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-11-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b2e665534..50d8a6061 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -153,7 +153,7 @@
       <para>Libcap-&libcap-version;</para>
     </listitem>-->
     <listitem>
-      <para>Libelf-&elfutils-version; (from elfutils)</para>
+      <para>Libelf from Elfutils-&elfutils-version;</para>
     </listitem>
     <!--<listitem>
       <para>Libffi-&libffi-version;</para>
@@ -204,11 +204,11 @@
       <para>Patch-&patch-version;</para>
     </listitem>-->
     <listitem>
+      <para>Perl-&perl-version;</para>
+    </listitem>
+    <listitem>
       <para>Pkgconf-&pkgconf-version;</para>
     </listitem>
-    <!--<listitem>
-      <para>Perl-&perl-version;</para>
-    </listitem>-->
     <listitem>
       <para>Procps-ng-&procps-ng-version;</para>
     </listitem>
@@ -252,7 +252,7 @@
       <para>Tzdata-&tzdata-version;</para>
     </listitem>-->
     <!--<listitem revision="sysv">
-       <para>Udev-&systemd-version; (from systemd)</para>
+      <para>Udev from Systemd-&systemd-version;</para>
     </listitem>-->
     <listitem>
       <para>Util-linux-&util-linux-version;</para>
@@ -298,6 +298,10 @@
       <para>&glibc-upstream-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
@@ -312,6 +316,10 @@
       <para>glibc-2.38-memalign_fix-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>readline-8.2-upstream_fix-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index 2d8d6045f..61a655655 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -224,7 +224,7 @@ EOF</userinput></screen>
       Never pass a <parameter>-j</parameter> option without a number to
       <command>make</command> or set such an option in
       <envar>MAKEFLAGS</envar>.  Doing so will allow <command>make</command>
-      to spawn infinite build jobs and cause system stability issue.
+      to spawn infinite build jobs and cause system stability problems.
     </para>
   </important>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 9e7764ecf..8d7c8b1fe 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -78,7 +78,7 @@ popd</userinput></screen>
       <varlistentry>
         <term><parameter>--with-manpage-format=normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses installing compressed manual
+          <para>This prevents Ncurses from installing compressed manual
           pages, which may happen if the host distribution itself
           has compressed manual pages.</para>
         </listitem>
@@ -94,7 +94,7 @@ popd</userinput></screen>
       <varlistentry>
         <term><parameter>--without-normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses building and installing static C
+          <para>This prevents Ncurses from building and installing static C
           libraries.</para>
         </listitem>
       </varlistentry>
@@ -102,7 +102,7 @@ popd</userinput></screen>
       <varlistentry>
         <term><parameter>--without-debug</parameter></term>
         <listitem>
-          <para>This prevents Ncurses building and installing debug
+          <para>This prevents Ncurses from building and installing debug
           libraries.</para>
         </listitem>
       </varlistentry>
diff --git a/chapter07/chroot.xml b/chapter07/chroot.xml
index d7367c8ca..70f5717dd 100644
--- a/chapter07/chroot.xml
+++ b/chapter07/chroot.xml
@@ -34,7 +34,7 @@
     chapters.  The test suites of some packages (notably Autoconf, Libtool,
     and Tar) in &ch-final; are not affected by <envar>MAKEFLAGS</envar>, they
     use a <envar>TESTSUITEFLAGS</envar> environment variable instead. We
-    set set that here as well for running these test suites with multiple cores.
+    set that here as well for running these test suites with multiple cores.
   </para>
 
   <para>The <parameter>-i</parameter> option given to the <command>env</command>
diff --git a/chapter07/kernfs.xml b/chapter07/kernfs.xml
index 4757b257d..049f6e804 100644
--- a/chapter07/kernfs.xml
+++ b/chapter07/kernfs.xml
@@ -107,7 +107,7 @@ mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
       we must explicitly mount a tmpfs:</para>
 
 <screen><userinput>if [ -h $LFS/dev/shm ]; then
-  mkdir -pv $LFS/$(readlink $LFS/dev/shm)
+  (cd $LFS/dev; mkdir $(readlink shm))
 else
   mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm
 fi</userinput></screen>
diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml
index 8ab4744ad..309e5b2e9 100644
--- a/chapter08/dbus.xml
+++ b/chapter08/dbus.xml
@@ -56,7 +56,7 @@
             --disable-static                     \
             --disable-doxygen-docs               \
             --disable-xml-docs                   \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
+            --docdir=/usr/share/doc/dbus-&dbus-version; \
             --with-system-socket=/run/dbus/system_bus_socket</userinput></screen>
 
     <variablelist>
diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index bfc25331a..cd3e5a658 100644
--- a/chapter08/iproute2.xml
+++ b/chapter08/iproute2.xml
@@ -45,9 +45,6 @@
     be built since it depends on Berkeley DB, which is not installed in
     LFS. However, a directory and a man page for <command>arpd</command> will still
     be installed. Prevent this by running the commands shown below.
-    (If the <command>arpd</command> program is needed,
-    instructions for compiling Berkeley DB can be found in the BLFS book at
-    <ulink url="&blfs-book;server/db.html"/>.)
     </para>
 
 <screen><userinput remap="pre">sed -i /ARPD/d Makefile
diff --git a/chapter08/python.xml b/chapter08/python.xml
index f7bc19d47..62279880d 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -155,21 +155,21 @@ EOF
 
 <screen><userinput remap="install">install -v -dm755 /usr/share/doc/python-&python-version;/html
 
-tar --strip-components=1  \
-    --no-same-owner       \
-    --no-same-permissions \
-    -C /usr/share/doc/python-&python-version;/html \
-    -xvf ../python-&python-version;-docs-html.tar.bz2</userinput></screen>
+tar --no-same-owner \
+    -xvf ../python-&python-version;-docs-html.tar.bz2
+cp -R --no-preserve=mode python-&python-version;-docs-html/* \
+    /usr/share/doc/python-&python-version;/html</userinput></screen>
 
     <variablelist>
       <title>The meaning of the documentation install commands:</title>
 
     <varlistentry>
-      <term><option>--no-same-owner</option> and <option>--no-same-permissions</option></term>
+      <term><option>--no-same-owner</option> (tar) and <option>--no-preserve=mode</option> (cp)</term>
       <listitem>
         <para>Ensure the installed files have the correct ownership and
         permissions.  Without these options, <application>tar</application>
-        will install the package files with the upstream creator's values.
+        will install the package files with the upstream creator's values
+        and files would have restrictive permissions.
         </para>
       </listitem>
     </varlistentry>
diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index 100a18fc9..580c78203 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -55,6 +55,11 @@
 
  <screen><userinput remap="pre">sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in</userinput></screen>
 
+    <para>Adjust the hardcoded paths to network configuration files for the
+    standalone udev installation:</para>
+
+ <screen><userinput remap="pre">sed '/NETWORK_DIRS/s/systemd/udev/' -i src/basic/path-lookup.h</userinput></screen>
+
     <para>Prepare Udev for compilation:</para>
 
 <screen><userinput remap="configure">mkdir -p build
@@ -129,7 +134,7 @@ meson setup \
 
     <para>Install the package:</para>
 
-    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb,rules}.d
+    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb.d,rules.d,network}
 install -vm755 -d /usr/{lib,share}/pkgconfig
 install -vm755 udevadm                             /usr/bin/
 install -vm755 systemd-hwdb                        /usr/bin/udev-hwdb
@@ -144,7 +149,8 @@ install -vm644 $(find ../rules.d/*.rules \
                       -not -name '*power-switch*') /usr/lib/udev/rules.d/
 install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
 install -vm755 $(find src/udev \
-                      -type f -not -name '*.*')    /usr/lib/udev</userinput></screen>
+                      -type f -not -name '*.*')    /usr/lib/udev
+install -vm644 ../network/99-default.link          /usr/lib/udev/network</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS
     environment:</para>
@@ -159,13 +165,21 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
 <screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz                            \
     --no-same-owner --strip-components=1                              \
     -C /usr/share/man --wildcards '*/udev*' '*/libudev*'              \
+                                  '*/systemd.link.5'                  \
                                   '*/systemd-'{hwdb,udevd.service}.8
+
+sed 's|systemd/network|udev/network|'                                 \
+    /usr/share/man/man5/systemd.link.5                                \
+  > /usr/share/man/man5/udev.link.5
+
 sed 's/systemd\(\\\?-\)/udev\1/' /usr/share/man/man8/systemd-hwdb.8   \
                                > /usr/share/man/man8/udev-hwdb.8
+
 sed 's|lib.*udevd|sbin/udevd|'                                        \
     /usr/share/man/man8/systemd-udevd.service.8                       \
   > /usr/share/man/man8/udevd.8
-rm  /usr/share/man/man8/systemd-*.8</userinput></screen>
+
+rm /usr/share/man/man*/systemd*</userinput></screen>
 
   </sect2>
 
diff --git a/packages.ent b/packages.ent
index 214266fe8..33cbe9f39 100644
--- a/packages.ent
+++ b/packages.ent
@@ -57,10 +57,10 @@
 <!ENTITY bash-fin-du "52 MB">
 <!ENTITY bash-fin-sbu "1.1 SBU">
 
-<!ENTITY bc-version "6.7.2">
+<!ENTITY bc-version "6.7.3">
 <!ENTITY bc-size "456 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "27c217ea495f73758f548eb2c6e10244">
+<!ENTITY bc-md5 "a2e39a5be32330bc2166b0e501668178">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
 <!ENTITY bc-fin-du "7.7 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -245,10 +245,10 @@
 <!ENTITY gdbm-fin-du "13 MB">
 <!ENTITY gdbm-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY gettext-version "0.22.3">
-<!ENTITY gettext-size "9,997 KB">
+<!ENTITY gettext-version "0.22.4">
+<!ENTITY gettext-size "10,016 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "460b38ae5e520253dcd06165dd3e281f">
+<!ENTITY gettext-md5 "2d8507d003ef3ddd1c172707ffa97ed8">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-tmp-du "306 MB">
 <!ENTITY gettext-tmp-sbu "1.1 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20231107">
-<!ENTITY iana-etc-size "589 KB">
+<!ENTITY iana-etc-version "20231117">
+<!ENTITY iana-etc-size "588 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 "01331998d26d5beb592c12b06b2eeb24">
+<!ENTITY iana-etc-md5 "f26b37a03a211ddd4e9c7189191e2772">
 <!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">
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "6">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "3">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "136,730 KB">
+<!ENTITY linux-size "136,763 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "90291279ca684fb8cfa59b2ae75b6fe0">
+<!ENTITY linux-md5 "3a760f5ac7d37b62dda9a4ca89f5fd96">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
  allnoconfig + some configs we recommend for the users, rounded down to
@@ -494,10 +494,10 @@
 <!ENTITY markupsafe-fin-du "548 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "1.2.3">
-<!ENTITY meson-size "2,134 KB">
+<!ENTITY meson-version "1.3.0">
+<!ENTITY meson-size "2,171 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "69da4c63ef06c9d3bcc00ce89abb306f">
+<!ENTITY meson-md5 "35dc15e4f94ca5fd30dbe2d88a672254">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "42 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -536,10 +536,10 @@
 <!ENTITY ninja-fin-du "75 MB">
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "3.1.4">
-<!ENTITY openssl-size "15,205 KB">
+<!ENTITY openssl-version "3.2.0">
+<!ENTITY openssl-size "17,284 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "653ad58812c751b887e8ec37e02bba70">
+<!ENTITY openssl-md5 "7903549a14abebc5c323ce4e85f2cbb2">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "587 MB">
 <!ENTITY openssl-fin-sbu "3.0 SBU">
@@ -556,22 +556,22 @@
 
 <!ENTITY perl-version-major "5">
 <!ENTITY perl-version-minor "38">
-<!ENTITY perl-version-patch "0">
+<!ENTITY perl-version-patch "2">
 <!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 "13,248 KB">
+<!ENTITY perl-size "13,359 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "e1c8aaec897dd386c741f97eef9f2e87">
+<!ENTITY perl-md5 "d3957d75042918a23ec0abac4a2b7e0a">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-tmp-du "280 MB">
 <!ENTITY perl-tmp-sbu "0.6 SBU">
 <!ENTITY perl-fin-du "239 MB">
 <!ENTITY perl-fin-sbu "7.1 SBU">
 
-<!ENTITY pkgconf-version "2.0.3">
-<!ENTITY pkgconf-size "304 KB">
+<!ENTITY pkgconf-version "2.1.0">
+<!ENTITY pkgconf-size "305 KB">
 <!ENTITY pkgconf-url "https://distfiles.ariadne.space/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
-<!ENTITY pkgconf-md5 "b82ca48ed3097adfa007ee71489b6719">
+<!ENTITY pkgconf-md5 "0f2eadbb9dea5aed95147272ae1592cc">
 <!ENTITY pkgconf-home "http://pkgconf.org/">
 <!ENTITY pkgconf-fin-du "4.6 MB">
 <!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
@@ -628,10 +628,10 @@
 <!ENTITY sed-fin-du "30 MB">
 <!ENTITY sed-fin-sbu "0.3 SBU">
 
-<!ENTITY setuptools-version "68.2.2">
-<!ENTITY setuptools-size "2,152 KB">
+<!ENTITY setuptools-version "69.0.2">
+<!ENTITY setuptools-size "2,168 KB">
 <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-<!ENTITY setuptools-md5 "d967ca2ba7f46db887daee2d5c9bd6a2">
+<!ENTITY setuptools-md5 "32bcc14eb830a13fbf33e053286f1081">
 <!ENTITY setuptools-home "&pypi-home;/setuptools/">
 <!ENTITY setuptools-fin-du "30 MB">
 <!ENTITY setuptools-fin-sbu "0.1 SBU">
@@ -735,21 +735,21 @@
 <!ENTITY util-linux-fin-du "310 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.0.2103">
+<!ENTITY vim-version "9.0.2136">
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim90">
-<!ENTITY vim-size "11,193 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 "1af1d018026234d085a82348703461ce">
+<!ENTITY vim-size "16,989 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 "8dcf113cb690bcdd13d75a4e7c2e3a62">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "229 MB">
 <!ENTITY vim-fin-sbu "2.3 SBU">
 
-<!ENTITY wheel-version "0.41.3">
+<!ENTITY wheel-version "0.42.0">
 <!ENTITY wheel-size "97 KB">
 <!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
-<!ENTITY wheel-md5 "c66db2f3a50d5659994fa974138d4002">
+<!ENTITY wheel-md5 "802ad6e5f9336fcb1c76b7593f0cd22d">
 <!ENTITY wheel-home "&pypi-home;/wheel/">
 <!ENTITY wheel-fin-du "1.5 MB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 4107b2dc2..13f291e0f 100644
--- a/patches.ent
+++ b/patches.ent
@@ -26,9 +26,9 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fix-1.patch">
-<!ENTITY readline-fixes-patch-md5 "dd1764b84cfca6b677f44978218a75da">
-<!ENTITY readline-fixes-patch-size "1.3 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-2.patch">
+<!ENTITY readline-fixes-patch-md5 "d2477ebe908cc99763d90dde7fd9549a">
+<!ENTITY readline-fixes-patch-size "5.7 KB">
 
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">
diff --git a/stylesheets/lfs-xsl/chunk-slave.xsl b/stylesheets/lfs-xsl/chunk-slave.xsl
index dab359d1d..1482ae351 100644
--- a/stylesheets/lfs-xsl/chunk-slave.xsl
+++ b/stylesheets/lfs-xsl/chunk-slave.xsl
@@ -10,9 +10,6 @@
   <!-- Upstream XHTML presentation templates -->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
 
-  <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
-
   <!-- Including our customized elements templates -->
   <xsl:include href="common.xsl"/>
   <xsl:include href="xhtml/lfs-admon.xsl"/>
diff --git a/tidy.conf b/tidy.conf
index 9db8e5f92..fc3672899 100644
--- a/tidy.conf
+++ b/tidy.conf
@@ -1,8 +1,6 @@
 indent-spaces: 2
 wrap: 78
 tab-size: 8
-input-encoding: latin1
-output-encoding: latin1
 write-back: yes
 markup: yes
 indent: yes