Changeset 64135787 for postlfs/security/gnutls.xml

Timestamp:

04/13/2021 09:31:15 PM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

kde5-14269

Parents:

1ec0251

git-author:

Krejzi <krejzi@…> (09/13/2014 05:36:06 PM)

git-committer:

Xi Ruoyao <xry111@…> (04/13/2021 09:31:15 PM)

Message:

Begin manually (while modifying stuff) merging trunk and systemd branches since revision 14087.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/kde5@14270 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• postlfs/security/gnutls.xml (modified) (5 diffs)

postlfs/security/gnutls.xml

@@ -7 +7 @@
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "84264c7d3f5fad14b7990a4e71aa340e">
+  <!ENTITY gnutls-md5sum        "a7a73cfa883cd106d70b15300552a5b5">
   <!ENTITY gnutls-size          "5.8 MB">
   <!ENTITY gnutls-buildsize     "122 MB (additional 8 MB for the tests)">
-  <!ENTITY gnutls-time          "0.9 SBU (additional 1.9 SBU for the tests)">
+  <!ENTITY gnutls-time          "0.9 SBU (additional 1.8 SBU for the tests)">
 ]>
 
@@ -99 +99 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="cacerts"/>,
-      <xref linkend="libtasn1"/>, and
-      <xref linkend="p11-kit"/>
+      <xref linkend="cacerts"/> and
+      <xref linkend="libtasn1"/>
     </para>
 
@@ -109 +108 @@
       <xref linkend="guile"/>,
       <xref linkend="libidn"/>,
+      <xref linkend="p11-kit"/>,
       <xref linkend="unbound"/> (to build the DANE library), 
       <xref linkend="valgrind"/> (used during the test suite),
@@ -129 +129 @@
     <title>Installation of GnuTLS</title>
 
+    <para><!-- Only for 3.3.7, remove for next versions -->
+      First fix a bug in one of the libraries:
+    </para>
+
+<screen><userinput>sed -i -e '201 i#ifdef ENABLE_PKCS11' \
+       -e '213 i#endif'               \
+       lib/gnutls_privkey.c</userinput></screen>
+
     <para>
       Install <application>GnuTLS</application> by running the
@@ -162 +170 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <option>--without-p11-kit</option>: This switch disables
-      PKCS#11 support. Use it if you have not installed 
-      <xref linkend="p11-kit"/>.
-    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"