Index: archive/pycrypto.xml
===================================================================
--- archive/pycrypto.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
+++ archive/pycrypto.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -0,0 +1,138 @@
+<?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 pycrypto-download-http "&pymodules-dl;/p/pycrypto/pycrypto-&pycrypto-version;.tar.gz">
+  <!ENTITY pycrypto-download-ftp  " ">
+  <!ENTITY pycrypto-md5sum        "55a61a054aa66812daf5161a0d5d7eda">
+  <!ENTITY pycrypto-size          "440 KB">
+  <!ENTITY pycrypto-buildsize     "14 MB">
+  <!ENTITY pycrypto-time          "0.1 SBU">
+]>
+
+  <!-- Begin pycrypto -->
+  <sect2 id="pycrypto" xreflabel="PyCrypto-&pycrypto-version;">
+
+    <title>PyCrypto-&pycrypto-version;</title>
+
+    <indexterm zone="pycrypto">
+      <primary sortas="a-pycrypto">pycrypto</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to the PyCrypto Module</title>
+
+      <para>
+        <application>PyCrypto</application> is a collection of both secure hash
+        functions (such as SHA256 and RIPEMD160), and various encryption
+        algorithms (AES, DES, RSA, ElGamal, etc.).
+      </para>
+
+      &lfs90_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pycrypto-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycrypto-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycrypto-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycrypto-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycrypto-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycrypto-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyCrypto Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Recommended</bridgehead>
+      <para role="recommended">
+        <xref linkend="python2"/> 
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycrypto"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyCrypto</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
+
+      <para>
+        To build the <application>Python 2</application> and
+        <application>Python 3</application> modules, run the following commands:
+      </para>
+
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
+
+      <para>
+        To install both modules, run the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+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>
+            None
+          </seg>
+          <seg>
+            pycrypto-&pycrypto-version;-py&python2-majorver;.egg-info and/or
+            pycrypto-&pycrypto-version;-py&python3-majorver;.egg-info
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/Crypto and/or
+            /usr/lib/python&python3-majorver;/site-packages/Crypto
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End pycrypto -->
Index: general.ent
===================================================================
--- general.ent	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ general.ent	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 8th, &year;">
+<!ENTITY releasedate  "September 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: neral/prog/pycrypto.xml
===================================================================
--- general/prog/pycrypto.xml	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ 	(revision )
@@ -1,138 +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 pycrypto-download-http "&pymodules-dl;/p/pycrypto/pycrypto-&pycrypto-version;.tar.gz">
-  <!ENTITY pycrypto-download-ftp  " ">
-  <!ENTITY pycrypto-md5sum        "55a61a054aa66812daf5161a0d5d7eda">
-  <!ENTITY pycrypto-size          "440 KB">
-  <!ENTITY pycrypto-buildsize     "14 MB">
-  <!ENTITY pycrypto-time          "0.1 SBU">
-]>
-
-  <!-- Begin pycrypto -->
-  <sect2 id="pycrypto" xreflabel="PyCrypto-&pycrypto-version;">
-
-    <title>PyCrypto-&pycrypto-version;</title>
-
-    <indexterm zone="pycrypto">
-      <primary sortas="a-pycrypto">pycrypto</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the PyCrypto Module</title>
-
-      <para>
-        <application>PyCrypto</application> is a collection of both secure hash
-        functions (such as SHA256 and RIPEMD160), and various encryption
-        algorithms (AES, DES, RSA, ElGamal, etc.).
-      </para>
-
-      &lfs90_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycrypto-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycrypto-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycrypto-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycrypto-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycrypto-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycrypto-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCrypto Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/> 
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pycrypto"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCrypto</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
-      <para>
-        To build the <application>Python 2</application> and
-        <application>Python 3</application> modules, run the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
-
-      <para>
-        To install both modules, run the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
-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>
-            None
-          </seg>
-          <seg>
-            pycrypto-&pycrypto-version;-py&python2-majorver;.egg-info and/or
-            pycrypto-&pycrypto-version;-py&python3-majorver;.egg-info
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/Crypto and/or
-            /usr/lib/python&python3-majorver;/site-packages/Crypto
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End pycrypto -->
Index: general/prog/pycryptodome.xml
===================================================================
--- general/prog/pycryptodome.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
+++ general/prog/pycryptodome.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -0,0 +1,139 @@
+<?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 pycryptodome-download-http "&pymodules-dl;/p/pycryptodome/pycryptodome-&pycryptodome-version;.tar.gz">
+  <!ENTITY pycryptodome-download-ftp  " ">
+  <!ENTITY pycryptodome-md5sum        "97ee98c95f350927bcc0e937976f17ee">
+  <!ENTITY pycryptodome-size          "11 MB">
+  <!ENTITY pycryptodome-buildsize     "163 MB">
+  <!ENTITY pycryptodome-time          "0.2 SBU">
+]>
+
+  <!-- Begin pycryptodome -->
+  <sect2 id="pycryptodome" xreflabel="PyCryptodome-&pycryptodome-version;">
+
+    <title>PyCryptodome-&pycryptodome-version;</title>
+
+    <indexterm zone="pycryptodome">
+      <primary sortas="a-pycryptodome">pycryptodome</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to the PyCryptodome Module</title>
+
+      <para>
+        <application>PyCryptodome</application> is a collection of both secure
+        hash functions (such as SHA256 and RIPEMD160), and various encryption
+        algorithms (AES, DES, RSA, ElGamal, etc.), and is a drop-in replacement
+        for PyCrypto.
+      </para>
+
+      &lfs90_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pycryptodome-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycryptodome-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycryptodome-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycryptodome-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycryptodome-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycryptodome-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyCryptodome Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Recommended</bridgehead>
+      <para role="recommended">
+        <xref linkend="python2"/> 
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycryptodome"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyCryptodome</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
+
+      <para>
+        To build the <application>Python 2</application> and
+        <application>Python 3</application> modules, run the following commands:
+      </para>
+
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
+
+      <para>
+        To install both modules, run the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+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>
+            None
+          </seg>
+          <seg>
+            pycryptodome-&pycryptodome-version;-py&python2-majorver;.egg-info and/or
+            pycryptodome-&pycryptodome-version;-py&python3-majorver;.egg-info
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/Crypto and/or
+            /usr/lib/python&python3-majorver;/site-packages/Crypto
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End pycryptodome -->
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ general/prog/python-modules.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -52,5 +52,5 @@
       <listitem>
         <para>
-          <xref linkend="pycrypto"/>
+          <xref linkend="pycryptodome"/>
         </para>
       </listitem>
@@ -149,5 +149,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycrypto.xml"/>
+    href="pycryptodome.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: general/sysutils/lsb-tools.xml
===================================================================
--- general/sysutils/lsb-tools.xml	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ general/sysutils/lsb-tools.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -100,4 +100,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -108,6 +109,9 @@
            remove_initd
         </seg>
-        <seg>/usr/lib/lsb and 
-             /usr/lib/python3.7/site-packages/lsbtools
+        <seg>
+           LSB_Tools-&lsb-tools-version;-py&python3-majorver;.egg-info
+        </seg>
+        <seg>/usr/lib/lsb and
+             /usr/lib/python&python3-majorver;/site-packages/lsbtools
         </seg>
       </seglistitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ introduction/welcome/changelog.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -44,4 +44,14 @@
 
     <listitem>
+      <para>September 9th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Replace PyCrypto with PyCryptodome. Fixes
+          <ulink url="&blfs-ticket-root;12210">#12210</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 8th, 2019</para>
       <itemizedlist>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ networking/netprogs/samba.xml	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -78,5 +78,5 @@
       <xref linkend="libxslt"/> (for documentation),
       <xref linkend="perl-parse-yapp"/>,
-      <xref linkend="pycrypto"/>, and
+      <xref linkend="pycryptodome"/>, and
       <xref linkend="openldap"/>
     </para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 4d84081c01a0c16645c6cc063446f01804313c72)
+++ packages.ent	(revision ceafde507b35182f04a949a5a23f25b92cbc59bf)
@@ -525,5 +525,6 @@
 <!--<!ENTITY py2cairo-version             "1.10.0"> -->
 <!ENTITY pycairo-version              "1.18.1">
-<!ENTITY pycrypto-version             "2.6.1">
+<!--<!ENTITY pycrypto-version             "2.6.1"> Replaced by pycryptodome -->
+<!ENTITY pycryptodome-version         "3.9.0">
 <!ENTITY pygments-version             "2.4.2">
 <!ENTITY pygobject2-version           "2.28.7">
