Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision 7539c30ecaa8033644f2dde25051ab83a7265b1a)
+++ general/genlib/nspr.xml	(revision 6c3d8a47922687c5be5c940aac399e0e111751bc)
@@ -7,7 +7,7 @@
   <!ENTITY nspr-download-http "&mozilla-http;/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
   <!ENTITY nspr-download-ftp " ">
-  <!ENTITY nspr-md5sum        "b865586f19912a50acc3755d8a45dbaa">
-  <!ENTITY nspr-size          "1.1 MB">
-  <!ENTITY nspr-buildsize     "10 MB">
+  <!ENTITY nspr-md5sum        "4a5a0bc6b56c9a1281185b863e70da81">
+  <!ENTITY nspr-size          "1.0 MB">
+  <!ENTITY nspr-buildsize     "9.8 MB">
   <!ENTITY nspr-time          "less than 0.1 SBU">
 ]>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 7539c30ecaa8033644f2dde25051ab83a7265b1a)
+++ general/genutils/graphviz.xml	(revision 6c3d8a47922687c5be5c940aac399e0e111751bc)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY graphviz-download-http "http://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz">
+  <!ENTITY graphviz-download-http "https//www2.graphviz.org/Packages/stable/portable_source/graphviz-&graphviz-version;.tar.gz">
   <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "4ea6fd64603536406166600bcc296fc8">
+  <!ENTITY graphviz-md5sum        "b6d51154a09a4e25d1894cc6ff7dd3a5">
   <!ENTITY graphviz-size          "24 MB">
-  <!ENTITY graphviz-buildsize     "177 MB">
-  <!ENTITY graphviz-time          "0.7 SBU (using parallelism=4)">
+  <!ENTITY graphviz-buildsize     "213 MB">
+  <!ENTITY graphviz-time          "1.0 SBU (using parallelism=4)">
 ]>
 
@@ -74,5 +74,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <note>
       <para>
@@ -97,5 +97,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
 
@@ -215,7 +215,12 @@
     </para>
 
-<!-- For every major version of Ruby, this has to be tweaked. See #11606 -->
-<screen><userinput>sed -e '/ruby/s/1\.9/2.6/' -i configure.ac</userinput></screen>
-
+<!-- For every major version of Ruby, this has to be tweaked. See #11606 
+
+     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
@@ -224,5 +229,5 @@
 
 <screen><userinput>patch -p1 -i ../graphviz-&graphviz-version;-qt5-1.patch</userinput></screen>
-
+-->
     <para>
       Install <application>Graphviz</application> by running the following
@@ -255,6 +260,5 @@
     </para>
 
-<screen role="root"><userinput>ln -v -s /usr/share/graphviz/doc \
-         /usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
+<screen role="root"><userinput>ln -v -s /usr/share/graphviz/doc /usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
 
   </sect2>
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision 7539c30ecaa8033644f2dde25051ab83a7265b1a)
+++ general/prog/swig.xml	(revision 6c3d8a47922687c5be5c940aac399e0e111751bc)
@@ -7,8 +7,8 @@
   <!ENTITY swig-download-http "&sourceforge-dl;/swig/swig-&swig-version;.tar.gz">
   <!ENTITY swig-download-ftp  " ">
-  <!ENTITY swig-md5sum        "572074323f49d9cb14460d986f87230a">
+  <!ENTITY swig-md5sum        "54cc40b3804816f7d38ab510b6f13b04">
   <!ENTITY swig-size          "7.7 MB">
-  <!ENTITY swig-buildsize     "161 MB (1.3 GB with tests)">
-  <!ENTITY swig-time          "0.2 SBU (add 14 SBU for tests; both using parallelism=4)">
+  <!ENTITY swig-buildsize     "181 MB (1.2 GB with tests)">
+  <!ENTITY swig-time          "0.2 SBU (add 9.4 SBU for tests; both using parallelism=4)">
 ]>
 
Index: general/sysutils/lsb-tools.xml
===================================================================
--- general/sysutils/lsb-tools.xml	(revision 7539c30ecaa8033644f2dde25051ab83a7265b1a)
+++ general/sysutils/lsb-tools.xml	(revision 6c3d8a47922687c5be5c940aac399e0e111751bc)
@@ -104,8 +104,11 @@
       <seglistitem>
         <seg>
-           /usr/bin/lsb_release, /usr/lib/lsb/install_initd,
-           and /usr/lib/lsb/remove_initd
+           lsb_release, 
+           install_initd, and
+           remove_initd
         </seg>
-        <seg>/usr/lib/lsb and /usr/lib/python3.7/site-packaes/lsbtools</seg>
+        <seg>/usr/lib/lsb and 
+             /usr/lib/python3.7/site-packaes/lsbtools
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7539c30ecaa8033644f2dde25051ab83a7265b1a)
+++ introduction/welcome/changelog.xml	(revision 6c3d8a47922687c5be5c940aac399e0e111751bc)
@@ -47,4 +47,16 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to graphviz-2.42.1. Fixes
+          <ulink url="&blfs-ticket-root;12421">#12421</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to swig-4.0.1. Fixes
+          <ulink url="&blfs-ticket-root;12420">#12420</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nspr-4.22. Fixes
+          <ulink url="&blfs-ticket-root;12414">#12414</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Replace Lsb_release and Initd-tools with LSB-Tools
           package.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 7539c30ecaa8033644f2dde25051ab83a7265b1a)
+++ packages.ent	(revision 6c3d8a47922687c5be5c940aac399e0e111751bc)
@@ -170,5 +170,5 @@
 <!ENTITY nodejs-version               "10.16.3">
 <!ENTITY npth-version                 "1.6">
-<!ENTITY nspr-version                 "4.21">
+<!ENTITY nspr-version                 "4.22">
 <!ENTITY openobex-version             "1.7.2">
 <!ENTITY pcre-version                 "8.43">
@@ -234,5 +234,5 @@
 <!ENTITY desktop-file-utils-version   "0.24">
 <!ENTITY gperf-version                "3.0.4">
-<!ENTITY graphviz-version             "2.40.1">   <!-- Even minors only -->
+<!ENTITY graphviz-version             "2.42.1">   <!-- Even minors only -->
 <!ENTITY gtk-doc-version              "1.32">
 <!ENTITY gtkhtml-version              "4.10.0">
@@ -339,5 +339,5 @@
 <!ENTITY slang-version                "2.3.2">
 <!ENTITY subversion-version           "1.12.2">
-<!ENTITY swig-version                 "4.0.0">
+<!ENTITY swig-version                 "4.0.1">
 <!ENTITY tcl-version                  "8.6.9">
 <!ENTITY tk-version                   "8.6.9">
