From ac6b671be53a9881400f40a7345689a294a1fe2a Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Wed, 3 Jun 2020 17:28:17 +0000
Subject: [PATCH] Update to GnuTLS-3.6.14. Fixes the root cert bug, and a
 security fix.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23242 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  8 ++++++++
 packages.ent                       |  2 +-
 postlfs/security/gnutls.xml        | 11 ++++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8cb1d34188..8c29eaac4c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
     <listitem>
       <para>June 3rd, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gnutls-3.6.14 (Security Update).
+          This includes a fix for the expired root certificate (on 5/30/2020)
+          that made several sites inaccessible in Epiphany and other GnuTLS
+          users because of a logic error with regards to using a certificate
+          with the same private key from an alternate vendor. Fixes
+          <ulink url="&blfs-ticket-root;13635">#13635</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to xkeyboard-config-2.30. Fixes
           <ulink url="&blfs-ticket-root;13630">#13630</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index a6a255dd6f..46abf65a57 100644
--- a/packages.ent
+++ b/packages.ent
@@ -12,7 +12,7 @@
 <!ENTITY cyrus-sasl-version           "2.1.27">
 <!ENTITY gnupg2-version               "2.2.20">
 <!ENTITY firewalld-version            "0.8.1">
-<!ENTITY gnutls-version               "3.6.13">
+<!ENTITY gnutls-version               "3.6.14">
 <!ENTITY gpgme-version                "1.13.1">
 <!ENTITY haveged-version              "1.9.2">
 <!ENTITY iptables-version             "1.8.4">
diff --git a/postlfs/security/gnutls.xml b/postlfs/security/gnutls.xml
index aab3bce6ca..db81d37985 100644
--- a/postlfs/security/gnutls.xml
+++ b/postlfs/security/gnutls.xml
@@ -7,10 +7,10 @@
   <!ENTITY gnutls-download-http "&gnupg-http;/gnutls/v3.6/gnutls-&gnutls-version;.tar.xz">
   <!ENTITY gnutls-download-ftp  "&gnupg-ftp;/gnutls/v3.6/gnutls-&gnutls-version;.tar.xz">
   <!ENTITY gnutls-download-ftp  " ">
-  <!ENTITY gnutls-md5sum        "bb1fe696a11543433785b4fc70ca225f">
-  <!ENTITY gnutls-size          "5.7 MB">
-  <!ENTITY gnutls-buildsize     "149 MB (add 106 MB for tests)">
-  <!ENTITY gnutls-time          "0.6 SBU (using parallelism=4; add 7.7 SBU for tests)">
+  <!ENTITY gnutls-md5sum        "bf70632d420e421baff482247f01dbfe">
+  <!ENTITY gnutls-size          "5.8 MB">
+  <!ENTITY gnutls-buildsize     "158 MB (add 115 MB for tests)">
+  <!ENTITY gnutls-time          "0.7 SBU (using parallelism=4; add 8.2 SBU for tests)">
 ]>
 
 <sect1 id="gnutls" xreflabel="GnuTLS-&gnutls-version;">
@@ -111,7 +111,8 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="guile"/>,
       <xref linkend="libidn"/> or 
-      <xref linkend="libidn2"/>
+      <xref linkend="libidn2"/>,
+      <xref linkend="libseccomp"/>,
       <xref linkend="net-tools"/> (used during the test suite),
       <xref linkend="texlive"/> or <xref linkend="tl-installer"/>,
       <xref linkend="unbound"/> (to build the DANE library),