[lfs] 01/01: Merge branch 'trunk' into openrc

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

git pushed a commit to branch openrc
in repository lfs.

commit e6aee072b0f7a1f7df5f5d24076cdc07d8f1cf3d
Merge: ef131860b a5e18ad3e
Author: zeckma-tech <[email protected]>
AuthorDate: Tue Aug 11 09:54:52 2026 -0600

    Merge branch 'trunk' into openrc

 chapter01/changelog.xml | 32 +++++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml  |  8 ++++----
 chapter03/patches.xml   | 11 +++++------
 chapter06/coreutils.xml |  3 +--
 chapter07/zlib.xml      |  4 ++++
 chapter08/findutils.xml |  7 ++++++-
 chapter08/glibc.xml     |  9 ++++-----
 chapter08/python.xml    |  2 +-
 chapter08/stripping.xml |  2 +-
 packages.ent            | 43 ++++++++++++++++++++++---------------------
 patches.ent             | 14 ++++++--------
 11 files changed, 85 insertions(+), 50 deletions(-)

diff --cc chapter03/patches.xml
index 7f0f16c6b,f4c591916..3c56d7e2e
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@@ -77,11 -77,10 +77,10 @@@
      </varlistentry>
  -->
  
- <!--
      <varlistentry>
-       <term>Glibc Upstream Fixes Patch - <token>&glibc-upstream-patch-size;</token>:</term>
+       <term>Glibc Upstream Fix Patch - <token>&glibc-upstream-patch-size;</token>:</term>
        <listitem>
 -        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
 +        <para>Download: <ulink url="&patches-root;glibc/&glibc-upstream-patch;"/></para>
          <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
        </listitem>
      </varlistentry>
@@@ -135,22 -126,13 +134,22 @@@
      </varlistentry>
  -->
      <varlistentry>
-       <term>Python Consolidated Patch - <token>&python-consolidated-fixes-patch-size;</token>:</term>
+       <term>Python Openssl4 Patch - <token>&python-openssl4-fixes-patch-size;</token>:</term>
        <listitem>
-         <para>Download: <ulink url="&patches-root;Python/&python-consolidated-fixes-patch;"/></para>
-         <para>MD5 sum: <literal>&python-consolidated-fixes-patch-md5;</literal></para>
 -        <para>Download: <ulink url="&patches-root;&python-openssl4-fixes-patch;"/></para>
++        <para>Download: <ulink url="&patches-root;Python/&python-openssl4-fixes-patch;"/></para>
+         <para>MD5 sum: <literal>&python-openssl4-fixes-patch-md5;</literal></para>
        </listitem>
      </varlistentry>
 -
 +<!--
 +    <varlistentry>
 +      <term>Python Security Fixes Patch - <token>&python-security-fixes-patch-size;</token>:</term>
 +      <listitem>
 +        <para>Download: <ulink url="&patches-root;&python-security-fixes-patch;"/></para>
 +        <para>MD5 sum: <literal>&python-security-fixes-patch-md5;</literal></para>
 +      </listitem>
 +    </varlistentry>
 +-->
 +<!--
      <varlistentry revision="sysv">
        <term>SysVinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
        <listitem>

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

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