Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/genlib/glibmm.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -7,8 +7,8 @@
   <!ENTITY glibmm-download-http "&gnome-download-http;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
   <!ENTITY glibmm-download-ftp  "&gnome-download-ftp;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-md5sum        "ee8c00fd7f08ae59f6af38dfa599194a">
-  <!ENTITY glibmm-size          "7.2 MB">
-  <!ENTITY glibmm-buildsize     "88 MB (with tests)">
-  <!ENTITY glibmm-time          "0.5 SBU (Using parallelism=4; with tests)">
+  <!ENTITY glibmm-md5sum        "89c0ba07736d258b84bc201bd213fd69">
+  <!ENTITY glibmm-size          "7.3 MB">
+  <!ENTITY glibmm-buildsize     "89 MB (with tests)">
+  <!ENTITY glibmm-time          "0.7 SBU (Using parallelism=4; with tests)">
 ]>
 
Index: general/genlib/jansson.xml
===================================================================
--- general/genlib/jansson.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/genlib/jansson.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY jansson-download-http "https://digip.org/jansson/releases/jansson-&jansson-version;.tar.gz">
+  <!ENTITY jansson-download-http "https://github.com/akheron/jansson/releases/download/v&jansson-version;/jansson-&jansson-version;.tar.bz2">
   <!ENTITY jansson-download-ftp  " ">
-  <!ENTITY jansson-md5sum        "570af45b8203e95876d71fecd56cee20">
-  <!ENTITY jansson-size          "520 KB">
-  <!ENTITY jansson-buildsize     "7.8 MB">
-  <!ENTITY jansson-time          "0.1 SBU">
+  <!ENTITY jansson-md5sum        "3f90473d7d54ebd1cb6a2757396641df">
+  <!ENTITY jansson-size          "424 KB">
+  <!ENTITY jansson-buildsize     "5.6 MB (add 1.9 MB for tests">
+  <!ENTITY jansson-time          "0.1 SBU [with tests)">
 ]>
 
@@ -80,4 +80,11 @@
 
     <para>
+      First fix one of the tests:
+    </para>
+
+<screen><userinput>sed -e "/DT/s;| sort;| sed 's/@@libjansson.*//' &amp;;" \
+    -i test/suites/api/check-exports</userinput></screen>
+
+    <para>
       Install <application>jansson</application> by running the following
       commands:
Index: neral/genutils/asciidoc.xml
===================================================================
--- general/genutils/asciidoc.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ 	(revision )
@@ -1,181 +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 asciidoc-download-http "https://github.com/asciidoc/asciidoc-py3/releases/download/&asciidoc-version;/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "63621686c5235984ce03228563a6383b">
-  <!ENTITY asciidoc-size          "1.2 MB">
-  <!ENTITY asciidoc-buildsize     "6.3 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
-  <?dbhtml filename="asciidoc.html"?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Asciidoc-&asciidoc-version;</title>
-
-  <indexterm zone="asciidoc">
-    <primary sortas="a-asciidoc">asciidoc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Asciidoc</title>
-
-    <para>
-      The <application>Asciidoc</application> package is a text document
-      format for writing notes, documentation, articles, books, ebooks,
-      slideshows, web pages, man pages and blogs. AsciiDoc files can be
-      translated to many formats including HTML, PDF, EPUB, and man page.
-    </para>
-
-    &lfs110a_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&asciidoc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &asciidoc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &asciidoc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &asciidoc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &asciidoc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Asciidoc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (tests and runtime)</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="fop"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="lynx"/>,
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-      <ulink url="&w3m-url;">W3m</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/asciidoc"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Asciidoc</title>
-
-    <para>
-      First, fix a build problem if the optional dependencies are not installed:
-    </para>
-
-<screen><userinput remap='pre'>sed -i 's:doc/testasciidoc.1::' Makefile.in &amp;&amp;
-rm doc/testasciidoc.1.txt</userinput></screen>
-
-    <para>
-      Install <application>Asciidoc</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/asciidoc-&asciidoc-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!--To test the results, issue: <command>make test</command>-->
-      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>make install &amp;&amp;
-make docs</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          a2x (symlink to a2x.py),
-          a2x.py,
-          asciidoc (symlink to asciidoc.py), and
-          asciidoc.py
-        </seg>
-        <seg>None</seg>
-        <seg>/etc/asciidoc and
-             /usr/share/doc/asciidoc-&asciidoc-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a2x">
-        <term><command>a2x</command></term>
-        <listitem>
-          <para>
-            is a toolchain manager for AsciiDoc
-            (converts Asciidoc text files to other file formats)
-          </para>
-          <indexterm zone="asciidoc a2x">
-            <primary sortas="b-a2x">a2x</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asciidoc-prog">
-        <term><command>asciidoc</command></term>
-        <listitem>
-          <para>
-            converts an AsciiDoc text file to HTML or DocBook
-          </para>
-          <indexterm zone="asciidoc asciidoc-prog">
-            <primary sortas="b-asciidoc-prog">asciidoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/genutils/genutils.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -19,6 +19,7 @@
   </para>
 
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
-
+-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
 
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/genutils/graphviz.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.gz">
+  <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.bz2">
   <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "a5ef25639826bd4d9c040c96b61d6e52">
-  <!ENTITY graphviz-size          "29 MB">
-  <!ENTITY graphviz-buildsize     "206 MB">
+  <!ENTITY graphviz-md5sum        "d28da63d258a901cc0ea35b879c07db9">
+  <!ENTITY graphviz-size          "26 MB">
+  <!ENTITY graphviz-buildsize     "248 MB">
   <!ENTITY graphviz-time          "0.7 SBU (using parallelism=4)">
 ]>
@@ -73,28 +73,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <note>
-      <para>
-        The <application>graphviz</application> source tarball shown above
-        downloads to a non-versioned file name: graphviz.tar.gz.  It does
-        expand to a versioned directory, graphviz-&graphviz-version;/.
-        If you prefer to use a versioned tarball name, you can simply
-        rename it or download the package with:
-
-        <screen><userinput>wget -c &graphviz-download-http; \
-     -O graphviz-&graphviz-version;.tar.gz</userinput></screen>.
-        </para>
-      </note>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch to use <xref linkend="qt5"/>:
-          <ulink url="&patch-root;/graphviz-&graphviz-version;-qt5-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
 
@@ -215,24 +192,4 @@
     <title>Installation of Graphviz</title>
 
-<!-- For every major version of Ruby, this has to be tweaked. See #11606
-
-    <para>
-      If <xref linkend="ruby"/> is installed, and you want to build Ruby
-      bindings, fix ruby's detection:
-    </para>
-
-     Not sure about the above for version 2.42.1.  Seems to detect it OK.  I
-     didn't see any reference to the specific ruby version.
--->
-<!--<screen><userinput>sed -e '/ruby/s/1\.9/2.6/' -i configure.ac</userinput></screen>-->
-
-<!-- No patch required
-    <para>
-      If <xref linkend="qt5"/> is installed, and you want to build the
-      <command>gvedit</command> graph editor, issue:
-    </para>
-
-<screen><userinput>patch -p1 -i ../graphviz-&graphviz-version;-qt5-1.patch</userinput></screen>
--->
     <para>
       Install <application>Graphviz</application> by running the following
@@ -243,6 +200,5 @@
 
 ./autogen.sh              &amp;&amp;
-./configure --prefix=/usr \
-            --disable-php &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -354,5 +310,5 @@
           dot, dot2gxl, dot_builtins, dotty, edgepaint, fdp, gc, gml2gv,
           graphml2gv, gv2gml, gv2gxl, gvcolor, gvedit, gvgen, gvmap, gvmap.sh,
-          gvpack, gvpr, gxl2dot, gxl2gv, lefty, lneato, mm2gv, neato, nop,
+          gvpack, gvpr, gxl2dot, gxl2gv, lneato, mm2gv, neato, nop,
           osage, patchwork, prune, sccmap, sfdp, tred, twopi,
           unflatten, and vimdot
@@ -362,5 +318,5 @@
           libpathplan.so, libxdot.so, and several plugins in /usr/lib/graphviz.
           There are also several in subdirectories of
-          /usr/lib/{lua,perl5,php,<!--python&python2-majorver;-->,python&python3-majorver;,tcl8.6}.
+          /usr/lib/{lua,perl5, <!--php, -->python&python3-majorver;,tcl8.6}.
           Unfortunately, some libraries are duplicated.
         </seg>
Index: general/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/genutils/lsof.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -5,15 +5,11 @@
   %general-entities;
 
-<!-- <!ENTITY lsof-download-http "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_&lsof-version;.tar.bz2">
-<!ENTITY lsof-download-ftp " "> -->
 
-<!-- URL is for a mirror.  Change back to below if/when main site comes back. -->
-
-<!ENTITY lsof-download-http  "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_&lsof-version;.tar.gz">
+<!ENTITY lsof-download-http  "https://github.com/lsof-org/lsof/releases/download/&lsof-version;/lsof_&lsof-version;.linux.tar.bz2">
 <!ENTITY lsof-download-ftp  " ">
-<!ENTITY lsof-md5sum        "10e1353aa4bf2fd5bbed65db9ef6fd47">
-<!ENTITY lsof-size          "1.1 MB">
-<!ENTITY lsof-buildsize     "9.6 MB">
-<!ENTITY lsof-time          "less than 0.1 SBU">
+<!ENTITY lsof-md5sum        "2a007f86fb0207fbce3e9d7542e1041c">
+<!ENTITY lsof-size          "493 KB">
+<!ENTITY lsof-buildsize     "3.7 MB (add 600 KB for tests)">
+<!ENTITY lsof-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
 ]>
 
@@ -82,6 +78,26 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="nmap"/> (with a symbolic link <command>nc</command>
+      pointing to <command>ncat</command> in <filename class="directory">
+      /usr/bin</filename>; used in tests)
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/lsof"/></para>
+
+  </sect2>
+
+  <sect2 role="kernel" id="lsof-kernel">
+    <title>Kernel Configuration</title>
+
+    <para>
+      To run the tests, the following option  should be enabled in the kernel
+      configuration:
+    </para>
+
+<screen><literal>General setup  ---&gt;
+  [*] POSIX Message Queues    [CONFIG_POSIX_MQUEUE]</literal></screen>
 
   </sect2>
@@ -91,17 +107,25 @@
 
     <para>
-      The contents of the <application>lsof</application> tarball
-      include another tarball with the source code, which needs, in turn,
-      to be unpacked. Install <application>lsof</application> by running the
+      Install <application>lsof</application> by running the
       following commands:
     </para>
 
-<screen><userinput>tar -xf lsof_&lsof-version;_src.tar  &amp;&amp;
-cd lsof_&lsof-version;_src           &amp;&amp;
-./Configure -n linux       &amp;&amp;
-make CFGL="-L./lib -ltirpc"</userinput></screen>
+<screen><userinput>./Configure -n linux &amp;&amp;
+make</userinput></screen>
 
     <para>
-      This package does not come with a working test suite.
+      The tests should be run as the <systemitem
+      class="username">root</systemitem> user. They require that the
+      POSIX message queues are enabled in the kernel, and that <xref
+      linkend="nmap"/> be installed with a symbolic link
+      <filename>/usr/bin/nc</filename> pointing to <command>ncat</command>.
+    </para>
+
+<screen role="root"
+        remap="test"><userinput>make check</userinput></screen>
+
+    <para>
+      Two tests fail if the tests are run from a script instead of an
+      interactive session.
     </para>
 
@@ -110,5 +134,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m0755 -o root -g root lsof /usr/bin &amp;&amp;
+<screen role="root"><userinput>install -v -m4755 -o root -g root lsof /usr/bin &amp;&amp;
 install -v lsof.8 /usr/share/man/man8</userinput></screen>
 
@@ -124,6 +148,8 @@
 
     <para>
-      <command>make CFGL="-L./lib -ltirpc"</command>: Add the libtirpc
-      libraries location to the <command>make</command> command.
+      <command>install -m4755 ...</command>: <command>lsof</command> should
+      be suid root to allwo users to list all files. This may be a security
+      threat on some systems. In that case change to <option>-m755</option>
+      and use <command>sudo</command> to run the program.
     </para>
 
Index: general/prog/asciidoc.xml
===================================================================
--- general/prog/asciidoc.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
+++ general/prog/asciidoc.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 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 asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
+  <!ENTITY asciidoc-download-ftp  " ">
+  <!ENTITY asciidoc-md5sum        "b529a94ce2fe5324cb064d5ec09b8451">
+  <!ENTITY asciidoc-size          "211 KB">
+  <!ENTITY asciidoc-buildsize     "3.9 MB">
+  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+]>
+
+<!-- Begin Py3c -->
+  <sect2 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
+
+    <title>Asciidoc-&asciidoc-version;</title>
+
+    <indexterm zone="asciidoc">
+      <primary sortas="a-asciidoc">asciidoc</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Asciidoc</title>
+
+      <para>
+        The <application>Asciidoc</application> package is a text document
+        format for writing notes, documentation, articles, books, ebooks,
+        slideshows, web pages, man pages and blogs. AsciiDoc files can be
+        translated to many formats including HTML, PDF, EPUB, and man page.
+      </para>
+
+      &lfs110a_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &asciidoc-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &asciidoc-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &asciidoc-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &asciidoc-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Optional (tests and runtime)</bridgehead>
+      <para role="optional">
+        <xref linkend="docbook-xsl"/>,
+        <xref linkend="fop"/>,
+        <xref linkend="libxslt"/>,
+        <xref linkend="lynx"/>,
+        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
+        <ulink url="&w3m-url;">W3m</ulink>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Asciidoc</title>
+
+      <para>
+        If you are upgrading from version 9.x, remove the previously installed
+        executables, as the <systemitem class="username">root</systemitem>
+        user:
+      </para>
+
+<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
+
+<!--
+      <para>
+        First, fix a build problem if the optional dependencies are not installed:
+    </para>
+
+<screen><userinput remap='pre'>sed -i 's:doc/testasciidoc.1::' Makefile.in &amp;&amp;
+rm doc/testasciidoc.1.txt</userinput></screen>
+
+    <para>
+      Install <application>Asciidoc</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure - -prefix=/usr     \
+            - -sysconfdir=/etc \
+            - -docdir=/usr/share/doc/asciidoc-&asciidoc-version; &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>make install &amp;&amp;
+make docs</userinput></screen>
+-->
+      <para>
+        Build and install the <application>Python 3</application> module
+        by running the following commands as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            a2x and
+            asciidoc
+          </seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;-py&python3-majorver;.egg
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="a2x">
+          <term><command>a2x</command></term>
+          <listitem>
+            <para>
+              is a toolchain manager for AsciiDoc
+              (converts Asciidoc text files to other file formats)
+            </para>
+            <indexterm zone="asciidoc a2x">
+              <primary sortas="b-a2x">a2x</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="asciidoc-prog">
+          <term><command>asciidoc</command></term>
+          <listitem>
+            <para>
+              converts an AsciiDoc text file to HTML or DocBook
+            </para>
+            <indexterm zone="asciidoc asciidoc-prog">
+              <primary sortas="b-asciidoc-prog">asciidoc</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/py3c.xml
===================================================================
--- general/prog/py3c.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/prog/py3c.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -7,7 +7,7 @@
   <!ENTITY py3c-download-http
            "https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
-  <!ENTITY py3c-md5sum        "57f6518f3a7bcd501425bb23f2de15a7">
-  <!ENTITY py3c-size          "48 KB">
-  <!ENTITY py3c-buildsize     "1.4 MB">
+  <!ENTITY py3c-md5sum        "53029afde7e0cf8672a2d69d378a0cfc">
+  <!ENTITY py3c-size          "47 KB">
+  <!ENTITY py3c-buildsize     "608 KB">
   <!ENTITY py3c-time          "less than 0.1 SBU">
 ]>
@@ -90,6 +90,9 @@
 
       <para>
-        To test the package, issue: <command>make test-python3</command>.
+        To test the package, issue:
       </para>
+
+<screen remap="test"><userinput>make test-python3 &amp;&amp;
+make test-python3-cpp</userinput></screen>
 
       <para>
@@ -100,10 +103,6 @@
 
 <!-- Note:
-  When doing a DESTDIR install, use "make prefix=$DESTDIR/usr install"
-  but the installed py3c.pc file will contain an invalid path for the
-  includedir.
-  So either do a "sed -e "s:@includedir@:/usr/include:" -i py3c.pc.in
-  before exec the make-install or fix that path in the installed
-  file $DESTDIR/usr/share/pkgconfig/py3c.pc afterwards.
+  Now, doing a DESTDIR install is just
+    "make prefix=/usr DESTDIR=<dest> install"
 -->
 <screen role="root"><userinput>make prefix=/usr install</userinput></screen>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/prog/python-modules.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -31,4 +31,9 @@
       <listitem>
         <para>
+          <xref linkend="asciidoc"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="dbus-python"/>
         </para>
@@ -162,4 +167,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="asciidoc.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="dbus-python.xml"/>
 
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ general/prog/valgrind.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY valgrind-download-http "https://sourceware.org/ftp/valgrind/valgrind-&valgrind-version;.tar.bz2">
+  <!ENTITY valgrind-download-http "https://sourceware.org/pub/valgrind/valgrind-&valgrind-version;.tar.bz2">
   <!ENTITY valgrind-download-ftp  "ftp://sourceware.org/pub/valgrind/valgrind-&valgrind-version;.tar.bz2">
-  <!ENTITY valgrind-md5sum        "afe11b5572c3121a781433b7c0ab741b">
-  <!ENTITY valgrind-size          "16 MB">
-  <!ENTITY valgrind-buildsize     "629 MB (add 103 MB for tests)">
-  <!ENTITY valgrind-time          "0.5 SBU (Using parallelism=4; add 7.9 SBU for tests)">
+  <!ENTITY valgrind-md5sum        "de56a5532b0c81781db677ca712c585a">
+  <!ENTITY valgrind-size          "15 MB">
+  <!ENTITY valgrind-buildsize     "550 MB (add 62 MB for tests)">
+  <!ENTITY valgrind-time          "0.5 SBU (Using parallelism=4; add 7.5 SBU for tests)">
 ]>
 
@@ -72,5 +72,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,12 +82,9 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Valgrind Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <!-- The below programs are no longer used or looked for. -->
-      <!--<xref linkend="bind"/> or <xref linkend="bind-utils"/> (for tests),
-      <xref linkend="boost"/>, -->
       <xref linkend="gdb"/> (for tests),
       <xref linkend="llvm"/> (with Clang), and
@@ -110,4 +107,5 @@
     <title>Installation of Valgrind</title>
 
+<!-- Not needed anymore with 3.18.1
     <para>
       First, make several changes that are required for Valgrind to function on
@@ -116,11 +114,4 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../valgrind-&valgrind-version;-upstream_fixes-1.patch</userinput></screen>
-
-<!-- Not needed with 3.17.0
-    <para>
-      First, adapt the tests to glibc-2.33:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/arm64/amd64/' gdbserver_tests/nlcontrolc.vgtest</userinput></screen>
 -->
 
@@ -130,6 +121,5 @@
     </para>
 
-<screen><userinput>autoreconf -fiv &amp;&amp;
-sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
+<screen><userinput>sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
 
 ./configure --prefix=/usr \
@@ -140,6 +130,6 @@
       To test the results, issue: <command>make regtest</command>. The tests
       may hang forever if <xref linkend="gdb"/> is not installed. Some tests
-      are known to hang also, depending on the version of glibc. Some tests
-      in the "drd" test suite are known to fail as well. Problematic
+      are known to hang also, depending on the version of glibc. A few test
+       can fail in various suites. Problematic
       tests can be disabled by changing the <userinput>prereq:</userinput> line
       in the corresponding <filename>.vgtest</filename> file to
@@ -147,5 +137,5 @@
     </para>
 
-<screen><userinput>sed -e 's@prereq:.*@prereq: false@' \
+<screen role="nodump"><userinput>sed -e 's@prereq:.*@prereq: false@' \
     -i {helgrind,drd}/tests/pth_cond_destroy_busy.vgtest</userinput></screen>
 
@@ -212,18 +202,4 @@
         </seg>
         <seg>
-           <!-- Moved to /usr/lib/valgrind in 3.17.0
-          libcoregrind-&lt;Arch&gt;-linux.a,
-          libgcc-sup-&lt;Arch&gt;-linux.a,
-          libreplacemalloc_toolpreload-&lt;Arch&gt;-linux.a,
-          libvex-&lt;Arch&gt;-linux.a,
-          libvexmultiarch-amd64-linux.a,
-          vgpreload_core-&lt;Arch&gt;-linux.so,
-          vgpreload_drd-&lt;Arch&gt;-linux.so,
-          vgpreload_exp-dhat-&lt;Arch&gt;-linux.so,
-          vgpreload_helgrind-&lt;Arch&gt;-linux.so,
-          vgpreload_massif-&lt;Arch&gt;-linux.so, and
-          vgpreload_memcheck-&lt;Arch&gt;-linux.so, where
-          &lt;Arch&gt; is x86 or amd64
-          -->
           None
         </seg>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ introduction/welcome/changelog.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -43,4 +43,42 @@
     -->
     <listitem>
+      <para>October 28th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to asciidoc-10.0.0 (move to python modules).
+          Fixes <ulink url="&blfs-ticket-root;15682">#15682</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to graphviz-2.49.3. Fixes
+          <ulink url="&blfs-ticket-root;15680">#15680</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to valgrind-3.18.1. Fixes
+          <ulink url="&blfs-ticket-root;15677">#15677</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to py3c-1.4 (python module). Fixes
+          <ulink url="&blfs-ticket-root;15676">#15676</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to pidgin-2.14.8. Fixes
+          <ulink url="&blfs-ticket-root;15674">#15674</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to glibmm-2.66.2. Fixes
+          <ulink url="&blfs-ticket-root;15667">#15667</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to jansson-2.14. Fixes
+          <ulink url="&blfs-ticket-root;15664">#15664</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to lsof-4.94.0. Fixes
+          <ulink url="&blfs-ticket-root;15663">#15663</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 27th, 2021</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ packages.ent	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -99,5 +99,5 @@
 <!ENTITY glib2-minor                  "2.70">
 <!ENTITY glib2-version                "&glib2-minor;.0">
-<!ENTITY glibmm-version               "2.66.1">
+<!ENTITY glibmm-version               "2.66.2">
 <!ENTITY gmime-version                "2.6.23">
 <!ENTITY gmime3-version               "3.2.7">
@@ -115,5 +115,5 @@
 <!ENTITY inih-version                 "53">
 <!ENTITY iso-codes-version            "4.7.0">
-<!ENTITY jansson-version              "2.13.1">
+<!ENTITY jansson-version              "2.14">
 <!--<!ENTITY JS52-version                 "52.2.1gnome1">-->
 <!--<!ENTITY JS60-version                 "60.8.0">-->
@@ -245,5 +245,4 @@
 
 <!-- Chapter 11 -->
-<!ENTITY asciidoc-version             "9.1.1">
 <!ENTITY asciidoctor-version          "2.0.16">
 <!ENTITY bogofilter-version           "1.2.5">
@@ -252,5 +251,5 @@
 <!ENTITY desktop-file-utils-version   "0.26">
 <!ENTITY gperf-version                "3.0.4">
-<!ENTITY graphviz-version             "2.49.1">
+<!ENTITY graphviz-version             "2.49.3">
 <!ENTITY gtk-doc-major                "1.33">
 <!ENTITY gtk-doc-version              "1.33.2">
@@ -262,5 +261,5 @@
 <!ENTITY imagemagick-version          "7.1.0">
 <!ENTITY intltool-version             "0.50.2">
-<!ENTITY lsof-version                 "4.91">
+<!ENTITY lsof-version                 "4.94.0">
 <!ENTITY pinentry-version             "1.2.0">
 <!ENTITY rarian-version               "0.8.1">
@@ -385,5 +384,5 @@
 <!ENTITY vala-major-version           "0.54">  <!-- even minors only -->
 <!ENTITY vala-version                 "&vala-major-version;.1">
-<!ENTITY valgrind-version             "3.17.0">
+<!ENTITY valgrind-version             "3.18.1">
 <!ENTITY yasm-version                 "1.3.0">
 
@@ -559,4 +558,5 @@
 <!-- Python module versions used in the Python Modules instructions -->
 <!-- <!ENTITY Beaker-version               "1.10.0"> -->
+<!ENTITY asciidoc-version             "10.0.0">
 <!ENTITY docutils-version             "0.17.1">
 <!ENTITY dbus-python-version          "1.2.18">
@@ -569,5 +569,5 @@
 <!ENTITY mako-version                 "1.1.5">
 <!ENTITY MarkupSafe-version           "2.0.1">
-<!ENTITY py3c-version                 "1.3.1">
+<!ENTITY py3c-version                 "1.4">
 <!ENTITY pyatspi2-version             "2.38.1">
 <!--<!ENTITY py2cairo-version             "1.10.0"> -->
@@ -954,5 +954,5 @@
 <!ENTITY pan-version                  "0.133">
 <!ENTITY pavucontrol-version          "5.0">
-<!ENTITY pidgin-version               "2.14.7">
+<!ENTITY pidgin-version               "2.14.8">
 <!ENTITY rox-filer-version            "2.11">
 <!ENTITY rxvt-unicode-version         "9.26">
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 45befbbe63c7b48b0bda78ad347056ec8f0d619e)
+++ xsoft/other/pidgin.xml	(revision 141ee0a5de47107e09abb13ede6f144fe26ce435)
@@ -7,5 +7,5 @@
   <!ENTITY pidgin-download-http "&sourceforge-dl;/pidgin/pidgin-&pidgin-version;.tar.bz2">
   <!ENTITY pidgin-download-ftp  " ">
-  <!ENTITY pidgin-md5sum        "476d808a268c693adcc8fc5c952dadd4">
+  <!ENTITY pidgin-md5sum        "243ed3a590e38f156fee2e22180f8676">
   <!ENTITY pidgin-size          "8.3 MB">
   <!ENTITY pidgin-buildsize     "302 MB (with tests and docs)">
@@ -70,15 +70,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/pidgin-&pidgin-version;-fix_time_conv-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
 
     <bridgehead renderas="sect3">Pidgin Dependencies</bridgehead>
@@ -152,8 +141,8 @@
 
     <para>
-      First, apply a patch that fixes time to string conversions:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../pidgin-&pidgin-version;-fix_time_conv-1.patch</userinput></screen>
+      First, fix a test that fails:
+    </para>
+
+<screen><userinput>sed '/09-13/s@^@//@' -i libpurple/tests/test_util.c</userinput></screen>
 
     <para>
