From dd352da05f0d84694b5a0397adb16d9864a61689 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Mon, 30 Dec 2019 20:59:35 +0000
Subject: [PATCH] libarchive-4.3.1 cbindgen-0.12.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22523 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/libarchive.xml      | 10 +++++-----
 general/prog/cbindgen.xml          | 10 +++++-----
 introduction/welcome/changelog.xml |  8 ++++++++
 packages.ent                       |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/general/genlib/libarchive.xml b/general/genlib/libarchive.xml
index 7d7fd775b8..8e11847216 100644
--- a/general/genlib/libarchive.xml
+++ b/general/genlib/libarchive.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.gz">
+  <!ENTITY libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
   <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "6046396255bd7cf6d0f6603a9bda39ac">
-  <!ENTITY libarchive-size          "6.6 MB">
-  <!ENTITY libarchive-buildsize     "38 MB (add 28 MB for tests)">
-  <!ENTITY libarchive-time          "0.4 SBU (add 1.1 SBU for tests)">
+  <!ENTITY libarchive-md5sum        "3a541b90977029ad8c5aaa5a49631b15">
+  <!ENTITY libarchive-size          "4.6 MB">
+  <!ENTITY libarchive-buildsize     "46 MB (add 29 MB for tests)">
+  <!ENTITY libarchive-time          "0.4 SBU (add 1.5 SBU for tests)">
 ]>
 
 <sect1 id="libarchive" xreflabel="libarchive-&libarchive-version;">
diff --git a/general/prog/cbindgen.xml b/general/prog/cbindgen.xml
index 287f0d9708..f39c372e28 100644
--- a/general/prog/cbindgen.xml
+++ b/general/prog/cbindgen.xml
@@ -6,10 +6,10 @@
 
   <!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        "e5faee5e74ea4136ca2a63f365964555">
-  <!ENTITY cbindgen-size          "148 KB">
-  <!ENTITY cbindgen-buildsize     "91 MB (add 516 MB for tests)">
-  <!ENTITY cbindgen-time          "0.9 SBU (Using paralleism=4; add 0.5 SBU for tests)">
+  <!ENTITY cbindgen-md5sum        "d27816a078853131de8fc2f448df1f1d">
+  <!ENTITY cbindgen-size          "145 KB">
+  <!ENTITY cbindgen-buildsize     "97 MB (add 520 MB for tests)">
+  <!ENTITY cbindgen-time          "1.1 SBU (Using parallelism=4; add 0.5 SBU for tests)">
 ]>
 
 <sect1 id="cbindgen" xreflabel="Cbindgen-&cbindgen-version;">
@@ -116,7 +116,7 @@
 
     <para>
       To test the results, issue: <command>cargo test</command>.
-      Five tests, test_expand*, are known to fail.
+      Six tests, test_expand*, are known to fail.
     </para>
 
     <para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8965fa702a..bf323aed5c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
     <listitem>
       <para>December 30th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to cbindgen-0.12.1. Fixes
+          <ulink url="&blfs-ticket-root;12960">#12960</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to libarchive-3.4.1. Fixes
+          <ulink url="&blfs-ticket-root;12959">#12959</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to xvidcore-1.3.7. Fixes
           <ulink url="&blfs-ticket-root;12957">#12957</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 425bc67b3c..8d103606ed 100644
--- a/packages.ent
+++ b/packages.ent
@@ -120,7 +120,7 @@
 <!ENTITY json-glib-version            "1.4.4">
 <!ENTITY keyutils-version             "1.6.1">
 <!ENTITY libaio-version               "0.3.112">
-<!ENTITY libarchive-version           "3.4.0">
+<!ENTITY libarchive-version           "3.4.1">
 <!ENTITY libassuan-version            "2.5.3">
 <!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.6.10">
@@ -309,7 +309,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.12.0">
+<!ENTITY cbindgen-version             "0.12.1">
 <!ENTITY check-version                "0.12.0">
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.16">