From 17817c82bb47cc48099a912e32ad98889c4338a7 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 14 Feb 2022 21:51:30 -0600
Subject: [PATCH] Package Updates and some tweaks

Update to Exempi-2.6.1
Update to mariadb-10.6.7

libqalculate: minor typo fix

gdb: Add patch to fix issues with glibc-2.35. Bruce did the work on this
one, I just tested it
---
 general/genlib/exempi.xml          |  4 ++--
 general/genlib/libqalculate.xml    |  2 +-
 general/prog/gdb.xml               | 16 ++++++++++++++++
 introduction/welcome/changelog.xml | 19 +++++++++++++++++++
 packages.ent                       |  4 ++--
 server/databases/mariadb.xml       | 19 ++++++++++---------
 6 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/general/genlib/exempi.xml b/general/genlib/exempi.xml
index dcbec7ec8b..8f1a8af9b3 100644
--- a/general/genlib/exempi.xml
+++ b/general/genlib/exempi.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY exempi-download-http "https://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.bz2">
   <!ENTITY exempi-download-ftp  " ">
-  <!ENTITY exempi-md5sum        "96e82c244a5659a9b07ae07ca8773ad9">
+  <!ENTITY exempi-md5sum        "32cd0eb0803f9cfa69267b4a9ac4400a">
   <!ENTITY exempi-size          "3.5 MB">
-  <!ENTITY exempi-buildsize     "372 MB (add 31 MB for tests)">
+  <!ENTITY exempi-buildsize     "314 MB (add 25 MB for tests)">
   <!ENTITY exempi-time          "0.5 SBU (using parallelism=4; add 0.3 SBU for tests)">
 ]>
 
diff --git a/general/genlib/libqalculate.xml b/general/genlib/libqalculate.xml
index e973bb7dea..d371e0e4c1 100644
--- a/general/genlib/libqalculate.xml
+++ b/general/genlib/libqalculate.xml
@@ -30,7 +30,7 @@
 
     <para>
       The <application>libqalculate</application> package contains a library
-      that provides functions for a multi-purpsoe calculator.
+      that provides functions for a multi-purpose calculator.
     </para>
 
     &lfs110a_checked;
diff --git a/general/prog/gdb.xml b/general/prog/gdb.xml
index c73ce3d067..021fd694dc 100644
--- a/general/prog/gdb.xml
+++ b/general/prog/gdb.xml
@@ -75,6 +75,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gdb-&gdb-version;-upstream_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GDB Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended Runtime Dependency</bridgehead>
@@ -105,6 +115,12 @@
   <sect2 role="installation">
     <title>Installation of GDB</title>
 
+    <para>
+      First, apply some changes from upstream to fix issues with glibc-2.35:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../gdb-&gdb-version;-upstream_fixes-1.patch</userinput></screen>
+
     <para>
       Install <application>GDB</application> by running the following
       commands:
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d9f0bc4a15..c61b9df79e 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,25 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>February 14th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Patch gdb to work properly with glibc-2.35. Patch
+          crafted by Bruce. Fixes
+          <ulink url="&blfs-ticket-root;16046">#16046</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mariadb-10.6.7 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16103">#16103</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to exempi-2.6.1 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16102">#16102</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 13th, 2022</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 9b0af545f2..981e72a10d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -95,7 +95,7 @@
 <!ENTITY dbus-glib-version            "0.112">
 <!ENTITY double-conversion-version    "3.2.0">
 <!ENTITY enchant-version              "2.3.2">
-<!ENTITY exempi-version               "2.5.2">
+<!ENTITY exempi-version               "2.6.1">
 <!ENTITY expat-version                "2.1.0">
 <!ENTITY fftw-version                 "3.3.10">
 <!ENTITY gcab-version                 "0.7">
@@ -687,7 +687,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "5.3.28">
 <!ENTITY lmdb-version                 "0.9.29">
-<!ENTITY mariadb-version              "10.6.5">
+<!ENTITY mariadb-version              "10.6.7">
 <!ENTITY postgresql-version           "14.2">
 <!ENTITY sqlite-version               "3.37.2">
 <!ENTITY sqlite-dl-version            "3370200">
diff --git a/server/databases/mariadb.xml b/server/databases/mariadb.xml
index 5ddaa19dcf..2d1cb1997e 100644
--- a/server/databases/mariadb.xml
+++ b/server/databases/mariadb.xml
@@ -7,10 +7,10 @@
 
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "b04c9b93af47d698af063398d2064b96">
-  <!ENTITY mariadb-size          "81.1 MB">
-  <!ENTITY mariadb-buildsize     "2.3 GB (650 MB installed)">
-  <!ENTITY mariadb-time          "7.8 SBU (with parallelism=4, add 0.4 SBU for tests)">
+  <!ENTITY mariadb-md5sum        "8553244104a1054db1413362d68527be">
+  <!ENTITY mariadb-size          "82 MB">
+  <!ENTITY mariadb-buildsize     "2.3 GB (656 MB installed)">
+  <!ENTITY mariadb-time          "8.5 SBU (with parallelism=4, add 0.4 SBU for tests)">
 ]>
 
 <sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
@@ -73,8 +73,8 @@
 
     <note>
       <para>
-        The installed size of MariaDB is 644 MB, but this can be
-        reduced by about 244 MB, if desired, by removing the <filename
+        The installed size of MariaDB is 656 MB, but this can be
+        reduced by about 259 MB, if desired, by removing the <filename
         class="directory">/usr/share/mysql/test</filename>
         directory after installation.
       </para>
@@ -120,9 +120,10 @@
       <ulink url="http://taku910.github.io/mecab">MeCab</ulink>,
       <ulink url="http://msgpack.org/">MessagePack</ulink>,
       <ulink url="http://www.mruby.org/">mruby</ulink>,
-      <ulink url="https://google.github.io/snappy/">Snappy</ulink>,
-      <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>,
-      <ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and
+      <ulink url="https://mariadb.com/kb/en/myrocks/">MyRocks</ulink>,
+      <ulink url="https://github.com/google/snappy">Snappy</ulink>,
+      <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>, and
+      <!--<ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and-->
       <ulink url="http://zeromq.org/">ZeroMQ</ulink>
     </para>