Index: archive/re-alpine.xml
===================================================================
--- archive/re-alpine.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
+++ archive/re-alpine.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -0,0 +1,221 @@
+<?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 re-alpine-download-http "&sourceforge-repo2;/projects/re-alpine/files/re-alpine-&re-alpine-version;.tar.bz2">
+  <!ENTITY re-alpine-download-ftp  " ">
+  <!ENTITY re-alpine-md5sum        "566d269d4bd43aba68f377110a6295d5">
+  <!ENTITY re-alpine-size          "5.1 MB">
+  <!ENTITY re-alpine-buildsize     "122 MB">
+  <!ENTITY re-alpine-time          "1.0 SBU">
+]>
+
+<sect1 id="re-alpine" xreflabel="Re-alpine-&re-alpine-version;">
+  <?dbhtml filename="re-alpine.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Re-alpine-&re-alpine-version;</title>
+
+  <indexterm zone="re-alpine">
+    <primary sortas="a-re-alpine">re-alpine</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Re-alpine</title>
+
+    <para><application>Re-alpine</application> is the continuation of Alpine;
+    a text-based email client developed by the University of Washington.</para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&re-alpine-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&re-alpine-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &re-alpine-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &re-alpine-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &re-alpine-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &re-alpine-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Re-alpine Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <xref linkend="openldap"/>,
+    <xref linkend="mitkrb"/>,
+    <xref linkend="aspell"/>,
+    <xref linkend="tcl"/>, and
+    <xref linkend="linux-pam"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/re-alpine"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Re-alpine</title>
+
+    <para>Install <application>Re-alpine</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr       \
+            --sysconfdir=/etc   \
+            --without-ldap      \
+            --without-krb5      \
+            --with-ssl-dir=/usr \
+            --with-passfile=.pine-passfile &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
+
+    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
+
+    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
+    OpenSSL libraries and include files.</para>
+
+    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
+    password cache file.</para>
+
+    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Re-alpine</title>
+
+    <sect3 id="re-alpine-config">
+      <title>Config Files</title>
+
+      <para><filename>~/.pinerc</filename></para>
+
+      <indexterm zone="re-alpine re-alpine-config">
+        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>It is not required to manually edit any configuration files to use
+      the <application>Alpine</application> email client. Users can configure
+      <application>Alpine</application> using the graphical configuration menu,
+      which stores the changes in <filename>~/.pinerc</filename>.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
+        <seg>none</seg>
+        <seg>none</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="alpine">
+        <term><command>alpine</command></term>
+        <listitem>
+          <para>is the Alpine mailer.</para>
+          <indexterm zone="re-alpine alpine">
+            <primary sortas="b-alpine">alpine</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pico">
+        <term><command>pico</command></term>
+        <listitem>
+          <para>is a standalone text editor similar to the Alpine message composer.</para>
+          <indexterm zone="re-alpine pico">
+            <primary sortas="b-pico">pico</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pilot">
+        <term><command>pilot</command></term>
+        <listitem>
+          <para>is a standalone file system navigator.</para>
+          <indexterm zone="re-alpine pilot">
+            <primary sortas="b-pilot">pilot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpdump">
+        <term><command>rpdump</command></term>
+        <listitem>
+          <para>is a utility for downloading a pinerc or address book to the
+          local machine.</para>
+          <indexterm zone="re-alpine rpdump">
+            <primary sortas="b-rpdump">rpdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpload">
+        <term><command>rpload</command></term>
+        <listitem>
+          <para> is a utility for uploading a local pinerc or address book to
+          an IMAP server.</para>
+          <indexterm zone="re-alpine rpload">
+            <primary sortas="b-rpload">rpload</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ general/genlib/apr-util.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -71,4 +71,11 @@
           Estimated build time: &apr-util-time;
         </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink url="&patch-root;/apr-util-&apr-util-version;-openssl-1.1.0-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -110,5 +117,6 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr       \
+<screen><userinput>patch -Np1 -i ../apr-util-&apr-util-version;-openssl-1.1.0-1.patch &amp;&amp;
+./configure --prefix=/usr       \
             --with-apr=/usr     \
             --with-gdbm=/usr    \
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ general/genlib/libesmtp.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -73,4 +73,9 @@
     <title>Installation of libESMTP</title>
 
+    <para>Fix a build issue with OpenSSL-1.1.0:</para>
+
+<screen><userinput>sed 's@SSL_library_init@SSL_new@g' -i configure.ac &amp;&amp;
+autoreconf -fi</userinput></screen>
+
     <para>Install <application>libESMTP</application> by running the following
     commands:</para>
Index: general/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ general/genlib/nodejs.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -108,5 +108,5 @@
       <xref linkend="c-ares"/>,
       <xref linkend="icu"/>, and
-      <xref linkend="openssl"/>
+      <xref linkend="openssl10"/>
     </para>
 
@@ -139,9 +139,10 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr          \
-            --shared-cares         \
-            --shared-openssl       \
-            --shared-zlib          \
-            --with-intl=system-icu &amp;&amp;
+<screen><userinput>PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \
+    ./configure --prefix=/usr                  \
+                --shared-cares                 \
+                --shared-openssl               \
+                --shared-zlib                  \
+                --with-intl=system-icu         &amp;&amp;
 make</userinput></screen>
 
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ general/genlib/ptlib.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -80,4 +80,10 @@
           Required patch:
           <ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-2.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/ptlib-&ptlib-version;-openssl-1.1.0-1.patch"/>
         </para>
       </listitem>
@@ -125,5 +131,6 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-openssl-1.1.0-1.patch &amp;&amp;
+patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
 
 ./configure --prefix=/usr &amp;&amp;
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ general/genlib/qca.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -77,5 +77,5 @@
     <xref linkend="nss"/>,
     <xref linkend="nspr"/>,
-    <xref linkend="openssl"/>,
+    <xref linkend="openssl10"/>,
     <xref linkend="p11-kit"/>,
     <xref linkend="doxygen"/>, and
@@ -105,8 +105,11 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$QT5DIR            \
-      -DCMAKE_BUILD_TYPE=Release                \
-      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
-      ..                                        &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=$QT5DIR                             \
+      -DCMAKE_BUILD_TYPE=Release                                 \
+      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man                  \
+      -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0             \
+      -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so       \
+      -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so \
+      ..                                                         &amp;&amp;
 
 make</userinput></screen>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ introduction/welcome/changelog.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -46,4 +46,17 @@
       <itemizedlist>
         <listitem>
+          <para>[dj] - Update to OpenSSL-1.1.0f. Fixes
+          <ulink url="&blfs-ticket-root;8214">#8214</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Add OpenSSL-1.0 Libraries for compatibility with
+          programs not yet patched for OpenSSL-1.1.0 and udpate to
+          OpenSSL-1.0.2l. Fixes <ulink
+          url="&blfs-ticket-root;9282">#9282</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Remove Re-alpine and replace with Alpine-2.21.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to fontconfig-2.12.3. Fixes
           <ulink url="&blfs-ticket-root;9302">#9302</ulink>.</para>
@@ -66,6 +79,6 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to Regexp-Common-2017060201 (Perl Module). Fixes
-          <ulink url="&blfs-ticket-root;9314">#9314</ulink>.</para>
+          <para>[bdubbs] - Update to Regexp-Common-2017060201 (Perl Module).
+          Fixes <ulink url="&blfs-ticket-root;9314">#9314</ulink>.</para>
         </listitem>
         <listitem>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ multimedia/videoutils/mplayer.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -212,5 +212,5 @@
       <xref linkend="fribidi"/>,
       <xref linkend="gnutls"/>,
-      <xref linkend="openssl"/>,
+      <!-- <xref linkend="openssl"/>, only valid for samba3 at this time -->
       <xref linkend="opus"/>, and
       <xref linkend="unrar"/>;
Index: networking/mailnews/alpine.xml
===================================================================
--- networking/mailnews/alpine.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
+++ networking/mailnews/alpine.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -0,0 +1,233 @@
+<?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 alpine-download-http "http://alpine.freeiz.com/alpine/release/src/alpine-&alpine-version;.tar.xz">
+  <!ENTITY alpine-download-ftp  " ">
+  <!ENTITY alpine-md5sum        "02dad85c1be80ce020206f222ecf5ac8">
+  <!ENTITY alpine-size          "4.6 MB">
+  <!ENTITY alpine-buildsize     "122 MB">
+  <!ENTITY alpine-time          "1.0 SBU">
+]>
+
+<sect1 id="alpine" xreflabel="Alpine-&alpine-version;">
+  <?dbhtml filename="alpine.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Alpine-&alpine-version;</title>
+
+  <indexterm zone="alpine">
+    <primary sortas="a-alpine">alpine</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Alpine</title>
+
+    <para><application>Alpine</application> is a text-based email client
+    developed by the University of Washington.</para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&alpine-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&alpine-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &alpine-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &alpine-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &alpine-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &alpine-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <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">
+    <xref linkend="openldap"/>,
+    <xref linkend="mitkrb"/>,
+    <xref linkend="aspell"/>,
+    <xref linkend="tcl"/>, and
+    <xref linkend="linux-pam"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/alpine"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Alpine</title>
+
+    <para>Install <application>Alpine</application> by running the following
+    commands:</para>
+
+<screen><userinput>LIBS+="-lcrypto" ./configure --prefix=/usr       \
+                             --sysconfdir=/etc   \
+                             --without-ldap      \
+                             --without-krb5      \
+                             --without-pam       \
+                             --without-tcl       \
+                             --with-ssl-dir=/usr \
+                             --with-passfile=.pine-passfile &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>LIBS+="-lcrypto"</command>: Enable linking to
+    <xref linkend="openssl"/>. Additional linker flags are required for 
+    <xref linkend="linux-pam"/>, <option>-lpam</option>, and for
+    <xref linkend="mitkrb"/>, <option>-lkrb5</option>.</para>
+
+    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
+
+    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
+
+    <para><parameter>--without-pam</parameter>: Disables Linux-PAM
+    support.</para>
+
+    <para><parameter>--without-tcl</parameter>: Disables TCL support.</para>
+
+    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
+    OpenSSL libraries and include files.</para>
+
+    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
+    password cache file.</para>
+
+    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Alpine</title>
+
+    <sect3 id="alpine-config">
+      <title>Config Files</title>
+
+      <para><filename>~/.pinerc</filename></para>
+
+      <indexterm zone="alpine alpine-config">
+        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>It is not required to manually edit any configuration files to use
+      the <application>Alpine</application> email client. Users can configure
+      <application>Alpine</application> using the graphical configuration menu,
+      which stores the changes in <filename>~/.pinerc</filename>.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
+        <seg>none</seg>
+        <seg>none</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="alpine-bin">
+        <term><command>alpine</command></term>
+        <listitem>
+          <para>is the Alpine mailer.</para>
+          <indexterm zone="alpine alpine-bin">
+            <primary sortas="b-alpine-bin">alpine</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pico">
+        <term><command>pico</command></term>
+        <listitem>
+          <para>is a standalone text editor similar to the Alpine message composer.</para>
+          <indexterm zone="alpine pico">
+            <primary sortas="b-pico">pico</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pilot">
+        <term><command>pilot</command></term>
+        <listitem>
+          <para>is a standalone file system navigator.</para>
+          <indexterm zone="alpine pilot">
+            <primary sortas="b-pilot">pilot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpdump">
+        <term><command>rpdump</command></term>
+        <listitem>
+          <para>is a utility for downloading a pinerc or address book to the
+          local machine.</para>
+          <indexterm zone="alpine rpdump">
+            <primary sortas="b-rpdump">rpdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpload">
+        <term><command>rpload</command></term>
+        <listitem>
+          <para> is a utility for uploading a local pinerc or address book to
+          an IMAP server.</para>
+          <indexterm zone="alpine rpload">
+            <primary sortas="b-rpload">rpload</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ networking/mailnews/fetchmail.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -60,4 +60,11 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: &patch-root;/fetchmail-&fetchmail-version;-disable_sslv3-1.patch</para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Fetchmail Dependencies</bridgehead>
 
@@ -85,5 +92,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --with-ssl --enable-fallback=procmail &amp;&amp;
+<screen><userinput>patch -Np1 -i ../fetchmail-&fetchmail-version;-disable
+_sslv3-1.patch &amp;&amp;
+./configure --prefix=/usr --with-ssl --enable-fallback=procmail &amp;&amp;
 make</userinput></screen>
 
Index: networking/mailnews/mailnews.xml
===================================================================
--- networking/mailnews/mailnews.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ networking/mailnews/mailnews.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mutt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procmail.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="re-alpine.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpine.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other.xml"/>
 
Index: networking/mailnews/mailx.xml
===================================================================
--- networking/mailnews/mailx.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ networking/mailnews/mailx.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -77,5 +77,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> or
+    <para role="optional"><xref linkend="openssl10"/> or
     <xref linkend="nss"/>,
     <xref linkend="mitkrb"/> (for IMAP GSSAPI
@@ -103,5 +103,8 @@
 
 <screen><userinput>patch -Np1 -i ../heirloom-mailx-&mailx-version;-fixes-1.patch &amp;&amp;
-make SENDMAIL=/usr/sbin/sendmail -j1</userinput></screen>
+sed 's@&lt;openssl@&lt;openssl-1.0/openssl@' \
+    -i openssl.c fio.c makeconfig &amp;&amp;
+make LDFLAGS+="/usr/lib/openssl-1.0/" \
+     SENDMAIL=/usr/sbin/sendmail -j1</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
Index: tworking/mailnews/re-alpine.xml
===================================================================
--- networking/mailnews/re-alpine.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ 	(revision )
@@ -1,221 +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 re-alpine-download-http "&sourceforge-repo2;/projects/re-alpine/files/re-alpine-&re-alpine-version;.tar.bz2">
-  <!ENTITY re-alpine-download-ftp  " ">
-  <!ENTITY re-alpine-md5sum        "566d269d4bd43aba68f377110a6295d5">
-  <!ENTITY re-alpine-size          "5.1 MB">
-  <!ENTITY re-alpine-buildsize     "122 MB">
-  <!ENTITY re-alpine-time          "1.0 SBU">
-]>
-
-<sect1 id="re-alpine" xreflabel="Re-alpine-&re-alpine-version;">
-  <?dbhtml filename="re-alpine.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Re-alpine-&re-alpine-version;</title>
-
-  <indexterm zone="re-alpine">
-    <primary sortas="a-re-alpine">re-alpine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Re-alpine</title>
-
-    <para><application>Re-alpine</application> is the continuation of Alpine;
-    a text-based email client developed by the University of Washington.</para>
-
-    &lfs80_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&re-alpine-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&re-alpine-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &re-alpine-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &re-alpine-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &re-alpine-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &re-alpine-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Re-alpine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="openldap"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="tcl"/>, and
-    <xref linkend="linux-pam"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/re-alpine"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Re-alpine</title>
-
-    <para>Install <application>Re-alpine</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr       \
-            --sysconfdir=/etc   \
-            --without-ldap      \
-            --without-krb5      \
-            --with-ssl-dir=/usr \
-            --with-passfile=.pine-passfile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--without-ldap</parameter>: Disables LDAP support.</para>
-
-    <para><parameter>--without-krb5</parameter>: Disables Kerberos support.</para>
-
-    <para><parameter>--with-ssl-dir=/usr</parameter>: Sets the root path to
-    OpenSSL libraries and include files.</para>
-
-    <para><parameter>--with-passfile=.pine-passfile</parameter>: Sets the
-    password cache file.</para>
-
-    <para><option>--without-ssl</option>: Disables OpenSSL support.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Re-alpine</title>
-
-    <sect3 id="re-alpine-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.pinerc</filename></para>
-
-      <indexterm zone="re-alpine re-alpine-config">
-        <primary sortas="e-AA.pinerc">~/.pinerc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>It is not required to manually edit any configuration files to use
-      the <application>Alpine</application> email client. Users can configure
-      <application>Alpine</application> using the graphical configuration menu,
-      which stores the changes in <filename>~/.pinerc</filename>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>alpine, pico, pilot, rpdump, and rpload</seg>
-        <seg>none</seg>
-        <seg>none</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="alpine">
-        <term><command>alpine</command></term>
-        <listitem>
-          <para>is the Alpine mailer.</para>
-          <indexterm zone="re-alpine alpine">
-            <primary sortas="b-alpine">alpine</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pico">
-        <term><command>pico</command></term>
-        <listitem>
-          <para>is a standalone text editor similar to the Alpine message composer.</para>
-          <indexterm zone="re-alpine pico">
-            <primary sortas="b-pico">pico</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pilot">
-        <term><command>pilot</command></term>
-        <listitem>
-          <para>is a standalone file system navigator.</para>
-          <indexterm zone="re-alpine pilot">
-            <primary sortas="b-pilot">pilot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpdump">
-        <term><command>rpdump</command></term>
-        <listitem>
-          <para>is a utility for downloading a pinerc or address book to the
-          local machine.</para>
-          <indexterm zone="re-alpine rpdump">
-            <primary sortas="b-rpdump">rpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpload">
-        <term><command>rpload</command></term>
-        <listitem>
-          <para> is a utility for uploading a local pinerc or address book to
-          an IMAP server.</para>
-          <indexterm zone="re-alpine rpload">
-            <primary sortas="b-rpload">rpload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ networking/netprogs/samba.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -75,6 +75,7 @@
       <xref linkend="perl-parse-yapp"/>,
       <xref linkend="pycrypto"/>,
-      <xref linkend="python3"/>, and
-      <xref linkend="openldap"/>
+      <xref linkend="python3"/>,
+      <xref linkend="openldap"/>, and
+      <xref linkend="openssl"/> <!-- This can be removed at openldap-2.4.45.-->
     </para>
 
Index: networking/textweb/w3m.xml
===================================================================
--- networking/textweb/w3m.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ networking/textweb/w3m.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -75,5 +75,5 @@
     <para role="optional">
       <xref linkend="gpm"/>,
-      <xref linkend="openssl"/>,
+      <xref linkend="openssl10"/>,
       <xref linkend="imlib2"/>,
       <xref linkend="gtk2"/>,
@@ -103,5 +103,6 @@
 sed -i 's#gdk-pixbuf-xlib-2.0#&amp; x11#' configure &amp;&amp;
 
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+PKG_CONFIG_PATH="/usr/lib/openssl-1.0/pkgconfig" \
+    ./configure --prefix=/usr --sysconfdir=/etc  &amp;&amp;
 make</userinput></screen>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ packages.ent	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -35,5 +35,6 @@
 
 <!ENTITY openssh-version              "7.5p1">
-<!ENTITY openssl-version              "1.0.2k">
+<!ENTITY openssl-version              "1.1.0f">
+<!ENTITY openssl10-version            "1.0.2l">
 <!ENTITY p11-kit-version              "0.23.5">
 <!ENTITY polkit-version               "0.113+git_2919920+js38">
@@ -465,5 +466,5 @@
 <!ENTITY fetchmail-version            "6.3.26">
 <!ENTITY mutt-version                 "1.8.2">
-<!ENTITY re-alpine-version            "2.03">
+<!ENTITY alpine-version               "2.21">
 
 <!-- Part V -->
Index: postlfs/editors/others.xml
===================================================================
--- postlfs/editors/others.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ postlfs/editors/others.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -42,5 +42,5 @@
       <para>
         <command>pico</command> is a text editor installed as a part of <xref
-        linkend="re-alpine"/>.
+        linkend="alpine"/>.
       </para>
     </listitem>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ postlfs/security/cyrus-sasl.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -82,4 +82,10 @@
           Required patch:
           <ulink url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-fixes-3.patch"/>
+       </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/cyrus-sasl-&cyrus-sasl-version;-openssl-1.1.0-1.patch"/>
        </para>
       </listitem>
@@ -125,4 +131,5 @@
 
 <screen><userinput>patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-fixes-3.patch &amp;&amp;
+patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-openssl-1.1.0-1.patch &amp;&amp;
 autoreconf -fi &amp;&amp;
 
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ postlfs/security/liboauth.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -74,4 +74,13 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additonal Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch for use with <xref linkend="openssl"/>: <ulink 
+        url="&patch-root;/liboauth-&liboauth-version;-openssl-1.1.0-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">liboauth Dependencies</bridgehead>
 
@@ -95,4 +104,11 @@
   <sect2 role="installation">
     <title>Installation of liboauth</title>
+
+    <para>
+      If building with <xref linkend="openssl"/> support, apply a patch for the
+      new version:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../liboauth-&liboauth-version;-openssl-1.1.0-1.patch</userinput></screen>
 
     <para>
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ postlfs/security/openssh.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -79,4 +79,11 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink url="&patch-root;/openssh-&openssh-version;-openssl-1.1.0-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">OpenSSH Dependencies</bridgehead>
 
@@ -146,5 +153,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                     \
+<screen><userinput>patch -Np1 -i ../openssh-&openssh-version;-openssl-1.1.0-1.patch &amp;&amp;
+
+./configure --prefix=/usr                     \
             --sysconfdir=/etc/ssh             \
             --with-md5-passwords              \
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ postlfs/security/openssl.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -9,8 +9,8 @@
   <!ENTITY openssl-download-ftp
            "ftp://openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "f965fc0bf01bf882b31314b61391ae65">
+  <!ENTITY openssl-md5sum        "7b521dea79ab159e8ec879d2333369fa">
   <!ENTITY openssl-size          "5.1 MB">
-  <!ENTITY openssl-buildsize     "50 MB (with tests)">
-  <!ENTITY openssl-time          "1.4 SBU (with tests)">
+  <!ENTITY openssl-buildsize     "70 MB (with tests)">
+  <!ENTITY openssl-time          "1.5 SBU (with tests)">
 ]>
 
@@ -76,21 +76,4 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/openssl-&openssl-version;-fix_parallel_build-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">OpenSSL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/>
-    </para>
 
     <para condition="html" role="usernotes">
@@ -102,10 +85,4 @@
     <title>Installation of OpenSSL</title>
 
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
- 
     <para>
       Install <application>OpenSSL</application> with the following commands:
@@ -118,10 +95,10 @@
          shared                \
          zlib-dynamic &amp;&amp;
-make depend           &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 test</command>.  The
-      test suite does not support parallel jobs.
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>. One test will
+      fail if not run as the <systemitem class="username">root</systemitem>
+      user (not recommended).
     </para>
 
@@ -130,5 +107,5 @@
     </para>
 
-<screen><userinput>sed -i 's# libcrypto.a##;s# libssl.a##' Makefile</userinput></screen>
+<screen><userinput>sed -i 's# libcrypto.a##;s# libssl.a##;/INSTALL_LIBS/s#libcrypto.a##' Makefile</userinput></screen>
 
     <para>
@@ -138,7 +115,7 @@
 <!-- dev note: make INSTALL_PREFIX=<DESTDIR> MANDIR=/usr/share/man MANSUFFIX=ssl install -->
 
-<screen role="root"><userinput>make MANDIR=/usr/share/man MANSUFFIX=ssl install &amp;&amp;
-install -dv -m755 /usr/share/doc/openssl-&openssl-version;  &amp;&amp;
-cp -vfr doc/*     /usr/share/doc/openssl-&openssl-version;</userinput></screen>
+<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>
@@ -166,10 +143,7 @@
 
     <para>
-      <command>make MANDIR=/usr/share/man MANSUFFIX=ssl install</command>:
-      This command installs <application>OpenSSL</application> with the man
-      pages in <filename class="directory">/usr/share/man</filename>
-      instead of <filename class="directory">/etc/ssl/man</filename> and
-      appends "ssl" suffix to the manual page names to avoid conflicts with
-      manual pages installed by other packages.
+      <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>
 
Index: postlfs/security/openssl10.xml
===================================================================
--- postlfs/security/openssl10.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
+++ postlfs/security/openssl10.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -0,0 +1,220 @@
+<?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 openssl10-download-http
+           "https://openssl.org/source/openssl-&openssl10-version;.tar.gz">
+  <!ENTITY openssl10-download-ftp
+           "ftp://openssl.org/source/openssl-&openssl10-version;.tar.gz">
+  <!ENTITY openssl10-md5sum        "f85123cd390e864dfbe517e7616e6566">
+  <!ENTITY openssl10-size          "5.2 MB">
+  <!ENTITY openssl10-buildsize     "58 MB (with tests)">
+  <!ENTITY openssl10-time          "1.6 SBU (with tests)">
+]>
+
+<sect1 id="openssl10" xreflabel="OpenSSL-&openssl10-version; Libraries">
+  <?dbhtml filename="openssl10.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>OpenSSL-&openssl10-version;</title>
+
+  <indexterm zone="openssl10">
+    <primary sortas="a-OpenSSL10">OpenSSL-&openssl10-version;</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to OpenSSL-&openssl10-version; Libraries</title>
+
+    <para>
+      The <application>OpenSSL-&openssl10-version;</application> package
+      contains libraries relating to cryptography.  These are useful for
+      providing cryptographic functions to other packages, such as
+      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"/>.
+    </para>
+
+    &lfs80_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&openssl10-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&openssl10-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &openssl10-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &openssl10-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &openssl10-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &openssl10-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink url="&patch-root;/openssl-&openssl10-version;-compat_versioned_symbols-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">OpenSSL-&openssl10-version; Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="mitkrb"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url='&blfs-wiki;/OpenSSL'/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of OpenSSL-&openssl10-version; Libraries</title>
+
+    <note>
+      <para>
+        This package does not support parallel build.
+      </para>
+    </note>
+ 
+    <para>
+      Install <application>OpenSSL-&openssl10-version; Libraries</application>
+      with the following commands:
+    </para>
+
+
+<screen><userinput> patch -Np1 -i ../openssl-&openssl10-version;-compat_versioned_symbols-1.patch &amp;&amp;
+
+./config --prefix=/usr            \
+         --openssldir=/etc/ssl    \
+         --libdir=lib/openssl-1.0 \
+         shared                   \
+         zlib-dynamic             &amp;&amp;
+
+make depend                       &amp;&amp;
+make -j1</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -j1 test</command>.  The
+      test suite does not support parallel jobs.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make INSTALL_PREFIX=$PWD/Dest install_sw                      &amp;&amp;
+install -vdm755 /usr/lib/openssl-1.0                          &amp;&amp;
+cp -Rv Dest/usr/lib/openssl-1.0/* /usr/lib/openssl-1.0        &amp;&amp;
+mv -v  /usr/lib/openssl-1.0/lib{crypto,ssl}.so.1.0.0 /usr/lib &amp;&amp;
+ln -sv ../libssl.so.1.0.0 /usr/lib/openssl-1.0                &amp;&amp;
+ln -sv ../libcrypto.so.1.0.0 /usr/lib/openssl-1.0             &amp;&amp;
+install -vdm755 /usr/include/openssl-1.0                      &amp;&amp;
+cp -Rv Dest/usr/include/openssl /usr/include/openssl-1.0      &amp;&amp;
+sed 's@/include$@/include/openssl-1.0@' -i /usr/lib/openssl-1.0/pkgconfig/*.pc</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>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libcrypto.so.1.0.0 and libssl.so.1.0.0
+        </seg>
+        <seg>
+          /usr/lib/openssl-1.0 and /usr/include/openssl-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libcrypto10">
+        <term><filename class="libraryfile">libcrypto.so.1.0.0</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="openssl10 libcrypto10">
+            <primary sortas="c-libcrypto10">libcrypto.so.1.0.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libssl10">
+        <term><filename class="libraryfile">libssl.so.1.0.0</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="openssl10 libssl10">
+            <primary sortas="c-libssl10">libssl.so.1.0.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ postlfs/security/security.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -67,4 +67,5 @@
   <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="openssl10.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p11-kit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit.xml"/>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ server/databases/mariadb.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -79,4 +79,11 @@
     directory after installation.</para></note>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink url="&patch-root;/mariadb-&mariadb-version;-openssl-1.1.0-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
 
@@ -146,5 +153,6 @@
     </para>
 
-<screen><userinput>sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
+<screen><userinput>patch -Np1 -i ../mariadb-&mariadb-version;-openssl-1.1.0-1.patch   &amp;&amp;
+sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
 
 mkdir build &amp;&amp;
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ server/mail/sendmail.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -68,5 +68,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="openssl"/> and
+      <xref linkend="openssl10"/> and
       <xref linkend="cyrus-sasl"/>
     </para>
@@ -107,6 +107,6 @@
 <screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
 <literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP')
-APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber -ldb')
-APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
+APPENDDEF(`confLIBS', `-L/usr/lib/openssl-1.0 -lssl -lcrypto -lsasl2 -lldap -llber -ldb')
+APPENDDEF(`confINCDIRS', `-I/usr/include/sasl -I/usr/include/openssl-1.0')</literal>
 EOF</userinput></screen>
 
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ server/major/apache.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -80,4 +80,7 @@
           <ulink url="&patch-root;/httpd-&apache-version;-blfs_layout-1.patch"/>
         </para>
+      </listitem>
+      <listitem>
+        <para>Required patch: <ulink url="&patch-root;/httpd-&apache-version;-openssl-1.1.0-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -135,21 +138,23 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch           &amp;&amp;
-
-sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in            &amp;&amp;
-
-./configure --enable-authnz-fcgi                            \
-            --enable-layout=BLFS                            \
-            --enable-mods-shared="all cgi"                  \
-            --enable-mpms-shared=all                        \
-            --enable-suexec=shared                          \
-            --with-apr=/usr/bin/apr-1-config                \
-            --with-apr-util=/usr/bin/apu-1-config           \
-            --with-suexec-bin=/usr/lib/httpd/suexec         \
-            --with-suexec-caller=apache                     \
-            --with-suexec-docroot=/srv/www                  \
-            --with-suexec-logfile=/var/log/httpd/suexec.log \
-            --with-suexec-uidmin=100                        \
-            --with-suexec-userdir=public_html               &amp;&amp;
+<screen><userinput>
+patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch   &amp;&amp;
+patch -Np1 -i ../httpd-&apache-version;-openssl-1.1.0-1.patch &amp;&amp;
+
+sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in              &amp;&amp;
+
+./configure --enable-authnz-fcgi                              \
+            --enable-layout=BLFS                              \
+            --enable-mods-shared="all cgi"                    \
+            --enable-mpms-shared=all                          \
+            --enable-suexec=shared                            \
+            --with-apr=/usr/bin/apr-1-config                  \
+            --with-apr-util=/usr/bin/apu-1-config             \
+            --with-suexec-bin=/usr/lib/httpd/suexec           \
+            --with-suexec-caller=apache                       \
+            --with-suexec-docroot=/srv/www                    \
+            --with-suexec-logfile=/var/log/httpd/suexec.log   \
+            --with-suexec-uidmin=100                          \
+            --with-suexec-userdir=public_html                 &amp;&amp;
 make</userinput></screen>
 
@@ -165,5 +170,5 @@
     techniques as an unpriviledged user.</para></note>
 
-<screen role="root"><userinput>make install                                 &amp;&amp;
+<screen role="root"><userinput>make install  &amp;&amp;
 
 mv -v /usr/sbin/suexec /usr/lib/httpd/suexec &amp;&amp;
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ server/major/bind.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -253,6 +253,5 @@
 chmod 666 /srv/named/dev/{null,urandom} &amp;&amp;
 cp /etc/localtime etc &amp;&amp;
-touch /srv/named/managed-keys.bind &amp;&amp;
-cp /usr/lib/engines/libgost.so usr/lib/engines</userinput></screen>
+touch /srv/named/managed-keys.bind</userinput></screen>
 
       <para>The <filename>rndc.conf</filename> file contains information for
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ server/other/openldap.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -86,5 +86,5 @@
     <para role="recommended">
       <xref linkend="cyrus-sasl"/> and
-      <xref linkend="openssl"/>
+      <xref linkend="gnutls"/>
     </para>
 
@@ -92,4 +92,5 @@
     <para role="optional">
       <xref linkend="icu"/>,
+      <xref linkend="openssl"/> (currently broken),
       <xref linkend="pth"/>,
       <xref linkend="unixodbc"/>,
@@ -168,4 +169,5 @@
     </para>
 
+<!-- restore - -with-tls=openssl after 2.4.45 is released -->
 <screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-consolidated-2.patch &amp;&amp;
 autoconf &amp;&amp;
@@ -177,5 +179,5 @@
             --disable-static      \
             --disable-debug       \
-            --with-tls=openssl    \
+            --with-tls=gnutls     \
             --with-cyrus-sasl     \
             --enable-dynamic      \
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ x/lib/qt5.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -105,5 +105,5 @@
       <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
-      <xref linkend="openssl"/>,
+      <xref linkend="openssl10"/>,
       <xref linkend="pcre"/>,
       <xref linkend="sqlite"/>,
@@ -214,13 +214,13 @@
       </para>
 
-<screen role="nodump"><userinput>-archdatadir    /usr/lib/qt5                \
--bindir         /usr/bin/qt5                \
--plugindir      /usr/lib/qt5/plugins        \
--importdir      /usr/lib/qt5/imports        \
--headerdir      /usr/include/qt5            \
--datadir        /usr/share/qt5              \
--docdir         /usr/share/doc/qt5          \
--translationdir /usr/share/qt5/translations \
--examplesdir    /usr/share/doc/qt5/examples \</userinput></screen>
+<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
+            -bindir         /usr/bin/qt5                \
+            -plugindir      /usr/lib/qt5/plugins        \
+            -importdir      /usr/lib/qt5/imports        \
+            -headerdir      /usr/include/qt5            \
+            -datadir        /usr/share/qt5              \
+            -docdir         /usr/share/doc/qt5          \
+            -translationdir /usr/share/qt5/translations \
+            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
 
@@ -229,15 +229,19 @@
     </para>
 
-<screen><userinput>./configure -prefix         $QT5PREFIX \
-            -sysconfdir     /etc/xdg   \
-            -confirm-license           \
-            -opensource                \
-            -dbus-linked               \
-            -openssl-linked            \
-            -system-harfbuzz           \
-            -system-sqlite             \
-            -nomake examples           \
-            -no-rpath                  \
-            -skip qtwebengine          &amp;&amp;
+<screen><userinput>echo "INCLUDEPATH += /usr/include/openssl-1.0" >>           \
+                     qtbase/src/network/network.pro         &amp;&amp;
+export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' &amp;&amp;
+
+./configure -prefix $QT5PREFIX                          \
+            -sysconfdir /etc/xdg                        \
+            -confirm-license                            \
+            -opensource                                 \
+            -dbus-linked                                \
+            -openssl-linked                             \
+            -system-harfbuzz                            \
+            -system-sqlite                              \
+            -nomake examples                            \
+            -no-rpath                                   \
+            -skip qtwebengine                           &amp;&amp;
 make</userinput></screen>
 
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ xsoft/other/balsa.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -54,4 +54,11 @@
       <listitem>
         <para>Estimated build time: &balsa-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: balsa-&balsa-version;-openssl-1.1.0-1.patch</para>
       </listitem>
     </itemizedlist>
@@ -104,4 +111,8 @@
     <title>Installation of Balsa</title>
 
+    <para>Fix a build issue with <xref linkend="openssl"/>:</para>
+
+<screen><userinput>patch -Np1 -i ../balsa-&balsa-version;-openssl-1.1.0-1.patch</userinput></screen>
+
     <para>Install <application>Balsa</application> by running the following
     commands:</para>
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 14bf8790799cca39bb2fc313893dc683f5cc6a5f)
+++ xsoft/other/transmission.xml	(revision a4f3726934c514f38ef0d3f4826f765729cde9e0)
@@ -73,4 +73,11 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads:</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: transmission-&transmission-version;-openssl-1.1.0-1.patch</para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
 
@@ -101,4 +108,11 @@
   <sect2 role="installation">
     <title>Installation of Transmission</title>
+
+    <para>
+      Fix a build issue when using <xref linkend="openssl"/>:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../transmission-&transmission-version;-openssl-1.1.0-1.patch</userinput></screen>
+
     <para>
       Install <application>Transmission</application> by running the
