From ac451b94f86acf6a167e94e25ce9b040fda9b4ee Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 9 Feb 2022 15:30:06 -0600
Subject: [PATCH] Package updates. Update to pango-1.50.4. Update to nano-6.1.
 Update to gjs-1.70.1. Update to node.js-16.14.0. Update to libarchive-3.6.0.

---
 general/genlib/libarchive.xml      | 12 ++++++------
 general/genlib/nodejs.xml          |  6 +++---
 gnome.ent                          |  2 +-
 gnome/platform/gjs.xml             |  6 +++---
 introduction/welcome/changelog.xml | 26 ++++++++++++++++++++++++++
 packages.ent                       |  8 ++++----
 postlfs/editors/nano.xml           |  4 ++--
 x/lib/pango.xml                    |  6 +++---
 8 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/general/genlib/libarchive.xml b/general/genlib/libarchive.xml
index fd0e869b7e..982a9d714e 100644
--- a/general/genlib/libarchive.xml
+++ b/general/genlib/libarchive.xml
@@ -6,10 +6,10 @@
 
   <!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        "2ba9f1f8c169aa9caf8e2d34dde323be">
-  <!ENTITY libarchive-size          "4.7 MB">
-  <!ENTITY libarchive-buildsize     "40 MB (add 28 MB for tests)">
-  <!ENTITY libarchive-time          "0.3 SBU (add 1.0 SBU for tests)">
+  <!ENTITY libarchive-md5sum        "93f96acdb9e7277278edb154e5d76e49">
+  <!ENTITY libarchive-size          "6.1 MB">
+  <!ENTITY libarchive-buildsize     "42 MB (add 30 MB for tests)">
+  <!ENTITY libarchive-time          "0.3 SBU (add 0.8 SBU for tests)">
 ]>
 
 <sect1 id="libarchive" xreflabel="libarchive-&libarchive-version;">
@@ -105,14 +105,14 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../libarchive-&libarchive-version;-testsuite_fix-1.patch</userinput></screen>
 -->
-
+<!--
     <para>
       First, fix a bug caused by a behavior change in OpenSSL-3:
     </para>
 
 <screen><userinput remap="pre">sed -i '436a if ((OSSL_PROVIDER_load(NULL, "legacy")) == NULL) \
       return (ARCHIVE_FAILED);' libarchive/archive_digest.c</userinput></screen>
-
+-->
     <para>
       Install <application>libarchive</application> by running the following
       commands:
diff --git a/general/genlib/nodejs.xml b/general/genlib/nodejs.xml
index d1041f286d..a7191768a6 100644
--- a/general/genlib/nodejs.xml
+++ b/general/genlib/nodejs.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
   <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "110ab2733dfb0224e089b11158075ba5">
+  <!ENTITY nodejs-md5sum        "46a63d98585a4b76542776e5d5b50d15">
   <!ENTITY nodejs-size          "33 MB">
-  <!ENTITY nodejs-buildsize     "802 MB (add 27 MB for tests)">
-  <!ENTITY nodejs-time          "19 SBU (add 3.6 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
+  <!ENTITY nodejs-buildsize     "750 MB (add 27 MB for tests)">
+  <!ENTITY nodejs-time          "14 SBU (add 2.6 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
 ]>
 
 <sect1 id="nodejs" xreflabel="nodejs-&nodejs-version;">
diff --git a/gnome.ent b/gnome.ent
index f48a621d96..7950a8b37a 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -27,7 +27,7 @@
 <!ENTITY yelp-xsl-version                  "41.1">
 <!ENTITY GConf-version                     "3.2.6">
 <!ENTITY geocode-glib-version              "3.26.2">
-<!ENTITY gjs-version                       "1.70.0">
+<!ENTITY gjs-version                       "1.70.1">
 <!ENTITY gnome-autoar-version              "0.4.2">
 <!ENTITY gnome-desktop-version             "41.3">
 <!ENTITY gnome-menus-version               "3.36.0">
diff --git a/gnome/platform/gjs.xml b/gnome/platform/gjs.xml
index 547f05adfb..0a0159cd00 100644
--- a/gnome/platform/gjs.xml
+++ b/gnome/platform/gjs.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.70/gjs-&gjs-version;.tar.xz">
   <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.70/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-md5sum        "cbf534f8bc13b359160d4be5d2c40462">
-  <!ENTITY gjs-size          "584 KB">
-  <!ENTITY gjs-buildsize     "240 MB (with tests)">
+  <!ENTITY gjs-md5sum        "5762ceb7cc5ed79acb0b9614511a7024">
+  <!ENTITY gjs-size          "588 KB">
+  <!ENTITY gjs-buildsize     "226 MB (with tests)">
   <!ENTITY gjs-time          "0.6 SBU (with tests)">
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 9fdab556e9..48f3293baf 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,32 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>February 8th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to pango-1.50.4. Fixes
+          <ulink url="&blfs-ticket-root;16074">#16074</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nano-6.1. Fixes
+          <ulink url="&blfs-ticket-root;16073">#16073</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gjs-1.70.1. Fixes
+          <ulink url="&blfs-ticket-root;16072">#16072</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to node.js-16.14.0. Fixes
+          <ulink url="&blfs-ticket-root;16070">#16070</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libarchive-3.6.0. Fixes
+          <ulink url="&blfs-ticket-root;16069">#16069</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 8th, 2022</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 0bc2b5d8f5..157c36c7d0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -66,7 +66,7 @@
 <!ENTITY gedit-version                "40.1">
 <!ENTITY joe-version                  "4.6">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "6.0">
+<!ENTITY nano-version                 "6.1">
 <!ENTITY vim-version                  "8.2.4236">
 <!ENTITY vim-majmin                   "82">
 
@@ -127,7 +127,7 @@
 <!ENTITY json-glib-version            "1.6.6">
 <!ENTITY keyutils-version             "1.6.1">
 <!ENTITY libaio-version               "0.3.112">
-<!ENTITY libarchive-version           "3.5.2">
+<!ENTITY libarchive-version           "3.6.0">
 <!ENTITY libassuan-version            "2.5.5">
 <!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.6.12">
@@ -182,7 +182,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY libwpe-version               "1.12.0">
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.6">
-<!ENTITY nodejs-version               "16.13.2">
+<!ENTITY nodejs-version               "16.14.0">
 <!ENTITY npth-version                 "1.6">
 <!ENTITY nspr-version                 "4.33">
 <!ENTITY openobex-version             "1.7.2">
@@ -776,7 +776,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY libnotify-version            "0.7.9">
 <!ENTITY libxklavier-version          "5.4">
 <!ENTITY pango-minor                  "1.50">
-<!ENTITY pango-version                "&pango-minor;.3">
+<!ENTITY pango-version                "&pango-minor;.4">
 <!ENTITY pangomm-version              "2.46.2">
 <!ENTITY qt5-version                  "5.15.2">
 <!ENTITY qtwebengine-version          "5.15.8">
diff --git a/postlfs/editors/nano.xml b/postlfs/editors/nano.xml
index 0ecb1c25d5..e55874e5f7 100644
--- a/postlfs/editors/nano.xml
+++ b/postlfs/editors/nano.xml
@@ -7,8 +7,8 @@
   <!-- Note minor version in URL -->
   <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v6/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "5b6ff59f2490db80a3498c4cd3eda085">
-  <!ENTITY nano-size          "1.4 MB">
+  <!ENTITY nano-md5sum        "59ecd880ac645676e0a7543c8da3afd0">
+  <!ENTITY nano-size          "1.5 MB">
   <!ENTITY nano-buildsize     "20 MB">
   <!ENTITY nano-time          "0.2 SBU">
 ]>
diff --git a/x/lib/pango.xml b/x/lib/pango.xml
index 25e2a66a9a..70a3fdd9ed 100644
--- a/x/lib/pango.xml
+++ b/x/lib/pango.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY pango-download-http "&gnome-download-http;/pango/&pango-minor;/pango-&pango-version;.tar.xz">
   <!ENTITY pango-download-ftp  "&gnome-download-ftp;/pango/&pango-minor;/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-md5sum        "4a3a10fff421abcf3af4af66991dd622">
-  <!ENTITY pango-size          "3.9 MB">
-  <!ENTITY pango-buildsize     "53 MB (with tests)">
+  <!ENTITY pango-md5sum        "bc9616a0c2b1923476424e6f56913290">
+  <!ENTITY pango-size          "4.1 MB">
+  <!ENTITY pango-buildsize     "46 MB (with tests)">
   <!ENTITY pango-time          "0.3 SBU (with tests)">
 ]>