Index: archive/librep.xml
===================================================================
--- archive/librep.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
+++ archive/librep.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -0,0 +1,152 @@
+<?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;
+
+  <!ENTITY librep-download-http "https://download.tuxfamily.org/librep/librep_&librep-version;.tar.xz">
+  <!ENTITY librep-download-ftp " ">
+  <!ENTITY librep-md5sum "036195b371006848e29ed6f50ddc8475">
+  <!ENTITY librep-size "840 KB">
+  <!ENTITY librep-buildsize "10 MB">
+  <!ENTITY librep-time "0.3 SBU">
+]>
+
+<sect1 id="librep" xreflabel="librep-&librep-version;">
+  <?dbhtml filename="librep.html" ?>
+
+
+  <title>Librep-&librep-version;</title>
+
+  <indexterm zone="librep">
+    <primary sortas="a-Librep">Librep</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Librep</title>
+
+    <para>
+      The <application>librep</application> package contains a Lisp system.
+      This is useful for scripting or for applications that may use the Lisp
+      interpreter as an extension language.
+    </para>
+
+    &lfs120_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&librep-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&librep-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &librep-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &librep-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &librep-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &librep-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+<!--
+    <bridgehead renderas="sect3">Librep Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libffi"/>
+    </para>
+-->
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Librep</title>
+
+    <para>
+      Install <application>librep</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>sed -i '5043,5044 d' libtool &amp;&amp;
+make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>rep, <!--rep-config, -->rep-remote, rep-xgettext, and repdoc</seg>
+        <seg>librep.so and numerous modules installed in the /usr/lib/rep
+        hierarchy</seg>
+        <seg>/usr/lib/rep, /usr/share/emacs/site-lisp, and /usr/share/rep</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rep">
+        <term><command>rep</command></term>
+        <listitem>
+          <para>
+            is the Lisp interpreter
+          </para>
+          <indexterm zone="librep rep">
+            <primary sortas="b-rep">rep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="librep-lib">
+        <term><filename class="libraryfile">librep.so</filename></term>
+        <listitem>
+          <para>
+            contains the functions necessary for the Lisp interpreter
+          </para>
+          <indexterm zone="librep librep-lib">
+            <primary sortas="c-librep">librep.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/volume_key.xml
===================================================================
--- archive/volume_key.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
+++ archive/volume_key.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -0,0 +1,207 @@
+<?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;
+
+  <!ENTITY volume_key-download-http "https://github.com/felixonmars/volume_key/archive/volume_key-&volume_key-version;.tar.gz">
+  <!ENTITY volume_key-download-ftp  " ">
+  <!ENTITY volume_key-md5sum        "d1c76f24e08ddd8c1787687d0af5a814">
+  <!ENTITY volume_key-size          "196 KB">
+  <!ENTITY volume_key-buildsize     "11 MB">
+  <!ENTITY volume_key-time          "0.2 SBU">
+]>
+
+<sect1 id="volume_key" xreflabel="volume_key-&volume_key-version;">
+  <?dbhtml filename="volume_key.html"?>
+
+
+  <title>volume_key-&volume_key-version;</title>
+
+  <indexterm zone="volume_key">
+    <primary sortas="a-volume_key">volume_key</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to volume_key</title>
+
+    <para>
+      The <application>volume_key</application> package provides
+      a library for manipulating storage volume encryption keys and storing
+      them separately from volumes to handle forgotten passphrases.
+    </para>
+
+    &lfs120_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&volume_key-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&volume_key-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &volume_key-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &volume_key-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &volume_key-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &volume_key-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">volume_key Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cryptsetup"/>,
+      <xref linkend="glib2"/>,
+      <!-- To editors: if GnuPG is not installed, a wrong path to gpg will
+           be hard-coded into the library.  Even if GnuPG is installed, we
+           still need the 's/gpg2/gpg/' sed below.  I can't find an elegant
+           way to specify the path manually (so I can't make it a runtime
+           dependency).  -->
+	  <xref linkend="gnupg2"/>,
+      <xref linkend="gpgme"/>, and
+      <xref linkend="nss"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="swig"/>
+    </para>
+<!-- We prevent using Python2, so do not advertise it
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python2"/>
+    </para>
+-->
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of volume_key</title>
+
+    <note>
+      <para>
+        This package expands to the directory
+        volume_key-volume_key-&volume_key-version;.
+      </para>
+    </note>
+
+    <para>
+      Tell the building system how to locate GPGME and GnuPG correctly:
+    </para>
+
+<screen><userinput remap='pre'>sed -e '/AM_PATH_GPGME/iAM_PATH_GPG_ERROR' \
+    -e 's/gpg2/gpg/' -i configure.ac</userinput></screen>
+
+    <para>
+      Install <application>volume_key</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>autoreconf -fiv              &amp;&amp;
+./configure --prefix=/usr    \
+            --without-python &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--without-python</parameter>: This parameter prevents building
+      the <application>Python 2</application> bindings, if <xref
+      linkend="python2"/> is installed.
+    </para>
+
+    <para>
+      <option>--without-python3</option>: Use this option if you do not want
+      to build the <application>Python 3</application> bindings. In this case,
+      <xref linkend="swig"/> is not needed.
+    </para>
+
+  </sect2>
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          volume_key
+        </seg>
+        <seg>
+          libvolume_key.so
+        </seg>
+        <seg>
+          /usr/include/volume_key
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="volume_key-prog">
+        <term><command>volume_key</command></term>
+        <listitem>
+          <para>
+            manages encrypted volume keys and passphrases
+          </para>
+          <indexterm zone="volume_key volume_key-prog">
+            <primary sortas="b-volume_key">volume_key</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="volume_key-lib">
+        <term><filename class="libraryfile">volume_key.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for managing encrypted volume keys
+          </para>
+          <indexterm zone="volume_key volume_key-lib">
+            <primary sortas="c-volume_key">volume_key.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/genlib/libblockdev.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -8,7 +8,7 @@
     "https://github.com/storaged-project/libblockdev/releases/download/&libblockdev-version;-1/libblockdev-&libblockdev-version;.tar.gz">
   <!ENTITY libblockdev-download-ftp " ">
-  <!ENTITY libblockdev-md5sum        "b03d1b4def6962aa2e3eb93b50c22163">
+  <!ENTITY libblockdev-md5sum        "fb4cd3812b7b5a8f2bd950799fbd37f6">
   <!ENTITY libblockdev-size          "1.0 MB">
-  <!ENTITY libblockdev-buildsize     "14 MB">
+  <!ENTITY libblockdev-buildsize     "13 MB">
   <!ENTITY libblockdev-time          "0.1 SBU">
 ]>
@@ -94,5 +94,6 @@
       <xref linkend="mdadm"/>,
       <xref linkend="parted"/>,
-      <xref linkend="volume_key"/>,
+      <ulink url="https://github.com/felixonmars/volume_key">volume_key</ulink>,
+<!--      <xref linkend="volume_key"/>,-->
 <!--      <ulink url="https://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>, -->
 <!--      <ulink url="https://bcachefs.org/">bcachefs</ulink>, -->
@@ -149,7 +150,5 @@
     <para>
       <parameter>--without-escrow</parameter>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="volume_key"/> installed.  Remove it if you've installed
-      <xref linkend="volume_key"/>.
+      <application>libblockdev</application> without volume_key installed.  
     </para>
 
Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/genutils/highlight.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -7,5 +7,5 @@
   <!ENTITY highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
   <!ENTITY highlight-download-ftp  " ">
-  <!ENTITY highlight-md5sum        "cc5f3a857aa6c6d9f23ea3e36522f959">
+  <!ENTITY highlight-md5sum        "332aef847b322462953717a7593591c0">
   <!ENTITY highlight-size          "1.4 MB">
   <!ENTITY highlight-buildsize     "24 MB (with gui)">
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/graphlib/freetype2.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -7,7 +7,7 @@
   <!ENTITY freetype2-download-http "&sourceforge-dl;/freetype/freetype-&freetype2-version;.tar.xz">
   <!--<!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.xz">-->
-  <!ENTITY freetype2-md5sum        "e4c3f0d8453a2a7993ae784912d6f19a">
+  <!ENTITY freetype2-md5sum        "1f625f0a913c449551b1e3790a1817d7">
   <!ENTITY freetype2-size          "2.4 MB">
-  <!ENTITY freetype2-buildsize     "49 MB (with additional documentation)">
+  <!ENTITY freetype2-buildsize     "33 MB (with additional documentation)">
   <!ENTITY freetype2-time          "0.2 SBU (with additional documentation)">
 
@@ -15,5 +15,5 @@
   <!ENTITY freetype2-doc-download-http "&sourceforge-dl;/freetype/freetype-doc-&freetype2-doc-version;.tar.xz">
   <!--<!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-doc-version;.tar.xz">-->
-  <!ENTITY freetype2-doc-md5sum        "9eaaf193b0493297d92cd435cd850598">
+  <!ENTITY freetype2-doc-md5sum        "e6466f08934ebf2d7f711b0464d7a6cf">
   <!ENTITY freetype2-doc-size          "2.1 MB">
 ]>
Index: general/prog/cbindgen.xml
===================================================================
--- general/prog/cbindgen.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/prog/cbindgen.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY cbindgen-download-http "https://github.com/eqrion/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
+  <!ENTITY cbindgen-download-http "https://github.com/mozilla/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
   <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "6aa2991ca8411f9ebf9961e8b873e884">
-  <!ENTITY cbindgen-size          "204 KB">
+  <!ENTITY cbindgen-md5sum        "7762e0084c6b11b69302b62becacf18a">
+  <!ENTITY cbindgen-size          "212 KB">
   <!ENTITY cbindgen-buildsize     "121 MB (add 596 MB for tests)">
   <!ENTITY cbindgen-time          "0.5 SBU (add 0.4 SBU for tests), both on a 4-core machine">
@@ -88,8 +88,6 @@
 
     <para>
-      <!-- 0.16.0 log shows 2 suites where both tests pass, in the third
-           3 of 6 fail. The suite names are impenetrable. -->
       To test the results, issue: <command>cargo test</command>.
-      Three tests in the final suite are known to fail.
+      Three tests in <filename>profile.rs</filename> are known to fail.
     </para>
 
Index: neral/prog/librep.xml
===================================================================
--- general/prog/librep.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?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;
-
-  <!ENTITY librep-download-http "https://download.tuxfamily.org/librep/librep_&librep-version;.tar.xz">
-  <!ENTITY librep-download-ftp " ">
-  <!ENTITY librep-md5sum "036195b371006848e29ed6f50ddc8475">
-  <!ENTITY librep-size "840 KB">
-  <!ENTITY librep-buildsize "10 MB">
-  <!ENTITY librep-time "0.3 SBU">
-]>
-
-<sect1 id="librep" xreflabel="librep-&librep-version;">
-  <?dbhtml filename="librep.html" ?>
-
-
-  <title>Librep-&librep-version;</title>
-
-  <indexterm zone="librep">
-    <primary sortas="a-Librep">Librep</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Librep</title>
-
-    <para>
-      The <application>librep</application> package contains a Lisp system.
-      This is useful for scripting or for applications that may use the Lisp
-      interpreter as an extension language.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&librep-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&librep-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &librep-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &librep-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &librep-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &librep-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Librep Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libffi"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Librep</title>
-
-    <para>
-      Install <application>librep</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>sed -i '5043,5044 d' libtool &amp;&amp;
-make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rep, <!--rep-config, -->rep-remote, rep-xgettext, and repdoc</seg>
-        <seg>librep.so and numerous modules installed in the /usr/lib/rep
-        hierarchy</seg>
-        <seg>/usr/lib/rep, /usr/share/emacs/site-lisp, and /usr/share/rep</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rep">
-        <term><command>rep</command></term>
-        <listitem>
-          <para>
-            is the Lisp interpreter
-          </para>
-          <indexterm zone="librep rep">
-            <primary sortas="b-rep">rep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librep-lib">
-        <term><filename class="libraryfile">librep.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions necessary for the Lisp interpreter
-          </para>
-          <indexterm zone="librep librep-lib">
-            <primary sortas="c-librep">librep.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/prog/prog.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gitserver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="llvm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua.xml"/>
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/prog/python3.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -174,5 +174,5 @@
     <para>
       To test the result, issue <command>make test</command>.
-      Some tests may need an Internet connection. One tests, test_distutils
+      Some tests may need an Internet connection. One test, test_distutils,
       is known to fail.
     </para>
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/prog/rust.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -7,5 +7,5 @@
   <!ENTITY rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.xz">
   <!ENTITY rust-download-ftp  " ">
-  <!ENTITY rust-md5sum        "b6f9973de878e37a589f0989e4138480">
+  <!ENTITY rust-md5sum        "4125b8bf1b0bc6a520f8ec21252322e7">
   <!ENTITY rust-size          "145 MB">
   <!ENTITY rust-buildsize     "8.9 GB (292 MB installed); add 6.4 GB if running the tests">
@@ -77,5 +77,5 @@
       a combination of adding the switch <literal>--jobs &lt;N&gt;</literal>
       (e.g. '--jobs 4' to limit to 4 processors) on each invocation of
-      <command>python3 ./x.py</command> <emphasis>and</emphasis> using an
+      <command>python3 x.py</command> <emphasis>and</emphasis> using an
       environment variable <envar>CARGO_BUILD_JOBS=&lt;N&gt;</envar>. At the
       moment this is not effective when some of the rustc tests are run.
@@ -313,7 +313,5 @@
 # NB the output of llvm-config (i.e. help options) may be
 # dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"
-
-</literal>
+llvm-config = "/usr/bin/llvm-config"</literal>
 EOF</userinput></screen>
 
@@ -336,5 +334,5 @@
 <screen><userinput>{ [ ! -e /usr/include/libssh2.h ] ||
   export LIBSSH2_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
-python3 ./x.py build</userinput></screen>
+python3 x.py build</userinput></screen>
 
     <note>
@@ -353,6 +351,8 @@
     </para>
 
-<screen remap="test"><userinput>SSL_CERT_DIR=/etc/ssl/certs \
-python3 ./x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></screen>
+<screen remap="test"><userinput>mkdir -pv .github/workflows                    &amp;&amp;
+python3 x.py run src/tools/expand-yaml-anchors &amp;&amp;
+SSL_CERT_DIR=/etc/ssl/certs                    \
+python3 x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></screen>
 
     <!-- https://github.com/rust-lang/rust/issues/112209
@@ -439,5 +439,5 @@
     </note>
 
-<screen role='root'><userinput>python3 ./x.py install</userinput></screen>
+<screen role='root'><userinput>python3 x.py install</userinput></screen>
 
     <!-- TODO: Report to upstream if this persists in the next release -->
Index: general/sysutils/bubblewrap.xml
===================================================================
--- general/sysutils/bubblewrap.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ general/sysutils/bubblewrap.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -80,4 +80,24 @@
   </sect2>
 
+  <sect2 role="kernel" id="bubblewrap-kernel">
+    <title>Kernel Configuration</title>
+
+    <para>
+      When this package began, upstream expected it could be installed
+      suid-root. That was a long time ago, suid-root is generally considered
+      a bad idea. As well as the default namespaces, this package requires the
+      optional User namespace to be enabled. If that has not yet been enabled,
+      select the following option in the kernel configuration and recompile the
+      kernel:
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="bubblewrap-kernel.xml"/>
+
+    <indexterm zone="bubblewrap bubblewrap-kernel">
+      <primary sortas="d-bubblewrap">bubblewrap</primary>
+    </indexterm>
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Bubblewrap</title>
@@ -119,24 +139,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="kernel" id="bubblewrap-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      When this package began, upstream expected it could be installed
-      suid-root. That was a long time ago, suid-root is generally considered
-      a bad idea. As well as the default namespaces, this package requires the
-      optional User namespace to be enabled. If that has not yet been enabled,
-      select the following option in the kernel configuration and recompile the
-      kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="bubblewrap-kernel.xml"/>
-
-    <indexterm zone="bubblewrap bubblewrap-kernel">
-      <primary sortas="d-bubblewrap">bubblewrap</primary>
-    </indexterm>
   </sect2>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ introduction/welcome/changelog.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -54,4 +54,40 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to at-spi2-core-2.48.4. Fixes
+          <ulink url="&blfs-ticket-root;18505">#18505</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Archive volume_key. Fixes
+          <ulink url="&blfs-ticket-root;18487">#18487</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libblockdev-3.0.3. Fixes
+          <ulink url="&blfs-ticket-root;18490">#18490</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xscreensaver-6.07. Fixes
+          <ulink url="&blfs-ticket-root;18483">#18483</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to highlight-4.8. Fixes
+          <ulink url="&blfs-ticket-root;18470">#18470</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xf86-input-libinput-1.4.0. Fixes
+          <ulink url="&blfs-ticket-root;18463">#18463</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to freetype-2.13.2. Fixes
+          <ulink url="&blfs-ticket-root;18461">#18461</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to cbindgen-0.25.0. Fixes
+          <ulink url="&blfs-ticket-root;18467">#18467</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to rustc-1.72.0. Fixes
+          <ulink url="&blfs-ticket-root;18456">#18456</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[rahul] - Update to libnl-3.8.0. Fixes
           <ulink url="&blfs-ticket-root;18476">#18476</ulink>.</para>
@@ -72,5 +108,5 @@
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Archive sawfish and its dependency rep-gtk. Fixes
+          <para>[bdubbs] - Archive sawfish and its dependencies rep-gtk and librep. Fixes
           <ulink url="&blfs-ticket-root;18453">#18453</ulink>.</para>
         </listitem>
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ networking/mailnews/mutt.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -146,8 +146,9 @@
       <application>Mutt</application> requires a group named
       <systemitem class="groupname">mail</systemitem>.  You can
-      add this group, if it does not exist, with this command:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 34 mail</userinput></screen>
+      add this group, if it does not exist, with this command
+      (as the &root; user):
+    </para>
+<!-- nodump because group mail should have been created in lfs -->
+<screen role="nodump"><userinput>groupadd -g 34 mail</userinput></screen>
 
     <para>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ networking/netprogs/samba.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -244,9 +244,9 @@
 
     <para>
-      Fix a hard coded path to Python 3 interpreter:
+      Fix hard coded paths to Python 3 interpreter:
     </para>
 
 <screen><userinput>sed '1s@^.*$@#!/usr/bin/python3@' \
-    -i ./bin/default/source4/scripting/bin/samba-gpupdate.inst</userinput></screen>
+    -i ./bin/default/source4/scripting/bin/*.inst</userinput></screen>
 
     <para>
Index: packages.ent
===================================================================
--- packages.ent	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ packages.ent	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -39,5 +39,5 @@
 <!ENTITY sudo-version                 "1.9.14p3">
 <!ENTITY tripwire-version             "2.4.3.7">
-<!ENTITY volume_key-version           "0.3.12">
+<!--<!ENTITY volume_key-version           "0.3.12">-->
 
 <!-- Chapter 5 -->
@@ -127,5 +127,5 @@
 <!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.8.0">
-<!ENTITY libblockdev-version          "3.0.2">
+<!ENTITY libblockdev-version          "3.0.3">
 <!ENTITY libbytesize-version          "2.9">
 <!ENTITY libcloudproviders-version    "0.3.2">
@@ -198,5 +198,5 @@
 <!ENTITY babl-version                 "0.1.106">
 <!ENTITY exiv2-version                "0.28.0">
-<!ENTITY freetype2-version            "2.13.1">
+<!ENTITY freetype2-version            "2.13.2">
 <!ENTITY fontconfig-version           "2.14.2">  <!-- stable lt .90 micro version -->
 <!ENTITY fribidi-version              "1.0.13">
@@ -247,5 +247,5 @@
 <!ENTITY gtk-doc-major                "1.33">
 <!ENTITY gtk-doc-version              "1.33.2">
-<!ENTITY highlight-version            "4.7">
+<!ENTITY highlight-version            "4.8">
 <!ENTITY ibus-version                 "1.5.28">
 <!ENTITY imagemagick-version          "7.1.1">
@@ -309,5 +309,5 @@
 <!-- Chapter 13 -->
 <!ENTITY autoconf213-version          "2.13">
-<!ENTITY cbindgen-version             "0.24.3">
+<!ENTITY cbindgen-version             "0.25.0">
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.27">
@@ -347,5 +347,5 @@
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
 <!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
-<!ENTITY rust-version                 "1.71.1">
+<!ENTITY rust-version                 "1.72.0">
 <!ENTITY scons-version                "4.5.2">
 <!ENTITY slang-version                "2.3.3">
@@ -793,6 +793,6 @@
 <!ENTITY atk-version                  "&atk-minor;.0">
 <!ENTITY atkmm-version                "2.28.3">
-<!ENTITY at-spi2-core-version         "2.48.3">
-<!ENTITY at-spi2-atk-version          "2.38.0">
+<!ENTITY at-spi2-core-version         "2.48.4">
+<!-- <!ENTITY at-spi2-atk-version          "2.38.0">-->
 <!ENTITY cairo-minor                  "1.17">
 <!ENTITY cairo-version                "&cairo-minor;.6">
@@ -1010,5 +1010,5 @@
 <!ENTITY xarchiver-version            "0.5.4.21">
 <!ENTITY xdg-utils-version            "1.1.3">
-<!ENTITY xscreensaver-version         "6.06">
+<!ENTITY xscreensaver-version         "6.07">
 
 <!-- Part XI -->
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ postlfs/security/gpgme.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -118,5 +118,5 @@
     -->
 <screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
+cd    build &amp;&amp;
 
 ../configure --prefix=/usr --disable-gpg-test &amp;&amp;
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ postlfs/security/security.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -87,5 +87,5 @@
   <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tripwire.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="volume_key.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="volume_key.xml"/>-->
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ postlfs/security/shadow.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -10,5 +10,5 @@
   <!ENTITY shadow-size          "1.7 MB">
   <!ENTITY shadow-buildsize     "49 MB">
-  <!ENTITY shadow-time          "less than 0.1 SBUi (with parallelism=4)">
+  <!ENTITY shadow-time          "less than 0.1 SBU (with parallelism=4)">
 ]>
 
Index: stlfs/security/volume_key.xml
===================================================================
--- postlfs/security/volume_key.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?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;
-
-  <!ENTITY volume_key-download-http "https://github.com/felixonmars/volume_key/archive/volume_key-&volume_key-version;.tar.gz">
-  <!ENTITY volume_key-download-ftp  " ">
-  <!ENTITY volume_key-md5sum        "d1c76f24e08ddd8c1787687d0af5a814">
-  <!ENTITY volume_key-size          "196 KB">
-  <!ENTITY volume_key-buildsize     "11 MB">
-  <!ENTITY volume_key-time          "0.2 SBU">
-]>
-
-<sect1 id="volume_key" xreflabel="volume_key-&volume_key-version;">
-  <?dbhtml filename="volume_key.html"?>
-
-
-  <title>volume_key-&volume_key-version;</title>
-
-  <indexterm zone="volume_key">
-    <primary sortas="a-volume_key">volume_key</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to volume_key</title>
-
-    <para>
-      The <application>volume_key</application> package provides
-      a library for manipulating storage volume encryption keys and storing
-      them separately from volumes to handle forgotten passphrases.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&volume_key-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&volume_key-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &volume_key-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &volume_key-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &volume_key-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &volume_key-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">volume_key Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="glib2"/>,
-      <!-- To editors: if GnuPG is not installed, a wrong path to gpg will
-           be hard-coded into the library.  Even if GnuPG is installed, we
-           still need the 's/gpg2/gpg/' sed below.  I can't find an elegant
-           way to specify the path manually (so I can't make it a runtime
-           dependency).  -->
-	  <xref linkend="gnupg2"/>,
-      <xref linkend="gpgme"/>, and
-      <xref linkend="nss"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="swig"/>
-    </para>
-<!-- We prevent using Python2, so do not advertise it
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of volume_key</title>
-
-    <note>
-      <para>
-        This package expands to the directory
-        volume_key-volume_key-&volume_key-version;.
-      </para>
-    </note>
-
-    <para>
-      Tell the building system how to locate GPGME and GnuPG correctly:
-    </para>
-
-<screen><userinput remap='pre'>sed -e '/AM_PATH_GPGME/iAM_PATH_GPG_ERROR' \
-    -e 's/gpg2/gpg/' -i configure.ac</userinput></screen>
-
-    <para>
-      Install <application>volume_key</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoreconf -fiv              &amp;&amp;
-./configure --prefix=/usr    \
-            --without-python &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-python</parameter>: This parameter prevents building
-      the <application>Python 2</application> bindings, if <xref
-      linkend="python2"/> is installed.
-    </para>
-
-    <para>
-      <option>--without-python3</option>: Use this option if you do not want
-      to build the <application>Python 3</application> bindings. In this case,
-      <xref linkend="swig"/> is not needed.
-    </para>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          volume_key
-        </seg>
-        <seg>
-          libvolume_key.so
-        </seg>
-        <seg>
-          /usr/include/volume_key
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="volume_key-prog">
-        <term><command>volume_key</command></term>
-        <listitem>
-          <para>
-            manages encrypted volume keys and passphrases
-          </para>
-          <indexterm zone="volume_key volume_key-prog">
-            <primary sortas="b-volume_key">volume_key</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="volume_key-lib">
-        <term><filename class="libraryfile">volume_key.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for managing encrypted volume keys
-          </para>
-          <indexterm zone="volume_key volume_key-lib">
-            <primary sortas="c-volume_key">volume_key.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/x7driver-libinput.xml
===================================================================
--- x/installing/x7driver-libinput.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ x/installing/x7driver-libinput.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY xorg-libinput-driver-version "1.3.0">
+  <!ENTITY xorg-libinput-driver-version "1.4.0">
 
   <!ENTITY xorg-libinput-driver-download-http "&xorg-download-http;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.xz">
   <!ENTITY xorg-libinput-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.xz">
-  <!ENTITY xorg-libinput-driver-md5sum        "92e9a50c8e4001fd25c813ffb1c84235">
+  <!ENTITY xorg-libinput-driver-md5sum        "b52a1fc7456cf6595a9a1004287551a3">
   <!ENTITY xorg-libinput-driver-size          "320 KB">
-  <!ENTITY xorg-libinput-driver-buildsize     "3.8 MB (with tests)">
+  <!ENTITY xorg-libinput-driver-buildsize     "3.9 MB (with tests)">
   <!ENTITY xorg-libinput-driver-time          "less than 0.1 SBU (with tests)">
 ]>
Index: x/lib/at-spi2-core.xml
===================================================================
--- x/lib/at-spi2-core.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ x/lib/at-spi2-core.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -9,8 +9,8 @@
   <!ENTITY at-spi2-core-download-ftp
            "&gnome-download-ftp;/at-spi2-core/2.48/at-spi2-core-&at-spi2-core-version;.tar.xz">
-  <!ENTITY at-spi2-core-md5sum        "4ef1875d9e7035f672d494b997c892af">
-  <!ENTITY at-spi2-core-size          "541 KB">
-  <!ENTITY at-spi2-core-buildsize     "20 MB (with tests)">
-  <!ENTITY at-spi2-core-time          "less than 0.1 SBU (with tests, except if there is a timeout)">
+  <!ENTITY at-spi2-core-md5sum        "061aa76a656a2255c26e589bea2cbf9e">
+  <!ENTITY at-spi2-core-size          "544 KB">
+  <!ENTITY at-spi2-core-buildsize     "15 MB (with tests)">
+  <!ENTITY at-spi2-core-time          "0.2 SBU (with tests)">
 ]>
 
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ xsoft/graphweb/firefox.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -147,8 +147,6 @@
         Configuration Information,
       <xref linkend="python3"/> (rebuilt after installing <xref linkend="sqlite"/>),
-      <xref linkend="startup-notification"/>,
-      <xref linkend="unzip"/>,
-      <xref linkend="yasm"/>, and
-      <xref linkend="zip"/>
+      <xref linkend="startup-notification"/>, and
+      <xref linkend="unzip"/>
     </para>
 
@@ -159,5 +157,5 @@
       <xref linkend="libvpx"/>,
       <xref linkend="libwebp"/>,
-      <xref linkend="nasm"/>,
+      <xref linkend="nasm"/>, and
       <xref linkend="nss"/>
     </para>
@@ -181,4 +179,5 @@
       <xref linkend="wget"/>,
       <xref linkend="wireless_tools"/>,
+      <xref linkend="yasm"/>,
       <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>
     </para>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ xsoft/other/thunderbird.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -87,6 +87,5 @@
       the mozconfig; although it is now deprecated by mozilla),
       <xref linkend="python3"/> (rebuilt with the sqlite module),
-      <xref linkend="startup-notification"/>,
-      <xref linkend="zip"/>, and
+      <xref linkend="startup-notification"/>, and
       <xref linkend="unzip"/>
       <!--<xref linkend="yasm"/>-->
@@ -203,33 +202,4 @@
 ac_add_options --without-wasm-sandboxed-libraries</literal>
 EOF</userinput></screen>
-<!-- Fixed in 102.9
-    <para>
-      A change in cbindgen-0.24.2 causes a symbol to now be output by
-      cbindgen, but it has already been defined in a header. This sed
-      prevents the build from eventually failing:
-    </para>
-
-<screen><userinput>sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h</userinput></screen>
--->
-<!-- Not needed with clang
-     https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-    <para>
-      If building on a 32 bit machine, the following sed works around
-      an issue with an incompatible <quote>double</quote> type in one
-      header file:
-    </para>
-
-<screen><userinput>case "$(uname -m)" in
-    i?86) sed -e '/typedef[ ]*double/s/double/long double/' \
-              -i modules/fdlibm/src/math_private.h ;;
-esac</userinput></screen>
--->
-
-    <para>
-      Fix an issue occurring when building with GCC-13:
-    </para>
-
-<screen><userinput>sed -e '/&lt;exception&gt;/i#include &lt;cstdint&gt;' \
-    -i comm/third_party/rnp/src/libsexp/include/sexp/sexp-error.h</userinput></screen>
 
     <para>
Index: xsoft/other/xscreensaver.xml
===================================================================
--- xsoft/other/xscreensaver.xml	(revision f818fd68be428a89fd0dac4fad241af06c0cfb49)
+++ xsoft/other/xscreensaver.xml	(revision 61b59b58deeda4eea758de34054ad7f59cd56ba5)
@@ -7,7 +7,7 @@
   <!ENTITY xscreensaver-download-http "https://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "7e9437089cc8162a3cf9ff335633faed">
+  <!ENTITY xscreensaver-md5sum        "875aaa2f8894f38cd6a888dcd237bbd3">
   <!ENTITY xscreensaver-size          "25 MB">
-  <!ENTITY xscreensaver-buildsize     "255 MB">
+  <!ENTITY xscreensaver-buildsize     "267 MB">
   <!ENTITY xscreensaver-time          "0.3 SBU (Using parallelism=4)">
 ]>
@@ -91,4 +91,5 @@
     <para role="optional">
       <xref linkend="gdm"/>,
+      <xref linkend="ffmpeg"/>,
       <xref linkend="linux-pam"/>,
       <xref linkend="mitkrb"/>, and
