From 09cf41d57a5e6b069096d19d9e8933009567c8a9 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Fri, 15 Apr 2022 12:17:17 -0500
Subject: [PATCH] Two package updates

Update to ruby-3.1.2
Update to git-2.35.3
---
 general/prog/git.xml               |  6 +++---
 general/prog/ruby.xml              |  6 +++---
 introduction/welcome/changelog.xml | 14 ++++++++++++++
 packages.ent                       |  4 ++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/general/prog/git.xml b/general/prog/git.xml
index e9b56f5e45..b84fb06a33 100644
--- a/general/prog/git.xml
+++ b/general/prog/git.xml
@@ -8,15 +8,15 @@
 
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "3aae077280b6be861e3c1c637491853a">
+  <!ENTITY git-md5sum        "d903e0016fa1fc38427334303a162f8b">
 
   <!ENTITY git-size          "6.6 MB">
   <!-- but people keep forgetting that an install not only needs the net build
        space, it also needs the install space (or DESTDIR) -->
-  <!ENTITY git-buildsize     "224 MB (with downloaded documentation, add 16 MB to build documentation)">
+  <!ENTITY git-buildsize     "346 MB (with downloaded documentation, add 16 MB to build documentation)">
   <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
   <!-- Confirmed that it is disk related.-->
-  <!ENTITY git-time          "0.3 SBU (with parallelism=4; add 0.6 SBU for building documentation and 1.6 SBU for tests, both with parallelism=4)">
+  <!ENTITY git-time          "0.5 SBU (with parallelism=4; add 0.5 SBU for building documentation and 2.5 SBU for tests, both with parallelism=4)">
 ]>
 
 <sect1 id="git" xreflabel="git-&git-version;">
diff --git a/general/prog/ruby.xml b/general/prog/ruby.xml
index 6d25647257..6096597318 100644
--- a/general/prog/ruby.xml
+++ b/general/prog/ruby.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY ruby-download-http "https://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
   <!ENTITY ruby-download-ftp  " ">
-  <!ENTITY ruby-md5sum        "10bdff100c2a096cb0365e31ea57db59">
+  <!ENTITY ruby-md5sum        "e2c35af69d1f94e8634f38c80e809c0d">
   <!ENTITY ruby-size          "14 MB">
-  <!ENTITY ruby-buildsize     "611 MB (add 1.1 GB for C API docs)">
-  <!ENTITY ruby-time          "1.8 SBU (using parallelism=4; add 8.6 SBU for tests; add 1.3 SBU for C API docs)">
+  <!ENTITY ruby-buildsize     "612 MB (add 1.1 GB for C API docs)">
+  <!ENTITY ruby-time          "2.2 SBU (using parallelism=4; add 7.5 SBU for tests; add 0.8 SBU for C API docs)">
 ]>
 
 <sect1 id="ruby" xreflabel="Ruby-&ruby-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index aecf1b395b..17bb192c75 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,20 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>April 15th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to ruby-3.1.2 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16405">#16405</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to git-2.35.3 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16402">#16402</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>April 14th, 2022</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 27e4ddb765..d49d9c5cd3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -353,7 +353,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY gcc-version                  "11.2.0">
 <!ENTITY gc-version                   "8.0.6">
 <!ENTITY gdb-version                  "11.2">
-<!ENTITY git-version                  "2.35.1">
+<!ENTITY git-version                  "2.35.3">
 <!ENTITY guile-version                "3.0.8">
 <!ENTITY librep-version               "0.92.7">
 <!ENTITY llvm-majmin-version          "14.0">
@@ -379,7 +379,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY python3-lib-suffix           "cpython-&python3-major;&python3-minor;-&lt;arch&gt;-linux-gnu">
 
 <!ENTITY ruby-minor-version           "3.1">
-<!ENTITY ruby-patch-version           "1">
+<!ENTITY ruby-patch-version           "2">
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
 <!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
 <!ENTITY rust-version                 "1.60.0">