Wed Jul 22 20:27:42 UTC 202020200722202742

a/kernel-generic-5.4.53-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.53-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.53-x86_64-1.txz:  Upgraded.
ap/sudo-1.9.2-x86_64-1.txz:  Upgraded.
d/ccache-3.7.11-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.53-x86-1.txz:  Upgraded.
d/llvm-10.0.1-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.53-noarch-1.txz:  Upgraded.
l/libidn-1.36-x86_64-1.txz:  Upgraded.
l/netpbm-10.91.01-x86_64-1.txz:  Upgraded.
l/python-urllib3-1.25.10-x86_64-1.txz:  Upgraded.
xap/xlockmore-5.65-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

12 files changed, 124 insertions, 199 deletions

diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 4c7f869b6..ba0366ecf 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=llvm
 VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index 14e4fdc37..3ddc496cc 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,21 +1,21 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/llvm-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-tools-extra-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/compiler-rt-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/lldb-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/openmp-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/polly-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxx-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxxabi-10.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/lld-10.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/llvm-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang-tools-extra-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/compiler-rt-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/lldb-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/polly-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/libcxx-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/libcxxabi-10.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/lld-10.0.1.src.tar.xz
 
-#http://llvm.org/releases/10.0.0/llvm-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/clang-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/clang-tools-extra-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/compiler-rt-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/lldb-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/openmp-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/polly-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/libcxx-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/libcxxabi-10.0.0.src.tar.xz
-#http://llvm.org/releases/10.0.0/lld-10.0.0.src.tar.xz
+#http://llvm.org/releases/10.0.1/llvm-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/clang-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/clang-tools-extra-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/compiler-rt-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/lldb-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/openmp-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/polly-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/libcxx-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/libcxxabi-10.0.1.src.tar.xz
+#http://llvm.org/releases/10.0.1/lld-10.0.1.src.tar.xz
diff --git a/source/k/kernel-configs/config-generic-5.4.52 b/source/k/kernel-configs/config-generic-5.4.53
index 93f45042e..0832b5921 100644
--- a/source/k/kernel-configs/config-generic-5.4.52
+++ b/source/k/kernel-configs/config-generic-5.4.53
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.52 Kernel Configuration
+# Linux/x86 5.4.53 Kernel Configuration
 #
 
 #
@@ -2425,7 +2425,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -7752,7 +7751,6 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_HYPERV_IOMMU=y
diff --git a/source/k/kernel-configs/config-generic-5.4.52.x64 b/source/k/kernel-configs/config-generic-5.4.53.x64
index 392e37df6..0473bacaa 100644
--- a/source/k/kernel-configs/config-generic-5.4.52.x64
+++ b/source/k/kernel-configs/config-generic-5.4.53.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.52 Kernel Configuration
+# Linux/x86 5.4.53 Kernel Configuration
 #
 
 #
@@ -2492,7 +2492,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.52-smp b/source/k/kernel-configs/config-generic-smp-5.4.53-smp
index 3924b9506..880b9c8dd 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.52-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.53-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.52 Kernel Configuration
+# Linux/x86 5.4.53 Kernel Configuration
 #
 
 #
@@ -2478,7 +2478,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -7806,7 +7805,6 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_HYPERV_IOMMU=y
diff --git a/source/k/kernel-configs/config-huge-5.4.52 b/source/k/kernel-configs/config-huge-5.4.53
index f26e8ea7f..3aea80756 100644
--- a/source/k/kernel-configs/config-huge-5.4.52
+++ b/source/k/kernel-configs/config-huge-5.4.53
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.52 Kernel Configuration
+# Linux/x86 5.4.53 Kernel Configuration
 #
 
 #
@@ -2425,7 +2425,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -7752,7 +7751,6 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_HYPERV_IOMMU=y
diff --git a/source/k/kernel-configs/config-huge-5.4.52.x64 b/source/k/kernel-configs/config-huge-5.4.53.x64
index de979ef5f..ec95f0ec6 100644
--- a/source/k/kernel-configs/config-huge-5.4.52.x64
+++ b/source/k/kernel-configs/config-huge-5.4.53.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.52 Kernel Configuration
+# Linux/x86 5.4.53 Kernel Configuration
 #
 
 #
@@ -2492,7 +2492,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.52-smp b/source/k/kernel-configs/config-huge-smp-5.4.53-smp
index fe1dbfb5c..41dce4bd3 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.52-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.53-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.52 Kernel Configuration
+# Linux/x86 5.4.53 Kernel Configuration
 #
 
 #
@@ -2478,7 +2478,6 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
 CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -7806,7 +7805,6 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_HYPERV_IOMMU=y
diff --git a/source/l/libidn/libidn.SlackBuild b/source/l/libidn/libidn.SlackBuild
index 0bda7f2f4..c0aedc936 100755
--- a/source/l/libidn/libidn.SlackBuild
+++ b/source/l/libidn/libidn.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libidn
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/netpbm/netpbm-docfix.patch b/source/l/netpbm/netpbm-docfix.patch
index 33b3b77dc..21220e611 100644
--- a/source/l/netpbm/netpbm-docfix.patch
+++ b/source/l/netpbm/netpbm-docfix.patch
@@ -1,7 +1,19 @@
-diff -urNp old/userguide/cameratopam.html new/userguide/cameratopam.html
---- old/userguide/cameratopam.html	2017-09-05 09:05:16.000000000 +0200
-+++ new/userguide/cameratopam.html	2017-09-05 13:16:33.622352535 +0200
-@@ -25,10 +25,10 @@ cameratopam - convert raw camera image t
+diff -u -r --new-file old/converter/pbm/pbmtoepson.c new/converter/pbm/pbmtoepson.c
+--- old/converter/pbm/pbmtoepson.c	2020-07-22 13:59:06.000000000 -0500
++++ new/converter/pbm/pbmtoepson.c	2020-07-22 14:07:25.589798129 -0500
+@@ -75,7 +75,7 @@
+             &dpiSpec,                         0);
+     OPTENT3(0, "adjacent",     OPT_FLAG,     NULL,
+             &adjacentSpec,                    0);
+-    OPTENT3(0, "nonadjacent",  OPT_FLAG,     NULL,
++    OPTENT3(0, "noadjacent",  OPT_FLAG,     NULL,
+             &nonadjacentSpec,                 0);
+ 
+     opt.opt_table = option_def;
+diff -u -r --new-file old/userguide/cameratopam.html new/userguide/cameratopam.html
+--- old/userguide/cameratopam.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/cameratopam.html	2020-07-22 14:07:25.588798129 -0500
+@@ -24,10 +24,10 @@
  [<b>-balance_camera</b>]
  [<b>-red_scale=</b><i>float</i>]
  [<b>-blue_scale=</b><i>float</i>]
@@ -14,7 +26,7 @@ diff -urNp old/userguide/cameratopam.html new/userguide/cameratopam.html
  [<b>-linear</b>]
  [<b>-verbose</b>]
  
-@@ -106,7 +106,7 @@ the default.
+@@ -110,7 +110,7 @@
  <dd>Further adjust the color balance by multiplying the red and blue
  channels by these values.  Both default to 1.0.
  
@@ -23,7 +35,7 @@ diff -urNp old/userguide/cameratopam.html new/userguide/cameratopam.html
  
  <dd>Change the output brightness.  Default is 1.0.
  
-@@ -114,14 +114,14 @@ channels by these values.  Both default
+@@ -118,14 +118,14 @@
  
  <dd>By default, <b>cameratoapm</b> clips all colors to prevent pink
  hues in the highlights.  Combine this option with
@@ -40,47 +52,47 @@ diff -urNp old/userguide/cameratopam.html new/userguide/cameratopam.html
  
  <dd>For cameras based on the Fuji Super CCD SR, this option causes
  <b>cameratopam</b> to use the secondary sensors, in effect
-diff -urNp old/userguide/fiascotopnm.html new/userguide/fiascotopnm.html
---- old/userguide/fiascotopnm.html	2017-09-05 09:05:16.000000000 +0200
-+++ new/userguide/fiascotopnm.html	2017-09-05 13:32:51.810458154 +0200
-@@ -51,7 +51,7 @@ the output file(s) are written to the fi
+diff -u -r --new-file old/userguide/fiascotopnm.html new/userguide/fiascotopnm.html
+--- old/userguide/fiascotopnm.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/fiascotopnm.html	2020-07-22 14:05:31.049804465 -0500
+@@ -56,7 +56,7 @@
  this list. Otherwise, the current directory is used to store the
  output file(s).
  
--<DT><B>-z</B>, <B>--fast</B>
-+<DT><B>-r</B>, <B>--fast</B>
- <DD>
+-<dt><b>-z</b>, <b>--fast</b>
++<dt><b>-r</b>, <b>--fast</b>
+ <dd>
  Decompress images in the 4:2:0 format; i.e., each chroma channel is
  decompressed to an image of halved width and height. Use this option
-@@ -83,7 +83,7 @@ given amount <I>N</I>. <I>N</I> is 1 (mi
- is 70. When <I>N</I>=0, then the smoothing amount specified in the
+@@ -88,7 +88,7 @@
+ is 70. When <i>N</i>=0, then the smoothing amount specified in the
  FIASCO file is used (defined by the FIASCO coder).
  
--<DT><B>-F</B> <I>N</I>, <B>--fps=</B><I>N</I>
-+<DT><B>-F</B> <I>N</I>, <B>--framerate=</B><I>N</I>
- <DD>
- Set number of frames per second to <I>N</I>. When using this option,
+-<dt><b>-F</b> <i>N</i>, <b>--fps=</b><i>N</i>
++<dt><b>-F</b> <i>N</i>, <b>--framerate=</b><i>N</i>
+ <dd>
+ Set number of frames per second to <i>N</i>. When using this option,
  the frame rate specified in the FIASCO file is overridden.
-@@ -113,13 +113,8 @@ following methods (in the specified orde
- <LI>--config=<I>name</I>
- </OL>
+@@ -118,13 +118,8 @@
+ <li>--config=<i>name</i>
+ </ol>
  
--<DT><B>-h</B>, <B>--info</B>
--<DD>
+-<dt><b>-h</b>, <b>--info</b>
+-<dd>
 -Print brief help, then exit.
 -
--<DT><B>-H</B>, <B>--help</B>
--<DD>
+-<dt><b>-H</b>, <b>--help</b>
+-<dd>
 -Print detailed help, then exit.
-+<DT><B>-h</B>, <B>--help</B>
++<dt><b>-h</b>, <b>--help</b>
 +Print help, then exit.
  
- </DL>
+ </dl>
  
-diff -urNp old/userguide/pamperspective.html new/userguide/pamperspective.html
---- old/userguide/pamperspective.html	2017-09-05 09:05:16.000000000 +0200
-+++ new/userguide/pamperspective.html	2017-09-05 13:23:15.869997105 +0200
-@@ -220,7 +220,7 @@ default rectangle as the "frame." The vi
+diff -u -r --new-file old/userguide/pamperspective.html new/userguide/pamperspective.html
+--- old/userguide/pamperspective.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pamperspective.html	2020-07-22 14:07:25.589798129 -0500
+@@ -220,7 +220,7 @@
  a rectangle the axes of which are parallel to those of the frame.
  
  <p>The frame options are additive.  All the parts of the image
@@ -89,31 +101,19 @@ diff -urNp old/userguide/pamperspective.html new/userguide/pamperspective.html
  <b>--include</b> (or their defaults) are in the visible part.  The
  visible part is the smallest possible rectangle that contains the
  parts specified those three ways.
-diff -urNp old/converter/pbm/pbmtoepson.c new/converter/pbm/pbmtoepson.c
---- old/converter/pbm/pbmtoepson.c	2018-01-04 14:26:14.740024843 +0100
-+++ new/converter/pbm/pbmtoepson.c	2018-01-04 14:28:47.970518766 +0100
-@@ -75,7 +75,7 @@ parseCommandLine(int                  ar
-             &dpiSpec,                         0);
-     OPTENT3(0, "adjacent",     OPT_FLAG,     NULL,
-             &adjacentSpec,                    0);
--    OPTENT3(0, "nonadjacent",  OPT_FLAG,     NULL,
-+    OPTENT3(0, "noadjacent",  OPT_FLAG,     NULL,
-             &nonadjacentSpec,                 0);
- 
-     opt.opt_table = option_def;
-diff -urNp old/userguide/pbmtoepson.html new/userguide/pbmtoepson.html
---- old/userguide/pbmtoepson.html	2018-01-04 14:26:14.586024719 +0100
-+++ new/userguide/pbmtoepson.html	2018-01-04 14:27:56.466847698 +0100
-@@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Ep
+diff -u -r --new-file old/userguide/pbmtoepson.html new/userguide/pbmtoepson.html
+--- old/userguide/pbmtoepson.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pbmtoepson.html	2020-07-22 14:07:25.589798129 -0500
+@@ -16,7 +16,7 @@
  [<b>-dpi=</b><i>n</i>]
- [<b>-protocol=</b>{<b>escp9</b>|<B>escp</B>}]
+ [<b>-protocol=</b>{<b>escp9</b>|<b>escp</b>}]
  [<b>-adjacent</b>]
 -[<b>-nonadjacent</b>]
 +[<b>-noadjacent</b>]
  
- [<I>pbmfile</I>]
+ [<i>pbmfile</i>]
  
-@@ -74,7 +74,7 @@ print density for you consistent with yo
+@@ -75,7 +75,7 @@
  <p>This option was new in Netpbm 10.23 (July 2004).     
  
  <dt><b>-adjacent</b>
diff --git a/source/l/netpbm/netpbm-manfix.patch b/source/l/netpbm/netpbm-manfix.patch
index c85a74970..8b8556da7 100644
--- a/source/l/netpbm/netpbm-manfix.patch
+++ b/source/l/netpbm/netpbm-manfix.patch
@@ -1,7 +1,7 @@
-diff -urNp old/userguide/escp2topbm.html new/userguide/escp2topbm.html
---- old/userguide/escp2topbm.html	2017-09-05 13:58:08.335559561 +0200
-+++ new/userguide/escp2topbm.html	2017-09-05 14:01:20.226842694 +0200
-@@ -6,6 +6,7 @@ Updated: 14 July 2015
+diff -u -r --new-file old/userguide/escp2topbm.html new/userguide/escp2topbm.html
+--- old/userguide/escp2topbm.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/escp2topbm.html	2020-07-22 14:13:42.432777285 -0500
+@@ -6,6 +6,7 @@
  <BR>
  <A HREF="#index">Table Of Contents</A>
  
@@ -9,9 +9,9 @@ diff -urNp old/userguide/escp2topbm.html new/userguide/escp2topbm.html
  escp2topbm - convert an ESC/P2 printer file to a PBM image
  
  <H2 id="synopsis">SYNOPSIS</H2>
-diff -urNp old/userguide/faxformat.html new/userguide/faxformat.html
---- old/userguide/faxformat.html	2017-09-05 13:58:08.337559553 +0200
-+++ new/userguide/faxformat.html	2017-09-05 14:02:33.322571279 +0200
+diff -u -r --new-file old/userguide/faxformat.html new/userguide/faxformat.html
+--- old/userguide/faxformat.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/faxformat.html	2020-07-22 14:14:23.553775010 -0500
 @@ -5,10 +5,11 @@
  Updated: 03 December 2008
  <BR>
@@ -25,52 +25,9 @@ diff -urNp old/userguide/faxformat.html new/userguide/faxformat.html
  <p>The ITU (formerly CCITT) publishes standards for operation of fax machines
  (the idea is to provide a way to be sure that a fax machine is able to receive
  a fax sent by another).  These standards incidentally specify graphics file
-diff -urNp old/userguide/pampaintspill.html new/userguide/pampaintspill.html
---- old/userguide/pampaintspill.html	2017-09-05 13:58:08.338559550 +0200
-+++ new/userguide/pampaintspill.html	2017-09-05 14:03:32.625351620 +0200
-@@ -1,8 +1,7 @@
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
--<html xmlns="http://www.w3.org/1999/xhtml">
-+<html>
- <head>
- <title>Pampaintspill User Manual</title>
--<meta http-equiv="content-type" content="text/html; charset=us-ascii" />
- </head>
- 
- <body>
-@@ -11,6 +10,7 @@
- 
- <p><a href="#index">Table Of Contents</a></p>
- 
-+<H2>NAME</H2>
- <p>pampaintspill - smoothly spill colors into the background</p>
- 
- <h2><a name="synopsis">SYNOPSIS</a></h2>
-diff -urNp old/userguide/pamrecolor.html new/userguide/pamrecolor.html
---- old/userguide/pamrecolor.html	2017-09-05 13:58:08.336559557 +0200
-+++ new/userguide/pamrecolor.html	2017-09-05 14:04:34.714122098 +0200
-@@ -1,8 +1,7 @@
--<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
- <html>
- <head>
- <title>Pamrecolor User Manual</title>
--<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
- </head>
- 
- <body>
-@@ -11,7 +10,7 @@
- 
- <p>Updated: 31 July 2010</p>
- 
--<p><a href="#contents">Table Of Contents</a></p>
-+<p><a href="#index">Table Of Contents</a></p>
- 
- 
- <h2 id="name">NAME</h2>
-diff -urNp old/userguide/pamsistoaglyph.html new/userguide/pamsistoaglyph.html
---- old/userguide/pamsistoaglyph.html	2017-09-05 13:58:08.334559565 +0200
-+++ new/userguide/pamsistoaglyph.html	2017-09-05 14:05:25.865944327 +0200
+diff -u -r --new-file old/userguide/pamsistoaglyph.html new/userguide/pamsistoaglyph.html
+--- old/userguide/pamsistoaglyph.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pamsistoaglyph.html	2020-07-22 14:18:54.583760019 -0500
 @@ -1,8 +1,7 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 -<html xmlns="http://www.w3.org/1999/xhtml">
@@ -81,9 +38,9 @@ diff -urNp old/userguide/pamsistoaglyph.html new/userguide/pamsistoaglyph.html
  </head>
  
  <body>
-diff -urNp old/userguide/pamstereogram.html new/userguide/pamstereogram.html
---- old/userguide/pamstereogram.html	2017-09-05 13:58:08.337559553 +0200
-+++ new/userguide/pamstereogram.html	2017-09-05 14:13:28.523959069 +0200
+diff -u -r --new-file old/userguide/pamstereogram.html new/userguide/pamstereogram.html
+--- old/userguide/pamstereogram.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pamstereogram.html	2020-07-22 14:20:05.064756120 -0500
 @@ -1,5 +1,5 @@
 -<!DOCTYPE html>
 -<html xmlns="http://www.w3.org/1999/xhtml">
@@ -94,16 +51,16 @@ diff -urNp old/userguide/pamstereogram.html new/userguide/pamstereogram.html
  </head>
 @@ -10,7 +10,7 @@
  
- <p>Updated: 19 June 2015</p>
+ <p>Updated: 10 May 2020</p>
  
 -<p><a href="#contents">Table Of Contents</a></p>
 +<p><a href="#index">Table Of Contents</a></p>
  
  
  <h2 id="name">NAME</h2>
-diff -urNp old/userguide/pnmflip.html new/userguide/pnmflip.html
---- old/userguide/pnmflip.html	2017-09-05 13:58:08.336559557 +0200
-+++ new/userguide/pnmflip.html	2017-09-05 14:07:15.065963977 +0200
+diff -u -r --new-file old/userguide/pnmflip.html new/userguide/pnmflip.html
+--- old/userguide/pnmflip.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pnmflip.html	2020-07-22 14:20:48.710753706 -0500
 @@ -4,9 +4,11 @@
  <BODY>
  <H1>pnmflip</H1>
@@ -116,21 +73,9 @@ diff -urNp old/userguide/pnmflip.html new/userguide/pnmflip.html
  <P><B>pamflip</b> is mostly backward compatible with <b>pnmflip</b>,
  but works on PAM images too.
  
-diff -urNp old/userguide/pnmmercator.html new/userguide/pnmmercator.html
---- old/userguide/pnmmercator.html	2017-09-05 13:58:08.334559565 +0200
-+++ new/userguide/pnmmercator.html	2017-09-05 14:08:08.305214742 +0200
-@@ -1,7 +1,6 @@
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
- <html>
- <head>
--<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <title>PnmMercator User Manual</title>
- </head>
- <body>
-diff -urNp old/userguide/ppmtogif.html new/userguide/ppmtogif.html
---- old/userguide/ppmtogif.html	2017-09-05 13:58:08.337559553 +0200
-+++ new/userguide/ppmtogif.html	2017-09-05 14:09:51.450583126 +0200
+diff -u -r --new-file old/userguide/ppmtogif.html new/userguide/ppmtogif.html
+--- old/userguide/ppmtogif.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/ppmtogif.html	2020-07-22 14:22:08.813749275 -0500
 @@ -4,11 +4,14 @@
  <BODY>
  <H1>ppmtogif</H1>
diff --git a/source/l/netpbm/netpbm-manual-pages.patch b/source/l/netpbm/netpbm-manual-pages.patch
index d52c8eb34..61222c2a4 100644
--- a/source/l/netpbm/netpbm-manual-pages.patch
+++ b/source/l/netpbm/netpbm-manual-pages.patch
@@ -1,8 +1,7 @@
-diff --git a/userguide/libnetpbm_ug.html b/userguide/libnetpbm_ug.html
-index 94d4fd4..bb1c77e 100644
---- a/userguide/libnetpbm_ug.html
-+++ b/userguide/libnetpbm_ug.html
-@@ -374,7 +374,7 @@ plain format.
+diff -u -r --new-file old/userguide/libnetpbm_ug.html new/userguide/libnetpbm_ug.html
+--- old/userguide/libnetpbm_ug.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/libnetpbm_ug.html	2020-07-22 14:25:33.630737946 -0500
+@@ -374,7 +374,7 @@
  <H2 id="reference">Reference</h2>
  
  <p>The <a href="libnetpbm_image.html">Libnetpbm Netpbm Image
@@ -11,11 +10,10 @@ index 94d4fd4..bb1c77e 100644
  processing image data.
  
  <p>The <a href="libpm.html">Libnetpbm Utility Manual</a>
-diff --git a/userguide/pamfunc.html b/userguide/pamfunc.html
-index d158393..e0fe96a 100644
---- a/userguide/pamfunc.html
-+++ b/userguide/pamfunc.html
-@@ -57,7 +57,7 @@ output image.
+diff -u -r --new-file old/userguide/pamfunc.html new/userguide/pamfunc.html
+--- old/userguide/pamfunc.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pamfunc.html	2020-07-22 14:25:33.630737946 -0500
+@@ -55,7 +55,7 @@
  and bit string (such as and with 01001000).  For the arithmetic functions, the
  function arguments and results are the fraction that a sample is of the
  maxval, i.e. normal interpretation of PAM tuples.  But for the bit string
@@ -24,25 +22,22 @@ index d158393..e0fe96a 100644
  the sample value, and the maxval indicates the width of the bit string.
  
  <h4>Arithmetic functions</h4>
-diff --git a/userguide/pbmtog3.html b/userguide/pbmtog3.html
-index ee2bd6b..3b23517 100644
---- a/userguide/pbmtog3.html
-+++ b/userguide/pbmtog3.html
-@@ -77,7 +77,7 @@ You cannot specify both.
- <H2 id="history">HISTORY</H2>
+diff -u -r --new-file old/userguide/pbmtog3.html new/userguide/pbmtog3.html
+--- old/userguide/pbmtog3.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/pbmtog3.html	2020-07-22 14:27:19.950732066 -0500
+@@ -80,7 +80,7 @@
+ <h2 id="history">HISTORY</h2>
  
  <p>Before Netpbm 10.79 (June 2017), there was a different program by the same
 -name in Netpbm, which was written by by Paul Haeberli
 +name in Netpbm, which was written by Paul Haeberli
- &lt;<A HREF="mailto:paul@manray.sgi.com">paul@manray.sgi.com</A>&gt; in 1989
+ &lt;<a href="mailto:paul@manray.sgi.com">paul@manray.sgi.com</a>&gt; in 1989
  and then modified extensively by others.
  
-diff --git a/userguide/ppmtompeg.html b/userguide/ppmtompeg.html
-deleted file mode 100644
-index a1ce767..0000000
---- a/userguide/ppmtompeg.html
-+++ /dev/null
-@@ -1,1291 +0,0 @@
+diff -u -r --new-file old/userguide/ppmtompeg.html new/userguide/ppmtompeg.html
+--- old/userguide/ppmtompeg.html	2020-07-22 13:59:14.000000000 -0500
++++ new/userguide/ppmtompeg.html	1969-12-31 18:00:00.000000000 -0600
+@@ -1,1286 +0,0 @@
 -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 -<HTML>
 -<HEAD>
@@ -492,8 +487,7 @@ index a1ce767..0000000
 -do as a trade-off is select <b>ORIGINAL</b> here, and lower the
 -qscale (see <b>QSCALE</b> if the quality is not good enough.
 -
--<table border="1" cellpadding="5" cellspacing="0" 
--summary="comparison of original to decoded">
+-<table border="1" cellpadding="5" cellspacing="0" >
 -  <caption>Original or Decoded? (Normalized)</caption>
 -<?makeman r c c c c c. ?>
 -<?makeman _ ?>
@@ -797,7 +791,7 @@ index a1ce767..0000000
 -
 -<p>Flower garden tests:
 -
--<table border="1" cellpadding="5" cellspacing="0" summary="Qscale vs Quality">
+-<table border="1" cellpadding="5" cellspacing="0">
 -  <caption>Qscale vs Quality</caption>
 -<?makeman r r r r. ?>
 -<?makeman _ ?>
@@ -851,8 +845,7 @@ index a1ce767..0000000
 -    </tr>
 -</table>
 -
--<table border="1" cellpadding="5" cellspacing="0" 
--summary="Qscale vs Compression">
+-<table border="1" cellpadding="5" cellspacing="0">
 -  <caption>Qscale vs Compression</caption>
 -<?makeman r r r r. ?>
 -<?makeman _ ?>
@@ -925,8 +918,7 @@ index a1ce767..0000000
 -P frame search, and Cross2 and Simple for B frame search. Here are
 -some numbers comparing the different search methods:
 -     
--<table border="1" cellpadding="5" cellspacing="0" 
--summary="P frame motion vector search">
+-<table border="1" cellpadding="5" cellspacing="0">
 -  <caption>P frame Motion Vector Search (Normalized)</caption>
 -<?makeman r c c c. ?>
 -<?makeman _ ?>
@@ -962,8 +954,7 @@ index a1ce767..0000000
 -    </tr>
 -</table>
 -
--<table border="1" cellpadding="5" cellspacing="0" 
--summary="B frame motion vector search">
+-<table border="1" cellpadding="5" cellspacing="0">
 -  <caption>B frame Motion Vector Search (Normalized)</caption>
 -<?makeman r c c c. ?>
 -<?makeman _ ?>
@@ -1082,8 +1073,7 @@ index a1ce767..0000000
 -affects speed, quality, and stream size.  Here is a chart which shows
 -some of the trade-offs:
 -
--<table border="1" cellpadding="5" cellspacing="0" 
--summary="Comparison of I/P/B Frames">
+-<table border="1" cellpadding="5" cellspacing="0">
 -  <caption>Comparison of I/P/B Frames (Normalized)</caption>
 -<?makeman r c c c. ?>
 -<?makeman _ ?>
@@ -1244,7 +1234,7 @@ index a1ce767..0000000
 -<p>Here is a look at <b>ppmtompeg</b> speed, in single-node (not parallel)
 -operation:
 -
--<table border="1" cellpadding="5" cellspacing="0" summary="Compression speed">
+-<table border="1" cellpadding="5" cellspacing="0">
 -  <caption>Compression Speed</caption>
 -<?makeman r c. ?>
 -<?makeman _ ?>