[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 2e4bdbae33d61dd5ac10e5c2bf80aa6202b9e66e
Merge: 1ebc1c3ec c41dfeaed
Author: Zeckmathederg <[email protected]>
AuthorDate: Tue Jun 2 17:22:13 2026 -0600

    Merge branch 'trunk' into openrc

 chapter01/changelog.xml | 32 ++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml  |  8 ++++----
 chapter03/patches.xml   |  6 ++----
 chapter06/bash.xml      |  3 ++-
 chapter06/gcc-pass2.xml | 54 +++++++++++++++++++++++++++----------------------
 chapter08/gcc.xml       | 16 ++++++++-------
 chapter08/systemd.xml   |  4 ++--
 packages.ent            | 42 +++++++++++++++++++-------------------
 patches.ent             |  2 ++
 9 files changed, 103 insertions(+), 64 deletions(-)

diff --cc chapter03/patches.xml
index 5219013c4,a98cb34a6..62506246b
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@@ -140,9 -140,7 +140,7 @@@
          <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>
@@@ -150,8 -148,7 +148,8 @@@
          <para>MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal></para>
        </listitem>
      </varlistentry>
 +-->
- 
+ <!--
      <varlistentry revision="systemd">
        <term>Systemd OpenSSL 4 Patch - <token>&systemd-upstream-patch-size;</token>:</term>
        <listitem>
diff --cc patches.ent
index 090da7a82,e27f486cf..06072927e
--- a/patches.ent
+++ b/patches.ent
@@@ -59,8 -58,7 +59,9 @@@
  <!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">
  <!ENTITY systemd-upstream-patch-size "4.2 KB">

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