[blfs] 04/04: Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository blfs.

commit f6bbc00d937fceabed82fa5695b451f54d981323
Merge: d9e2e7a4cf 46c547a4eb
Author: Bruce Dubbs <[email protected]>
AuthorDate: Thu May 7 20:08:54 2026 -0500

    Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

 introduction/welcome/changelog.xml | 13 +++++++++++++
 multimedia/videoutils/ffmpeg.xml   |  6 +++---
 packages.ent                       |  8 ++++----
 xsoft/graphweb/firefox.xml         |  2 ++
 xsoft/other/freerdp.xml            |  6 +++++-
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --cc introduction/welcome/changelog.xml
index 755181ad90,bd322dbb5c..d602ddb63f
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@@ -42,22 -42,18 +42,35 @@@
      <listitem>
        <para>May 7th, 2026</para>
        <itemizedlist>
 +        <listitem>
 +          <para>[bdubbs] - Update to curl-8.20.0 (Security Update). Fixes
 +          <ulink url="&blfs-ticket-root;23216">#23216</ulink>.</para>
 +        </listitem>
 +        <listitem>
 +          <para>[bdubbs] - Update to LVM2.2.03.40. Fixes
 +          <ulink url="&blfs-ticket-root;23212">#23212</ulink>.</para>
 +        </listitem>
 +        <listitem>
 +          <para>[bdubbs] - Update to valgrind-3.27.0. Fixes
 +          <ulink url="&blfs-ticket-root;23172">#23172</ulink>.</para>
 +        </listitem>
 +        <listitem>
 +          <para>[bdubbs] - Update to git-2.54.0. Fixes
 +          <ulink url="&blfs-ticket-root;23171">#23171</ulink>.</para>
 +        </listitem>
+         <listitem>
+           <para>[jlocash] - Update to FreeRDP-3.26.0 (Security Update). Fixes
+           <ulink url="&blfs-ticket-root;23257">#23257</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[jlocash] - Update to ffmpeg-8.1.1 (Security Update). Fixes
+           <ulink url="&blfs-ticket-root;23250">#23250</ulink>.</para>
+         </listitem>
+         <listitem>
 -          <para>[jlocash] - Update to firefox-140.10.2esr and js-140.10.2 (spidermonkey) (Security Update). Fixes
++          <para>[jlocash] - Update to firefox-140.10.2esr and js-140.10.2 
++          (spidermonkey) (Security Update). Fixes
+           <ulink url="&blfs-ticket-root;23111">#23111</ulink>.</para>
+         </listitem>
        </itemizedlist>
      </listitem>
  

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page