From 14b85031e4b0c8a55e70666288b3082620157570 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 30 May 2025 11:00:14 -0500
Subject: [PATCH] Package updates. Update to systemd-257.6. Update to
setuptools-80.9.0. Update to meson-1.8.1. Update to automake-1.18.
Add Python-3.13.3-security_fixes-1.patch
Add coreutils-9.7-upstream_fix-1.patch
Add perl-5.40.2-upstream_fix-1.patch
---
chapter01/changelog.xml | 16 ++++++++++++++++
chapter01/whatsnew.xml | 20 ++++++++++++++++----
chapter03/patches.xml | 29 ++++++++++++++++++-----------
chapter08/coreutils.xml | 4 ++++
chapter08/perl.xml | 4 ++++
chapter08/python.xml | 21 +++++++++++++++++----
packages.ent | 24 ++++++++++++------------
patches.ent | 22 +++++++++++++++++-----
8 files changed, 104 insertions(+), 36 deletions(-)
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 403b5f4c4..4106b4b6b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,22 @@
<listitem>
<para>2025-06-01</para>
<itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to systemd-257.6. Fixes
+ <ulink url='&lfs-ticket-root;5774'>#5774</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to setuptools-80.9.0. Fixes
+ <ulink url='&lfs-ticket-root;5728'>#5728</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to meson-1.8.1. Fixes
+ <ulink url='&lfs-ticket-root;5731'>#5731</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to automake-1.18. Fixes
+ <ulink url='&lfs-ticket-root;5734'>#5734</ulink>.</para>
+ </listitem>
<listitem>
<para>[bdubbs] - Update build instructions to accomodate
gcc-15 for bc, expect, ncurses, and gmp.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f21ea40d4..e81c594f4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -35,9 +35,9 @@
<!--<listitem>
<para>Autoconf-&autoconf-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Automake-&automake-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Bash-&bash-version;</para>
</listitem>
@@ -236,9 +236,9 @@
<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>Systemd-&systemd-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem revision="sysv">
<para>SysVinit-&sysvinit-version;</para>
</listitem>-->
@@ -296,6 +296,18 @@
<listitem>
<para>Packaging-&packaging-version;</para>
</listitem>
+ <listitem>
+ <para>bash-5.3-rc1-cross_compile_fix-1.patch</para>
+ </listitem>
+ <listitem>
+ <para>coreutils-9.7-upstream_fix-1.patch</para>
+ </listitem>
+ <listitem>
+ <para>perl-5.40.2-upstream_fix-1.patch</para>
+ </listitem>
+ <listitem>
+ <para>Python-3.13.3-security_fixes-1.patch</para>
+ </listitem>
</itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 907f6ed3e..435fa6acd 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -52,6 +52,14 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Coreutils Upstream Fixe Patch - <token>&coreutils-upstream-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&coreutils-upstream-patch;"/></para>
+ <para>MD5 sum: <literal>&coreutils-upstream-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>Coreutils Internationalization Fixes Patch - <token>&coreutils-i18n-patch-size;</token>:</term>
<listitem>
@@ -61,7 +69,7 @@
</varlistentry>
<varlistentry>
- <term>Expect GCC14 Patch - <token>&expect-gcc15-patch-size;</token>:</term>
+ <term>Expect GCC15 Patch - <token>&expect-gcc15-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&expect-gcc15-patch;"/></para>
<para>MD5 sum: <literal>&expect-gcc15-patch-md5;</literal></para>
@@ -118,24 +126,23 @@
</listitem>
</varlistentry>
-->
-<!--
+
<varlistentry>
- <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
+ <term>Perl Upstream Fix Patch - <token>&perl-upstream-fix-patch-size;</token>:</term>
<listitem>
- <para>Download: <ulink url="&patches-root;&pkgconf-upstream-fix-patch;"/></para>
- <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
+ <para>Download: <ulink url="&patches-root;&perl-upstream-fix-patch;"/></para>
+ <para>MD5 sum: <literal>&perl-upstream-fix-patch-md5;</literal></para>
</listitem>
</varlistentry>
--->
-<!--
+
<varlistentry>
- <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
+ <term>Python Security Fix Patch - <token>&python-security-fixes-patch-size;</token>:</term>
<listitem>
- <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
- <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
+ <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 --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 36d428981..abf5f7819 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -41,6 +41,10 @@
<sect2 role="installation">
<title>Installation of Coreutils</title>
+ <para>First apply a security patch identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-upstream-patch;</userinput></screen>
+
<para>POSIX requires that programs from Coreutils recognize character
boundaries correctly even in multibyte locales. The following patch fixes
this non-compliance and other internationalization-related bugs.</para>
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index b678f7f9d..0416aa85e 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -41,6 +41,10 @@
<sect2 role="installation">
<title>Installation of Perl</title>
+ <para>First, apply a security patch identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&perl-upstream-fix-patch;</userinput></screen>
+
<para>This version of Perl builds the Compress::Raw::Zlib and
Compress::Raw::BZip2 modules. By
default Perl will use an internal copy of the sources for the build.
diff --git a/chapter08/python.xml b/chapter08/python.xml
index ebda61181..0cbce0b0c 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -43,12 +43,17 @@
<sect2 role="installation">
<title>Installation of Python 3</title>
+ <para>First, apply a security patch to the current package:</para>
+
+ <screen><userinput remap="pre">patch -Np1 -i ../&python-security-fixes-patch;</userinput></screen>
+
<para>Prepare Python for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --enable-shared \
- --with-system-expat \
- --enable-optimizations</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+ --enable-shared \
+ --with-system-expat \
+ --enable-optimizations \
+ --without-static-libpython</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -72,6 +77,14 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>--without-static-libpython</parameter></term>
+ <listitem>
+ <para>This switch prevents building a large, but unneeded, static
+ library.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para>Compile the package:</para>
diff --git a/packages.ent b/packages.ent
index 159bbc313..405b0c373 100644
--- a/packages.ent
+++ b/packages.ent
@@ -38,11 +38,11 @@
<!ENTITY autoconf-fin-sbu-tests "0.4">
<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
-<!ENTITY automake-version "1.17">
-<!ENTITY am-minor-version "1.17">
+<!ENTITY automake-version "1.18">
+<!ENTITY am-minor-version "1.18">
<!ENTITY automake-size "1,614 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "7ab3a02318fee6f5bd42adfc369abf10">
+<!ENTITY automake-md5 "1320dd6a6aae0d97668daa089086c083">
<!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-fin-du "121 MB">
<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 1.1 SBU with tests)">
@@ -495,10 +495,10 @@
<!ENTITY markupsafe-fin-du "500 KB">
<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
-<!ENTITY meson-version "1.8.0">
-<!ENTITY meson-size "2,281 KB">
+<!ENTITY meson-version "1.8.1">
+<!ENTITY meson-size "2,278 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "74664d20851d29bc3e491d502d66e1f7">
+<!ENTITY meson-md5 "5cfd7e2b2246d874746d68ffd43a0774">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "44 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -638,10 +638,10 @@
<!ENTITY sed-fin-du "30 MB">
<!ENTITY sed-fin-sbu "0.3 SBU">
-<!ENTITY setuptools-version "80.7.1">
-<!ENTITY setuptools-size "1,289 KB">
+<!ENTITY setuptools-version "80.9.0">
+<!ENTITY setuptools-size "1,290 KB">
<!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-<!ENTITY setuptools-md5 "dc25a6f2961f8615199e9a63e6c4b431">
+<!ENTITY setuptools-md5 "82e1d67883b713f9493659b50d13b436">
<!ENTITY setuptools-home "&pypi-home;/setuptools/">
<!ENTITY setuptools-fin-du "26 MB">
<!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
@@ -662,15 +662,15 @@
<!ENTITY sysklogd-fin-du "4.1 MB">
<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
-<!ENTITY systemd-version "257.3">
+<!ENTITY systemd-version "257.6">
<!--<!ENTITY systemd-stable "6b4878d">-->
<!-- The above entity is used whenever we move to a stable backport branch.
In the event of a critical problem or kernel change that is incompatible,
we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size "15,847 KB">
+<!ENTITY systemd-size "15,940 KB">
<!ENTITY systemd-url "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
<!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5 "8e4fc90c7aead651fa5c50bd1b34abc2">
+<!ENTITY systemd-md5 "458b07e140cd65d25baf7752398c5d13">
<!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/">
<!ENTITY systemd-man-version "257.3">
<!ENTITY systemd-man-size "733 KB">
diff --git a/patches.ent b/patches.ent
index d800a74d6..dc666134a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -11,6 +11,7 @@
<!ENTITY binutils-upstream-patch-md5 "eddd9860af589ec328541a9ec5e5928e">
<!ENTITY binutils-upstream-patch-size "18 KB">
-->
+
<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
<!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
<!ENTITY bzip2-docs-patch-size "1.6 KB">
@@ -19,6 +20,10 @@
<!ENTITY coreutils-i18n-patch-md5 "33ebfad32b2dfb8417c3335c08671206">
<!ENTITY coreutils-i18n-patch-size "159 KB">
+<!ENTITY coreutils-upstream-patch "coreutils-&coreutils-version;-upstream_fix-1.patch">
+<!ENTITY coreutils-upstream-patch-md5 "96382a5aa85d6651a74f94ffb61785d9">
+<!ENTITY coreutils-upstream-patch-size "4.1 KB">
+
<!ENTITY expect-gcc15-patch "expect-&expect-version;-gcc15-1.patch">
<!ENTITY expect-gcc15-patch-md5 "0ca4d6bb8d572fbcdb13cb36cd34833e">
<!ENTITY expect-gcc15-patch-size "12 KB">
@@ -26,22 +31,29 @@
<!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
<!ENTITY glibc-fhs-patch-size "2.8 KB">
-<!--
-<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fix-2.patch">
-<!ENTITY glibc-upstream-patch-md5 "e9f8f23746755bf880772cfa59c1896c">
-<!ENTITY glibc-upstream-patch-size "8.0 KB">
--->
+
<!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
<!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
<!ENTITY kbd-backspace-patch-size "12 KB">
+
+<!ENTITY perl-upstream-fix-patch "perl-&perl-version;-upstream_fix-1.patch">
+<!ENTITY perl-upstream-fix-patch-md5 "1983b48fee837a98db47fb5dba934744">
+<!ENTITY perl-upstream-fix-patch-size "13 KB">
+
+<!ENTITY python-security-fixes-patch "Python-&python-version;-security_fixes-1.patch">
+<!ENTITY python-security-fixes-patch-md5 "55f88f3bfe711911425c3172b9024938">
+<!ENTITY python-security-fixes-patch-size "24 KB">
+
<!--
<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
<!ENTITY readline-fixes-patch-md5 "9ed497b6cb8adcb8dbda9dee9ebce791">
<!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;-upstream_fixes-1.patch">
<!ENTITY systemd-upstream-patch-md5 "8d9c1014445c463cf7c24c162b1e0686">