Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision ae0944a3cae36ab3ffd3360a1cbe68dcd1a4f6cf)
+++ postlfs/security/gnutls.xml	(revision 3d8d0049b19bfcd5ed744441278d4f719c17f78d)
@@ -8,8 +8,8 @@
   <!ENTITY gnutls-download-ftp  "&gnupg-ftp;/gnutls/v3.7/gnutls-&gnutls-version;.tar.xz">
   <!ENTITY gnutls-download-ftp  " ">
-  <!ENTITY gnutls-md5sum        "1123a7bcc2fafd703e5a811bc1beb179">
+  <!ENTITY gnutls-md5sum        "95c32a1af583ecfcb280648874c0fbd9">
   <!ENTITY gnutls-size          "5.8 MB">
-  <!ENTITY gnutls-buildsize     "163 MB (add 112 MB for tests)">
-  <!ENTITY gnutls-time          "0.9 SBU (using parallelism=4; add 7.7 SBU for tests)">
+  <!ENTITY gnutls-buildsize     "139 MB (add 112 MB for tests)">
+  <!ENTITY gnutls-time          "0.9 SBU (add 2.9 SBU for tests; both using parallelism=4)">
 ]>
 
@@ -18,5 +18,4 @@
 
   <sect1info>
-    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -55,5 +54,5 @@
     </para>
 
-    &lfs10_checked;
+    &lfs110a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,5 +119,5 @@
       <ulink url="&gnu-http;/autogen/">autogen</ulink>,
       <ulink url="https://cmocka.org/">cmocka</ulink> and
-      <ulink url="http://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite if the DANE library is built), and
+      <ulink url="https://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite if the DANE library is built), and
       <ulink url="&sourceforge-dl;/trousers/">Trousers</ulink> (Trusted Platform Module support)
     </para>
@@ -146,15 +145,10 @@
             --docdir=/usr/share/doc/gnutls-&gnutls-version; \
             --disable-guile \
+            --disable-rpath \
             --with-default-trust-store-pkcs11="pkcs11:" &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.  If a prior
-      version of <application>GnuTLS</application> (or the same version but
-      without all of the recommended dependencies) has been installed, some
-      tests may fail. If <filename>/usr/lib/libgnutls.so</filename> and the
-      target of that symlink are moved or renamed so that they cannot be found,
-      all tests should pass and the install procedure will restore
-      <filename>libgnutls.so</filename> and the versioned library it points to.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -192,4 +186,11 @@
       <parameter>--disable-guile</parameter>: This switch disables GUILE support,
       since GnuTLS does not support Guile-2.2.x yet.
+    </para>
+
+    <para>
+      <parameter>--disable-rpath</parameter>: This switch prevents building
+      GnuTLS utilities and tests with hardcoded runtime library search path.
+      Hardcoded rpath is unneeded for BLFS, and it causes test failures if
+      an old version of GnuTLS is installed.
     </para>
 
@@ -259,5 +260,5 @@
           <para>
             is used to generate X.509 certificates, certificate requests,
-            and private keys.
+            and private keys
           </para>
           <indexterm zone="gnutls certtool">
@@ -272,5 +273,5 @@
           <para>
             is a tool used to generate and check DNS resource records
-            for the DANE protocol.
+            for the DANE protocol
           </para>
           <indexterm zone="gnutls danetool">
@@ -285,5 +286,5 @@
           <para>
             is a simple client program to set up a TLS connection to some
-            other computer.
+            other computer
           </para>
           <indexterm zone="gnutls gnutls-cli">
@@ -298,5 +299,5 @@
           <para>
             is a simple client program to set up a TLS connection to some
-            other computer and produces very verbose progress results.
+            other computer and produces very verbose progress results
           </para>
           <indexterm zone="gnutls gnutls-cli-debug">
@@ -311,5 +312,5 @@
           <para>
             is a simple server program that listens to incoming TLS
-            connections.
+            connections
           </para>
           <indexterm zone="gnutls gnutls-serv">
@@ -324,5 +325,5 @@
           <para>
             is a program that can parse and print information about OCSP
-            requests/responses, generate requests and verify responses.
+            requests/responses, generate requests and verify responses
           </para>
           <indexterm zone="gnutls ocsptool">
@@ -337,5 +338,5 @@
           <para>
             is a program that allows handling data from PKCS #11 smart cards
-            and security modules.
+            and security modules
           </para>
           <indexterm zone="gnutls p11tool">
@@ -349,5 +350,5 @@
         <listitem>
           <para>
-            is a simple program that generates random keys for use with TLS-PSK.
+            is a simple program that generates random keys for use with TLS-PSK
           </para>
           <indexterm zone="gnutls psktool">
@@ -362,5 +363,5 @@
           <para>
             is a simple program that emulates the programs in the Stanford
-            SRP (Secure Remote Password) libraries using GnuTLS.
+            SRP (Secure Remote Password) libraries using GnuTLS
           </para>
           <indexterm zone="gnutls srptool">
@@ -374,5 +375,5 @@
         <listitem>
           <para>
-            contains the core API functions and X.509 certificate API functions.
+            contains the core API functions and X.509 certificate API functions
           </para>
           <indexterm zone="gnutls libgnutls">
