[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 27a3ec9bb8d499ab9eb48ef7e945109e37c80155
Merge: 896438995 4344f6bde
Author: zeckma-tech <[email protected]>
AuthorDate: Mon Jul 6 13:22:49 2026 -0600

    Merge branch 'trunk' into openrc

 appendices/dependencies.xml |  4 +--
 chapter01/changelog.xml     | 58 +++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml      | 16 +++++-----
 chapter03/patches.xml       | 13 ++++++--
 chapter08/openssl.xml       |  7 +++-
 chapter08/python.xml        |  2 +-
 chapter08/shadow.xml        | 16 ++++++++++
 chapter08/systemd.xml       | 20 ++++++++----
 chapter08/tar.xml           |  4 +++
 chapter11/whatnow.xml       |  2 +-
 general.ent                 |  2 +-
 packages.ent                | 78 ++++++++++++++++++++++-----------------------
 patches.ent                 | 17 +++++-----
 13 files changed, 167 insertions(+), 72 deletions(-)

diff --cc chapter03/patches.xml
index 722e72f20,ea4a8a027..14b9b4147
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@@ -134,22 -126,13 +134,22 @@@
      </varlistentry>
  -->
      <varlistentry>
-       <term>Python OpenSSL 4 Patch - <token>&python-openssl4-fixes-patch-size;</token>:</term>
+       <term>Python Consolidated Patch - <token>&python-consolidated-fixes-patch-size;</token>:</term>
        <listitem>
-         <para>Download: <ulink url="&patches-root;&python-openssl4-fixes-patch;"/></para>
-         <para>MD5 sum: <literal>&python-openssl4-fixes-patch-md5;</literal></para>
+         <para>Download: <ulink url="&patches-root;&python-consolidated-fixes-patch;"/></para>
+         <para>MD5 sum: <literal>&python-consolidated-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>
diff --cc patches.ent
index 3ed91e3f5,210ef8387..b6e7a0d2e
--- a/patches.ent
+++ b/patches.ent
@@@ -55,12 -51,10 +55,6 @@@
  <!ENTITY readline-fixes-patch-size "13 KB">
  -->
  
- <!--
--<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
--<!ENTITY sysvinit-consolidated-patch-md5 "3af8fd8e13cad481eeeaa48be4247445">
--<!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
- -->
--
  <!--
  <!ENTITY systemd-upstream-patch "systemd-&systemd-version;-buildfix-1.patch">
  <!ENTITY systemd-upstream-patch-md5 "f08b5f6d1337ac9b0ed06ff9fa4226af">

-- 
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