[lfs] 02/02: Merge
| Newsgroups | gmane.linux.lfs.book |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch multilib in repository lfs. commit b23d08908c88c48bbef8930afe290195d1980724 Author: Thomas Trepl <[email protected]> AuthorDate: Mon Aug 18 07:27:01 2025 +0200 Merge --- chapter01/whatsnew.xml | 3 --- chapter05/gcc-pass1.xml | 6 +++--- chapter08/glibc.xml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 8bd9113ca..0df323756 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -299,9 +299,6 @@ <listitem> <para>coreutils-9.7-upstream_fix-1.patch</para> </listitem> - <listitem> - <para>perl-5.40.2-upstream_fix-1.patch</para> - </listitem> </itemizedlist> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 4ed842817..1ae0979a7 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -76,9 +76,9 @@ esac</userinput></screen> <para> This example demonstrates the use of the <parameter>-i.orig</parameter> switch. It makes the - <command>sed</command> copy the <filename>t-linux64</filename> - to <filename>t-linux64.orig</filename>, and then edit the - <filename>t-linux64</filename> inplace. So you may run + <command>sed</command> copy the <filename>t-linux64</filename> file + to <filename>t-linux64.orig</filename>, and then edit the original + <filename>t-linux64</filename> file inplace. So you may run <command>diff -u gcc/config/i386/t-linux64{.orig,}</command> to visualize the change done by the <command>sed</command> command afterwards. We'll simply use <parameter>-i</parameter> (which just diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index c2c126571..7d1a0f938 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -50,7 +50,7 @@ <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen> - <para>Now fix a security vulnerability:</para> + <para>Now fix an issue which may break Valgrind in BLFS:</para> <screen><userinput remap="pre">sed -e '/unistd.h/i #include <string.h>' \ -e '/libc_rwlock_init/c\ -- 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