From 2f1d1482f20abb7b27df89fbc799a6b3ce66fd2c Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sun, 4 Jun 2017 14:55:44 +0000
Subject: [PATCH] Remove unnecessary note for OpenSSL.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18786 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 packages.ent                 |  2 +-
 postlfs/security/openssl.xml |  4 +---
 server/other/openldap.xml    | 15 +++++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages.ent b/packages.ent
index 21d8e63ac9..94e66baf94 100644
--- a/packages.ent
+++ b/packages.ent
@@ -491,7 +491,7 @@
 <!ENTITY sqlite-version               "3.18.0">
 
 <!-- Chapter 23 -->
-<!ENTITY openldap-version             "2.4.44">
+<!ENTITY openldap-version             "2.4.45">
 <!ENTITY soprano-version              "2.9.4">
 <!ENTITY unbound-version              "1.6.2">
 <!ENTITY virtuoso-version             "6.1.8">
diff --git a/postlfs/security/openssl.xml b/postlfs/security/openssl.xml
index d8077654c5..30c920fd51 100644
--- a/postlfs/security/openssl.xml
+++ b/postlfs/security/openssl.xml
@@ -97,9 +97,7 @@
 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).
+      To test the results, issue: <command>make test</command>.
     </para>
 
     <para>
diff --git a/server/other/openldap.xml b/server/other/openldap.xml
index 3362383d65..e21668347a 100644
--- a/server/other/openldap.xml
+++ b/server/other/openldap.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY openldap-download-http " ">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "693ac26de86231f8dcae2b4e9d768e51">
-  <!ENTITY openldap-size          "5.4 MB">
-  <!ENTITY openldap-buildsize     "53 MB (client), 102 MB (server)">
-  <!ENTITY openldap-time          "0.7 SBU (client), 1.2 SBU (server)">
+  <!ENTITY openldap-md5sum        "00ff8301277cdfd0af728a6927042a13">
+  <!ENTITY openldap-size          "5.5 MB">
+  <!ENTITY openldap-buildsize     "55 MB (client), 107 MB (server)">
+  <!ENTITY openldap-time          "0.7 SBU (client), 1.3 SBU (server)">
 ]>
 
 <sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
@@ -85,13 +85,13 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="cyrus-sasl"/> and
-      <xref linkend="gnutls"/>
+      <xref linkend="openssl"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="icu"/>,
-      <xref linkend="openssl"/> (currently broken),
+      <xref linkend="gnutls"/>,
       <xref linkend="pth"/>,
       <xref linkend="unixodbc"/>,
         <xref linkend="mariadb"/> or
@@ -168,7 +168,6 @@ useradd  -c "OpenLDAP Daemon Owner" \
       running the following commands:
     </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;
 
@@ -178,7 +177,7 @@ autoconf &amp;&amp;
             --libexecdir=/usr/lib \
             --disable-static      \
             --disable-debug       \
-            --with-tls=gnutls     \
+            --with-tls=openssl    \
             --with-cyrus-sasl     \
             --enable-dynamic      \
             --enable-crypt        \