Index: archive/openssl.xml
===================================================================
--- archive/openssl.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
+++ archive/openssl.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -0,0 +1,284 @@
+<?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 openssl-download-http
+           "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
+  <!ENTITY openssl-download-ftp
+           "ftp://openssl.org/source/openssl-&openssl-version;.tar.gz">
+  <!ENTITY openssl-md5sum        "ba5f1b8b835b88cadbce9b35ed9531a6">
+  <!ENTITY openssl-size          "5.2 MB">
+  <!ENTITY openssl-buildsize     "73 MB (with tests)">
+  <!ENTITY openssl-time          "1.5 SBU (with tests)">
+]>
+
+<sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
+  <?dbhtml filename="openssl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>OpenSSL-&openssl-version;</title>
+
+  <indexterm zone="openssl">
+    <primary sortas="a-OpenSSL">OpenSSL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to OpenSSL</title>
+
+    <para>
+      The <application>OpenSSL</application> package contains management tools
+      and libraries relating to cryptography.  These are useful for providing
+      cryptographic functions to other packages, such as
+      <application>OpenSSH</application>, email applications and web browsers
+      (for accessing HTTPS sites).
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&openssl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&openssl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &openssl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &openssl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &openssl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &openssl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url='&blfs-wiki;/OpenSSL'/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of OpenSSL</title>
+
+    <para>
+      Install <application>OpenSSL</application> with the following commands:
+    </para>
+
+
+<screen><userinput>./config --prefix=/usr         \
+         --openssldir=/etc/ssl \
+         --libdir=lib          \
+         shared                \
+         zlib-dynamic &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+    </para>
+
+    <para>
+      If you want to disable installing the static libraries, use this sed:
+    </para>
+
+<screen><userinput>sed -i 's# libcrypto.a##;s# libssl.a##;/INSTALL_LIBS/s#libcrypto.a##' Makefile</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<!-- dev note: make INSTALL_PREFIX=<DESTDIR> MANDIR=/usr/share/man MANSUFFIX=ssl install -->
+
+<screen role="root"><userinput>make MANSUFFIX=ssl install           &amp;&amp;
+mv -v /usr/share/doc/openssl{,-&openssl-version;} &amp;&amp;
+cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>shared</parameter>: This parameter forces the creation of
+      shared libraries along with the static libraries.
+    </para>
+
+    <para>
+      <parameter>zlib-dynamic</parameter>: This parameter adds
+      compression/decompression functionality using the
+      <filename class="libraryfile">libz</filename> library.
+    </para>
+
+    <para>
+      <option>no-rc5 no-idea</option>: When added to the
+      <command>./config</command> command, this will eliminate the building
+      of those encryption methods. Patent licenses may be needed for you to
+      utilize either of those methods in your projects.
+    </para>
+
+    <para>
+      <command>make MANSUFFIX=ssl install</command>:
+      This command appends an "ssl" suffix to the manual page names to avoid
+      conflicts with manual pages installed by other packages.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring OpenSSL</title>
+
+    <sect3 id="openssl-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/ssl/openssl.cnf</filename>
+      </para>
+
+      <indexterm zone="openssl openssl-config">
+        <primary sortas="e-etc-ssl-openssl.cnf">/etc/ssl/openssl.cnf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Most users will want to install Certificate Authority Certificates
+        for validation of downloaded certificates. For example, these
+        certificates can be used by <xref linkend='git'/>,
+        <xref linkend='curl'/> or <xref linkend='wget'/> when accessing secure
+        (https protocol) sites. To do this, follow the instructions from the
+        <xref linkend='cacerts'/> page.
+      </para>
+
+      <para>
+        Users who just want to use <application>OpenSSL</application> for
+        providing functions to other programs such as
+        <application>OpenSSH</application> and web browsers do not need to worry
+        about additional configuration. This is an advanced topic and those
+        who do need it would normally be expected to either know how to properly
+        update <filename>/etc/ssl/openssl.cnf</filename> or be able to find out
+        how to do it.
+      </para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          c_rehash and openssl
+        </seg>
+        <seg>
+          libcrypto.{so,a} and libssl.{so,a}
+        </seg>
+        <seg>
+          /etc/ssl,
+          /usr/include/openssl,
+          /usr/lib/engines and
+          /usr/share/doc/openssl-&openssl-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="c_rehash">
+        <term><command>c_rehash</command></term>
+        <listitem>
+          <para>
+            is a <application>Perl</application> script that scans all files in
+            a directory and adds symbolic links to their hash values.
+          </para>
+          <indexterm zone="openssl c_rehash">
+            <primary sortas="b-c_rehash">c_rehash</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openssl-prog">
+        <term><command>openssl</command></term>
+        <listitem>
+          <para>
+            is a command-line tool for using the various cryptography functions
+            of <application>OpenSSL</application>'s crypto library from the
+            shell. It can be used for various functions which are documented in
+            <command>man 1 openssl</command>.
+          </para>
+          <indexterm zone="openssl openssl-prog">
+            <primary sortas="b-openssl">openssl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcrypto">
+        <term><filename class="libraryfile">libcrypto.{so,a}</filename></term>
+        <listitem>
+          <para>
+            implements a wide range of cryptographic algorithms used in various
+            Internet standards. The services provided by  this library are used
+            by the <application>OpenSSL</application> implementations of SSL,
+            TLS and S/MIME, and they have also been used to implement
+            <application>OpenSSH</application>,
+            <application>OpenPGP</application>, and other cryptographic
+            standards.
+          </para>
+          <indexterm zone="openssl libcrypto">
+            <primary sortas="c-libcrypto">libcrypto.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libssl">
+        <term><filename class="libraryfile">libssl.{so,a}</filename></term>
+        <listitem>
+          <para>
+            implements the Transport Layer Security (TLS v1) protocol.
+            It provides a rich API, documentation
+            on which can be found by running <command>man 3 ssl</command>.
+          </para>
+          <indexterm zone="openssl libssl">
+            <primary sortas="c-libssl">libssl.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general.ent	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 10th, &year;">
+<!ENTITY releasedate  "February 11th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/genlib/apr-util.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -80,10 +80,10 @@
       <xref linkend="apr"/>
     </para>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -141,6 +141,5 @@
       switches enable the
       <filename class="libraryfile">apr_crypto_openssl-1.so</filename>
-      plugin. Remove them if you have not installed
-      <xref linkend="openssl"/>.
+      plugin. 
     </para>
 
Index: general/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/genlib/libarchive.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -77,6 +77,5 @@
       <xref linkend="libxml2"/>,
       <xref linkend="lzo"/>, and
-      <xref linkend="nettle"/> or
-      <xref linkend="openssl"/>
+      <xref linkend="nettle"/> 
     </para>
 
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/genlib/libesmtp.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -57,10 +57,10 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">libESMTP Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="openssl"/></para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libesmtp"/></para>
Index: general/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/genlib/nodejs.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -81,7 +81,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="c-ares"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="openssl"/>
+      <xref linkend="c-ares"/> and
+      <xref linkend="icu"/>
     </para>
 
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/genlib/ptlib.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -93,6 +93,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="alsa-lib"/> and
-      <xref linkend="openssl"/>
+      <xref linkend="alsa-lib"/> 
     </para>
 
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/prog/git.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -111,5 +111,4 @@
       <xref linkend="curl"/> (needed to use <application>Git</application> over http,
       https, ftp or ftps),
-      <xref linkend="openssl"/>,
       <xref linkend="perl-error"/>, and
       <xref linkend="python2"/>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/prog/perl-modules.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -1460,7 +1460,4 @@
         <itemizedlist>
           <listitem>
-            <para><xref linkend="openssl"/></para>
-          </listitem>
-          <listitem>
             <para><xref linkend="perl-lwp"/></para>
           </listitem>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/prog/php.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -161,5 +161,4 @@
     <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>,
       <xref linkend="cyrus-sasl"/>,
       <xref linkend="mitkrb"/>,
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/prog/python2.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -104,13 +104,10 @@
     <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>,
       <xref linkend="sqlite"/> and
       <xref linkend="tk"/>
     </para>
-
+<!--
     <note>
       <para>
-      <!-- new for ff31.  Any reasonable version of openssl will do,
-      even old maintained versions, so do not xref openssl here -->
         If you are building <xref linkend="thunderbird"/> or
         <xref linkend="firefox"/>
@@ -119,5 +116,5 @@
       </para>
     </note>
-
+-->
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/Python"/>
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/prog/python3.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -107,6 +107,5 @@
     <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
     <para role="optional">
-      <xref linkend="db"/>,
-      <xref linkend="openssl"/> and
+      <xref linkend="db"/> and
       <xref linkend="sqlite"/>
     </para>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ general/prog/ruby.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -79,5 +79,4 @@
       <xref linkend="doxygen"/>,
       <xref linkend="graphviz"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="tk"/>,
       <xref linkend="valgrind"/>, and
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ introduction/welcome/changelog.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -42,4 +42,21 @@
     </listitem>
 -->
+    <listitem>
+      <para>February 11th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Archive openssl-1.1.x. Moved to LFS. </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to v4l-utils-1.14.2. Fixes
+          <ulink url="&blfs-ticket-root;10365">#10365</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vlc-3.0.0. Fixes
+          <ulink url="&blfs-ticket-root;10361">#10361</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 10th, 2018</para>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ multimedia/libdriv/pulseaudio.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -89,5 +89,4 @@
       <xref linkend="glib2"/>,
       <xref linkend="libcap-pam"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="speex"/> and
       <xref linkend="xorg7-lib"/>
Index: multimedia/libdriv/v4l-utils.xml
===================================================================
--- multimedia/libdriv/v4l-utils.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ multimedia/libdriv/v4l-utils.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -7,5 +7,5 @@
   <!ENTITY v4l-download-http "https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-&v4l-utils-version;.tar.bz2">
   <!ENTITY v4l-download-ftp  " ">
-  <!ENTITY v4l-md5sum        "ef714ee52510ff57e6d45fb0a0224464">
+  <!ENTITY v4l-md5sum        "330f265c49122042b2340e4257a5c753">
   <!ENTITY v4l-size          "1.6 MB">
   <!ENTITY v4l-buildsize     "55 MB">
@@ -31,5 +31,5 @@
 
     <para>
-      <application>v4l-utils</application> provides  a series of utilities for
+      <application>v4l-utils</application> provides a series of utilities for
       media devices, allowing to handle the proprietary formats available at
       most webcams (libv4l), and providing tools to test V4L devices.
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ multimedia/videoutils/ffmpeg.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -111,5 +111,4 @@
       <xref linkend="opencv"/>,
       <xref linkend="openjpeg"/>,
-      <xref linkend="openssl"/> or
       <xref linkend="gnutls"/>,
       <xref linkend="pulseaudio"/>,
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ multimedia/videoutils/vlc.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -7,8 +7,8 @@
   <!ENTITY vlc-download-http "https://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
   <!ENTITY vlc-download-ftp  " ">
-  <!ENTITY vlc-md5sum        "b721fddf65aaf64eeee5629aa9bf7c9e">
-  <!ENTITY vlc-size          "21 MB">
-  <!ENTITY vlc-buildsize     "546 MB (add 3 MB for tests)">
-  <!ENTITY vlc-time          "1.6 SBU (using parallelism=4; add 0.1 SBU for tests)">
+  <!ENTITY vlc-md5sum        "a953d8b90e56f06828c4ca8e390c5c9b">
+  <!ENTITY vlc-size          "24 MB">
+  <!ENTITY vlc-buildsize     "615 MB (add 12 MB for tests)">
+  <!ENTITY vlc-time          "2.0 SBU (using parallelism=4; add 0.2 SBU for tests)">
 ]>
 
@@ -71,15 +71,4 @@
         <para>
           Estimated build time: &vlc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/>
         </para>
       </listitem>
@@ -222,13 +211,13 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch    &amp;&amp;
-sed -i 's/error-implicit-function-declaration//' configure &amp;&amp;
-
-./configure --prefix=/usr --disable-atmo &amp;&amp;
+<screen><userinput>sed -i '/luaL_checkint(/s/checkint/checkinteger/' modules/lua/{demux,libs/*}.c &amp;&amp;
+sed -i '/DEPRECATED/s:^://:'  modules/text_renderer/freetype/text_layout.c     &amp;&amp;
+
+BUILDCC=gcc ./configure --prefix=/usr &amp;&amp;
 
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -236,5 +225,5 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
-
+<!--
     <note>
       <para>
@@ -245,5 +234,5 @@
       </para>
     </note>
-
+-->
 <screen role="root"><userinput>make docdir=/usr/share/doc/vlc-&vlc-version; install</userinput></screen>
 
@@ -257,21 +246,11 @@
 
     <para>
-      <command>sed ... configure</command>: This command removes 
-      a gcc option that treats a warning as an error.
-    </para>
-<!--
-    <para>
-      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar>: This environment variable
-      ensures the use of the correct variation of <xref linkend='lua'/>.
-    </para>
--->
-    <para>
-      <parameter>--disable-atmo</parameter>: This switch disables
-      trying to build AtmoLight (homemade Philips Ambilight clone).
-    </para>
-
-    <para>
-      <option>--enable-opencv=no</option>: This switch disables
-      <application>OpenCV</application> suport.
+      <command>sed ... modules/lua/...</command>: This command allows
+      building with the current version of <xref linkend="lua"/>.
+    </para>
+
+    <para>
+      <command>sed ... text_layout.c</command>: This command allows
+      building with the current version of <xref linkend="freetype2"/>.
     </para>
 
Index: networking/mailnews/alpine.xml
===================================================================
--- networking/mailnews/alpine.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/mailnews/alpine.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -58,10 +58,10 @@
 
     <bridgehead renderas="sect3">Alpine Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
     <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -106,5 +106,5 @@
 
     <para><command>LIBS+="-lcrypto"</command>: Enable linking to
-    <xref linkend="openssl"/>. Additional linker flags are required for 
+    openssl. Additional linker flags are required for 
     <xref linkend="linux-pam"/>, <option>-lpam</option>, and for
     <xref linkend="mitkrb"/>, <option>-lkrb5</option>.</para>
Index: networking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/mailnews/fetchmail.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -71,5 +71,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="openssl"/> and
       a local MDA (<xref linkend="procmail"/>)
     </para>
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/mailnews/mutt.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -82,5 +82,4 @@
       an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
       <xref linkend="slang"/>,
-      <xref linkend="openssl"/> or
       <xref linkend="gnutls"/>,
       <xref linkend="db"/> or
@@ -202,6 +201,5 @@
 
     <para><option>--with-ssl</option>: This parameter adds SSL/TLS
-    support from <xref linkend="openssl"/> in POP3/IMAP/SMTP if they are
-    enabled.</para>
+    support from openssl in POP3/IMAP/SMTP.</para>
 
     <para><option>--with-sasl</option>: This parameter adds
Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netlibs/curl.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -90,6 +90,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref role="runtime" linkend="cacerts"/> (runtime) and
-      <xref linkend="openssl"/>
+      <xref role="runtime" linkend="cacerts"/> (runtime) 
     </para>
 
Index: networking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netlibs/ldns.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -74,10 +74,10 @@
 
     <bridgehead renderas="sect3">ldns Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: networking/netlibs/libevent.xml
===================================================================
--- networking/netlibs/libevent.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netlibs/libevent.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -78,10 +78,10 @@
 
     <bridgehead renderas="sect3">libevent Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: networking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netlibs/neon.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -73,5 +73,5 @@
 
     <bridgehead renderas="sect3">neon Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -79,7 +79,8 @@
       <xref linkend="gnutls"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="gnutls"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="mitkrb"/>,
Index: networking/netlibs/serf.xml
===================================================================
--- networking/netlibs/serf.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netlibs/serf.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="apr-util"/>,
-      <xref linkend="openssl"/>, and
+      <xref linkend="apr-util"/> and
       <xref linkend="scons"/>
     </para>
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netprogs/ntp.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -75,8 +75,6 @@
       <xref linkend="libcap-pam"/>,
       <xref linkend="libevent"/>, 
-      <xref linkend="openssl"/>,
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>, and
-      <ulink url="https://www.gnu.org/software/autogen/">libopts from
-      AutoGen</ulink>
+      <ulink url="https://www.gnu.org/software/autogen/">libopts from AutoGen</ulink>
     </para>
 
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netprogs/samba.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -74,7 +74,6 @@
       <xref linkend="libxslt"/> (for documentation),
       <xref linkend="perl-parse-yapp"/>,
-      <xref linkend="pycrypto"/>,
-      <xref linkend="openldap"/>, and
-      <xref linkend="openssl"/> <!-- This can be removed at openldap-2.4.45.-->
+      <xref linkend="pycrypto"/>, and
+      <xref linkend="openldap"/>
     </para>
 
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netprogs/wget.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref role="runtime" linkend="cacerts"/> (runtime),
-      <xref linkend="openssl"/>
+      <xref role="runtime" linkend="cacerts"/> (runtime)
     </para>
 
@@ -135,5 +134,5 @@
     <para>
       <parameter>--with-ssl=openssl</parameter>: This allows the program to use
-      <xref linkend="openssl"/> instead of <xref linkend="gnutls"/>.
+      openssl instead of <xref linkend="gnutls"/>.
     </para>
 
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netprogs/wpa_supplicant.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -91,6 +91,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libnl"/> and
-      <xref linkend="openssl"/>
+      <xref linkend="libnl"/> 
     </para>
 
Index: networking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netutils/bind-utils.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -68,7 +68,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="openssl"/>
+      <xref linkend="libcap-pam"/> and
+      <xref linkend="libxml2"/>
     </para>
 
Index: networking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netutils/nmap.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -81,5 +81,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>,
       <xref linkend="pygtk"/> (required for <command>zenmap</command>),
       <xref linkend="python2"/> (required for <command>ndiff</command>) and
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/netutils/wireshark.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -112,5 +112,4 @@
       <xref linkend="mitkrb"/>,
       <xref linkend="nghttp2"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="sbc"/>,
       <ulink url="http://www.ibr.cs.tu-bs.de/projects/libsmi/">libsmi</ulink>,
Index: networking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/textweb/links.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -60,8 +60,8 @@
 
     <bridgehead renderas="sect3">Links Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="openssl"/></para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">Graphics mode requires at least one of
Index: networking/textweb/lynx.xml
===================================================================
--- networking/textweb/lynx.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ networking/textweb/lynx.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -73,10 +73,10 @@
 
     <bridgehead renderas="sect3">Lynx Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: packages.ent
===================================================================
--- packages.ent	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ packages.ent	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -36,5 +36,5 @@
 
 <!ENTITY openssh-version              "7.6p1">
-<!ENTITY openssl-version              "1.1.0g">
+<!-- <!ENTITY openssl-version              "1.1.0g"> -->
 <!ENTITY openssl10-version            "1.0.2n">
 <!ENTITY p11-kit-version              "0.23.9">
@@ -820,5 +820,5 @@
 <!ENTITY speexdsp-version             "1.2rc3">
 <!ENTITY taglib-version               "1.11.1">
-<!ENTITY v4l-utils-version            "1.14.1">
+<!ENTITY v4l-utils-version            "1.14.2">
 <!ENTITY x264-version                 "20170822-2245">
 <!ENTITY x265-version                 "2.6">
@@ -848,5 +848,5 @@
 <!ENTITY xine-ui-version              "0.99.10">
 <!ENTITY transcode-version            "1.1.7">
-<!ENTITY vlc-version                  "2.2.8">
+<!ENTITY vlc-version                  "3.0.0">
 
 <!-- Chapter 49 -->
Index: postlfs/security/cacerts.xml
===================================================================
--- postlfs/security/cacerts.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/cacerts.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -72,8 +72,8 @@
 
     <bridgehead renderas="sect3">Certificate Authority Certificates Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="openssl"/></para>
-
+-->
    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
     <para role="optional">
Index: postlfs/security/cryptsetup.xml
===================================================================
--- postlfs/security/cryptsetup.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/cryptsetup.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -78,7 +78,6 @@
       <xref linkend="popt"/>, and one of
       <xref linkend="libgcrypt"/>, 
-      <xref linkend="nettle"/>,
-      <xref linkend="nss"/>, or
-      <xref linkend="openssl"/> (libgcrypt is the default)
+      <xref linkend="nettle"/>, or
+      <xref linkend="nss"/> (libgcrypt is the default)
     </para>
 
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/cyrus-sasl.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -93,10 +93,10 @@
 
     <bridgehead renderas="sect3">Cyrus SASL Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/liboauth.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -77,5 +77,5 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch for use with <xref linkend="openssl"/>: <ulink 
+        <para>Required patch for use with openssl: <ulink 
         url="&patch-root;/liboauth-&liboauth-version;-openssl-1.1.0-2.patch"/>
         </para>
@@ -87,11 +87,10 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="curl"/> and
-      <xref linkend="openssl"/> or
-      <xref linkend="nss"/>
+      <xref linkend="curl"/> 
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="nss"/> and
       <xref linkend="doxygen"/> (to build documentation)
     </para>
@@ -106,6 +105,5 @@
 
     <para>
-      If building with <xref linkend="openssl"/> support, apply a patch for the
-      new version:
+      Apply a patch for the current version of openssl:
     </para>
 
Index: postlfs/security/nettle.xml
===================================================================
--- postlfs/security/nettle.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/nettle.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -70,5 +70,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Nettle Dependencies</bridgehead>
 
@@ -77,5 +77,5 @@
       <xref linkend="openssl"/> (for examples)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/nettle"/>
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/openssh.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -87,10 +87,10 @@
 
     <bridgehead renderas="sect3">OpenSSH Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="openssl"/> or
       <ulink url="http://www.libressl.org/">LibreSSL Portable</ulink></para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -99,4 +99,5 @@
       <xref linkend="mitkrb"/>,
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>,
+      <ulink url="http://www.libressl.org/">LibreSSL Portable</ulink>,
       <ulink url="https://github.com/OpenSC/OpenSC/wiki">OpenSC</ulink>, and
       <ulink url="http://www.citi.umich.edu/projects/smartcard/sectok.html">libsectok</ulink>
Index: stlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ 	(revision )
@@ -1,284 +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 openssl-download-http
-           "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-download-ftp
-           "ftp://openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "ba5f1b8b835b88cadbce9b35ed9531a6">
-  <!ENTITY openssl-size          "5.2 MB">
-  <!ENTITY openssl-buildsize     "73 MB (with tests)">
-  <!ENTITY openssl-time          "1.5 SBU (with tests)">
-]>
-
-<sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
-  <?dbhtml filename="openssl.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>OpenSSL-&openssl-version;</title>
-
-  <indexterm zone="openssl">
-    <primary sortas="a-OpenSSL">OpenSSL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenSSL</title>
-
-    <para>
-      The <application>OpenSSL</application> package contains management tools
-      and libraries relating to cryptography.  These are useful for providing
-      cryptographic functions to other packages, such as
-      <application>OpenSSH</application>, email applications and web browsers
-      (for accessing HTTPS sites).
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openssl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openssl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openssl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openssl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openssl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openssl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url='&blfs-wiki;/OpenSSL'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenSSL</title>
-
-    <para>
-      Install <application>OpenSSL</application> with the following commands:
-    </para>
-
-
-<screen><userinput>./config --prefix=/usr         \
-         --openssldir=/etc/ssl \
-         --libdir=lib          \
-         shared                \
-         zlib-dynamic &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      If you want to disable installing the static libraries, use this sed:
-    </para>
-
-<screen><userinput>sed -i 's# libcrypto.a##;s# libssl.a##;/INSTALL_LIBS/s#libcrypto.a##' Makefile</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make INSTALL_PREFIX=<DESTDIR> MANDIR=/usr/share/man MANSUFFIX=ssl install -->
-
-<screen role="root"><userinput>make MANSUFFIX=ssl install           &amp;&amp;
-mv -v /usr/share/doc/openssl{,-&openssl-version;} &amp;&amp;
-cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>shared</parameter>: This parameter forces the creation of
-      shared libraries along with the static libraries.
-    </para>
-
-    <para>
-      <parameter>zlib-dynamic</parameter>: This parameter adds
-      compression/decompression functionality using the
-      <filename class="libraryfile">libz</filename> library.
-    </para>
-
-    <para>
-      <option>no-rc5 no-idea</option>: When added to the
-      <command>./config</command> command, this will eliminate the building
-      of those encryption methods. Patent licenses may be needed for you to
-      utilize either of those methods in your projects.
-    </para>
-
-    <para>
-      <command>make MANSUFFIX=ssl install</command>:
-      This command appends an "ssl" suffix to the manual page names to avoid
-      conflicts with manual pages installed by other packages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenSSL</title>
-
-    <sect3 id="openssl-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/ssl/openssl.cnf</filename>
-      </para>
-
-      <indexterm zone="openssl openssl-config">
-        <primary sortas="e-etc-ssl-openssl.cnf">/etc/ssl/openssl.cnf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Most users will want to install Certificate Authority Certificates
-        for validation of downloaded certificates. For example, these
-        certificates can be used by <xref linkend='git'/>,
-        <xref linkend='curl'/> or <xref linkend='wget'/> when accessing secure
-        (https protocol) sites. To do this, follow the instructions from the
-        <xref linkend='cacerts'/> page.
-      </para>
-
-      <para>
-        Users who just want to use <application>OpenSSL</application> for
-        providing functions to other programs such as
-        <application>OpenSSH</application> and web browsers do not need to worry
-        about additional configuration. This is an advanced topic and those
-        who do need it would normally be expected to either know how to properly
-        update <filename>/etc/ssl/openssl.cnf</filename> or be able to find out
-        how to do it.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          c_rehash and openssl
-        </seg>
-        <seg>
-          libcrypto.{so,a} and libssl.{so,a}
-        </seg>
-        <seg>
-          /etc/ssl,
-          /usr/include/openssl,
-          /usr/lib/engines and
-          /usr/share/doc/openssl-&openssl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="c_rehash">
-        <term><command>c_rehash</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that scans all files in
-            a directory and adds symbolic links to their hash values.
-          </para>
-          <indexterm zone="openssl c_rehash">
-            <primary sortas="b-c_rehash">c_rehash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openssl-prog">
-        <term><command>openssl</command></term>
-        <listitem>
-          <para>
-            is a command-line tool for using the various cryptography functions
-            of <application>OpenSSL</application>'s crypto library from the
-            shell. It can be used for various functions which are documented in
-            <command>man 1 openssl</command>.
-          </para>
-          <indexterm zone="openssl openssl-prog">
-            <primary sortas="b-openssl">openssl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcrypto">
-        <term><filename class="libraryfile">libcrypto.{so,a}</filename></term>
-        <listitem>
-          <para>
-            implements a wide range of cryptographic algorithms used in various
-            Internet standards. The services provided by  this library are used
-            by the <application>OpenSSL</application> implementations of SSL,
-            TLS and S/MIME, and they have also been used to implement
-            <application>OpenSSH</application>,
-            <application>OpenPGP</application>, and other cryptographic
-            standards.
-          </para>
-          <indexterm zone="openssl libcrypto">
-            <primary sortas="c-libcrypto">libcrypto.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libssl">
-        <term><filename class="libraryfile">libssl.{so,a}</filename></term>
-        <listitem>
-          <para>
-            implements the Transport Layer Security (TLS v1) protocol.
-            It provides a rich API, documentation
-            on which can be found by running <command>man 3 ssl</command>.
-          </para>
-          <indexterm zone="openssl libssl">
-            <primary sortas="c-libssl">libssl.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/openssl10.xml
===================================================================
--- postlfs/security/openssl10.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/openssl10.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -38,5 +38,5 @@
       email applications and web browsers (for accessing HTTPS sites). This
       package provides only the libraries and headers for packages that have
-      not yet been ported to <xref linkend="openssl"/>.
+      not yet been ported to openssl-1.1.x or later.
     </para>
 
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/security.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl10.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p11-kit.xml"/>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/stunnel.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -68,10 +68,10 @@
 
     <bridgehead renderas="sect3">stunnel Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ postlfs/security/tripwire.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -72,8 +72,8 @@
 -->
     <bridgehead renderas="sect3">Tripwire Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="openssl"/></para>
-
+-->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: pst/ps/mupdf.xml
===================================================================
--- pst/ps/mupdf.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ pst/ps/mupdf.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -99,5 +99,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>,
       <xref role="runtime" linkend="xdg-utils"/> (runtime),
       <ulink url="http://www.glfw.org/">GLFW</ulink>, and
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/databases/mariadb.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -81,6 +81,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="openssl"/>
+      <xref linkend="cmake"/> 
     </para>
 
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/databases/postgresql.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -64,5 +64,4 @@
       <xref linkend="python2"/>,
       <xref linkend="tcl"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="libxslt"/>,
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/mail/dovecot.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -91,5 +91,4 @@
       <xref linkend="mitkrb"/> (for GSSAPI support),
       <xref linkend="openldap"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="sqlite"/>,
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/mail/exim.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -81,10 +81,10 @@
       <xref linkend="pcre"/>
     </para>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/mail/postfix.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -79,7 +79,6 @@
     <para role="recommended">
       <xref linkend="db"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="libnsl"/>, and
-      <xref linkend="openssl"/>
+      <xref linkend="cyrus-sasl"/>, and
+      <xref linkend="libnsl"/>
     </para>
 
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/major/apache.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -90,10 +90,10 @@
       <xref linkend="pcre"/>
     </para>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="openssl"/>
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/major/bind.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -73,6 +73,5 @@
       <xref linkend="libcap-pam"/>,
       <xref linkend="libxml2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openssl"/>, and
+      <xref linkend="mitkrb"/>, and
       <ulink url='https://github.com/cjheath/geoip'>geoip</ulink>
     </para>
Index: server/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/major/proftpd.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -65,5 +65,4 @@
       <xref linkend="linux-pam"/>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openssl"/>,
       <xref linkend="pcre"/>, and
       <xref linkend="postgresql"/> 
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/other/openldap.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -85,6 +85,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="cyrus-sasl"/> and
-      <xref linkend="openssl"/>
+      <xref linkend="cyrus-sasl"/> 
     </para>
 
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ server/other/unbound.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -75,12 +75,12 @@
 
     <bridgehead renderas="sect3">Unbound Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="openssl"/>
-<!-- broken?
+ broken?
       or <xref linkend="nss"/>
+    </para>
 -->
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ x/installing/xorg-server.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -87,7 +87,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="openssl"/> or
-      <xref linkend="nettle"/> or
-      <xref linkend="libgcrypt"/>,
       <xref linkend="pixman"/>, and at runtime:
       <xref role="runtime" linkend="xorg7-font"/> and
@@ -112,4 +109,6 @@
       <xref linkend="doxygen"/> (to build API documentation),
       <xref linkend="fop"/> (to build documentation),
+      <xref linkend="nettle"/>,
+      <xref linkend="libgcrypt"/>,
       <xref linkend="xcb-util-keysyms"/>,
       <xref linkend="xcb-util-image"/>,
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/graphweb/firefox.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -160,5 +160,5 @@
       </para>
     </note>
-
+<!--
     <note>
       <para>
@@ -176,5 +176,5 @@
       </para>
     </note>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/graphweb/seamonkey.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -134,5 +134,5 @@
       </para>
     </note>
-
+<!--
     <note>
       <para>
@@ -149,5 +149,5 @@
       </para>
     </note>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/office/libreoffice.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -197,6 +197,4 @@
       <xref linkend="nss"/>,
       <xref linkend="openldap"/> (if connecting to an LDAP server),
-      <xref linkend="openssl"/> or
-      <xref linkend="gnutls"/>,
       <xref linkend="poppler"/>,
       <xref linkend="postgresql"/>,
@@ -214,4 +212,5 @@
       <xref linkend="doxygen"/> (not relevant if using --disable-odk),
       <xref linkend="gdb"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="junit"/>,
 <!--      <xref linkend="kdelibs"/>, -->
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/other/balsa.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -91,5 +91,4 @@
       package),
       <xref linkend="openldap"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="sqlite"/>,
       <xref linkend="webkitgtk"/>,
@@ -111,5 +110,5 @@
     <title>Installation of Balsa</title>
 
-    <para>Fix a build issue with <xref linkend="openssl"/>:</para>
+    <para>Fix a build issue with openssl:</para>
 
 <screen><userinput>patch -Np1 -i ../balsa-&balsa-version;-openssl-1.1.0-1.patch</userinput></screen>
Index: xsoft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/other/hexchat.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -77,5 +77,4 @@
       <xref linkend="libcanberra"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="pciutils"/>, and
       <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/other/thunderbird.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -103,5 +103,5 @@
       </para>
     </note>
-
+<!--
     <note>
       <para>
@@ -120,5 +120,5 @@
       </para>
     </note>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 24334132bd3fd659b99bac4876fd066080e9c26d)
+++ xsoft/other/transmission.xml	(revision 94b4290307dc5dc77e3e85c1ddc83d9461a28448)
@@ -77,7 +77,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="libevent"/>, and
-      <xref linkend="openssl"/>
+      <xref linkend="curl"/>, and
+      <xref linkend="libevent"/>
     </para>
 
