From 0a2d9ff624cbab9dfc21d2c03fdd3d325b5b4e89 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 5 Dec 2019 20:16:22 +0000
Subject: [PATCH] Update to btrfs-progs-v5.4. Update to cbindgen-0.11.0. Update
 to gnutls-3.6.11.1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22431 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/cbindgen.xml           |  4 ++--
 introduction/welcome/changelog.xml  | 12 ++++++++++++
 packages.ent                        |  6 +++---
 postlfs/filesystems/btrfs-progs.xml | 18 +++++++++---------
 postlfs/security/gnutls.xml         |  8 ++++----
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/general/prog/cbindgen.xml b/general/prog/cbindgen.xml
index 7d106cf414..e09022d0dd 100644
--- a/general/prog/cbindgen.xml
+++ b/general/prog/cbindgen.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY cbindgen-download-http "https://github.com/eqrion/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
   <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "939514c0ff78898a2cb737759c49ad6e">
+  <!ENTITY cbindgen-md5sum        "05da9526406a9ac5eda199e31586a8a2">
   <!ENTITY cbindgen-size          "140 KB">
-  <!ENTITY cbindgen-buildsize     "88 MB (add 515 MB for tests) ">
+  <!ENTITY cbindgen-buildsize     "90 MB (add 513 MB for tests) ">
   <!ENTITY cbindgen-time          "0.9 SBU (Using paralleism=4; add 0.5 SBU for tests)">
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 9f55b4c100..725cccdef8 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,18 @@
      <listitem>
       <para>December 5th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-v5.4. Fixes
+          <ulink url="&blfs-ticket-root;12860">#12860</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cbindgen-0.11.0. Fixes
+          <ulink url="&blfs-ticket-root;12855">#12855</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnutls-3.6.11.1. Fixes
+          <ulink url="&blfs-ticket-root;12842">#12842</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[timtas] - Update to dovecot-2.3.9. Fixes
           <ulink url="&blfs-ticket-root;12873">#12873</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index d3fb6feeb8..6a70ce7662 100644
--- a/packages.ent
+++ b/packages.ent
@@ -12,7 +12,7 @@
 <!ENTITY cyrus-sasl-version           "2.1.27">
 <!ENTITY gnupg2-version               "2.2.18">
 <!ENTITY firewalld-version            "0.8.0">
-<!ENTITY gnutls-version               "3.6.10">
+<!ENTITY gnutls-version               "3.6.11.1">
 <!ENTITY gpgme-version                "1.13.1">
 <!ENTITY haveged-version              "1.9.2">
 <!ENTITY iptables-version             "1.8.3">
@@ -44,7 +44,7 @@
 <!ENTITY volume_key-version           "0.3.12">
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "5.3.1">
+<!ENTITY btrfs-progs-version          "5.4">
 <!ENTITY dosfstools-version           "4.1">
 <!ENTITY fuse3-version                "3.8.0">
 <!ENTITY jfsutils-version             "1.1.15">
@@ -308,7 +308,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!-- Chapter 13 -->
 <!ENTITY autoconf213-version          "2.13">
 <!ENTITY bazaar-version               "2.5.1">
-<!ENTITY cbindgen-version             "0.10.0">
+<!ENTITY cbindgen-version             "0.11.0">
 <!ENTITY check-version                "0.12.0">
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.16">
diff --git a/postlfs/filesystems/btrfs-progs.xml b/postlfs/filesystems/btrfs-progs.xml
index 2e6bb8a95c..6849c0af75 100644
--- a/postlfs/filesystems/btrfs-progs.xml
+++ b/postlfs/filesystems/btrfs-progs.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "2c4197639f144b8b15df7d17e5399595">
+  <!ENTITY btrfs-progs-md5sum        "28a228877d7a252b64f99a734ff6b7cd">
   <!ENTITY btrfs-progs-size          "2.0 MB">
-  <!ENTITY btrfs-progs-buildsize     "59 MB (add 28 MB for tests)">
-  <!ENTITY btrfs-progs-time          "0.2 SBU (add 12 SBU for tests)">
+  <!ENTITY btrfs-progs-buildsize     "62 MB (add 71 MB for tests)">
+  <!ENTITY btrfs-progs-time          "0.2 SBU (add 16 SBU for tests)">
 ]>
 
 <sect1 id="btrfs-progs" xreflabel="btrfs-progs-&btrfs-progs-version;">
@@ -135,12 +135,12 @@ mv tests/misc-tests/025-zstd-compression/test.sh{,.broken}</userinput></screen>
     class="username">root</systemitem> user): </para>
 
 <screen role="root" remap="test"><userinput>pushd tests
-   ./fsck-tests.sh
-   ./mkfs-tests.sh
-   ./cli-tests.sh
-   ./convert-tests.sh
-   ./misc-tests.sh
-   ./fuzz-tests.sh
+   ./fsck-tests.sh    <!-- 43 tests  6m14s -->
+   ./mkfs-tests.sh    <!-- 20 tests  2m48s -->
+   ./cli-tests.sh     <!-- 12 tests  0m51s -->
+   ./convert-tests.sh <!-- 16 tests 13m36s -->
+   ./misc-tests.sh    <!-- 38 tests  3m18s -->
+   ./fuzz-tests.sh    <!--  8 tests  1m11s -->
 popd</userinput></screen>
 
     <para>Install the package as the <systemitem
diff --git a/postlfs/security/gnutls.xml b/postlfs/security/gnutls.xml
index b5742b1240..6071f76590 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        "254e756d882a38ce9ad6f47589330d87">
-  <!ENTITY gnutls-size          "5.5 MB">
-  <!ENTITY gnutls-buildsize     "144 MB (add 105 MB for tests)">
-  <!ENTITY gnutls-time          "0.6 SBU (using parallelism=4; add 7.8 SBU for tests)">
+  <!ENTITY gnutls-md5sum        "3670ee0b0d95b3dee185eff2dc910ee7">
+  <!ENTITY gnutls-size          "5.6 MB">
+  <!ENTITY gnutls-buildsize     "146 MB (add 105 MB for tests)">
+  <!ENTITY gnutls-time          "0.6 SBU (using parallelism=4; add 7.6 SBU for tests)">
 ]>
 
 <sect1 id="gnutls" xreflabel="GnuTLS-&gnutls-version;">