Changeset e4b4c5a0 for chapter08/glibc.xml

Timestamp:

07/01/2024 06:59:19 AM (3 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

2b63974

Parents:

fe48a03 (diff), 201aa93 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

File:

• chapter08/glibc.xml (modified) (6 diffs)

chapter08/glibc.xml

@@ -50 +50 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
-<!--
-    <para>Now fix two security vulnerabilities and a regression causing the
-    posix_memalign() function very slow in some conditions:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-fixes-patch;</userinput></screen>
--->
+
+    <para>Now fix a security vulnerability:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
@@ -168 +167 @@
         parallel make jobs).  These tests can be identified with:</para>
 
-        <!-- TODO: Using nodump for freeze.  Change it to role="test" after
-             12.1 release so jhalfs can list these in the log.  -->
-        <screen role="nodump"><userinput>grep "Timed out" -l $(find -name \*.out)</userinput></screen>
+        <screen><userinput remap="test">grep "Timed out" $(find -name \*.out)</userinput></screen>
 
         <para>It's possible to re-run a single test with enlarged timeout
@@ -237 +234 @@
             section to install
             <filename class='libraryfile'>libcrypt.so.1*</filename>
-            (overwritting
+            (replacing
             <filename class='libraryfile'>libcrypt.so.1</filename> from the
             prior Glibc installation)</emphasis>.
@@ -255 +252 @@
           <screen role='nodump'><userinput>rm -f /usr/sbin/nscd</userinput></screen>
 
-          <para>
+          <para revision='systemd'>
             If this system (prior to LFS 12.1, exclusive) is based on
             Systemd, it's also needed to disable and stop the
@@ -356 +353 @@
     locales necessary for the optimal coverage of tests:</para>
 
-<screen role="nodump"><userinput remap="locale-test">mkdir -pv /usr/lib/locale
-localedef -i C -f UTF-8 C.UTF-8
+<screen role="nodump"><userinput remap="locale-test">localedef -i C -f UTF-8 C.UTF-8
 localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
 localedef -i de_DE -f ISO-8859-1 de_DE
@@ -532 +528 @@
         <listitem>
           <para>This creates the <filename>posixrules</filename> file. We use
-          New York because POSIX requires the daylight savings time rules
+          New York because POSIX requires the daylight saving time rules
           to be in accordance with US rules.</para>
         </listitem>