Changeset dc39c7b for chapter08/glibc.xml

Timestamp:

09/14/2023 10:30:17 PM (9 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

ecf738a

Parents:

ea6fdf5 (diff), ba40e32 (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:

Automatic merge of trunk into multilib

File:

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

chapter08/glibc.xml

@@ -51 +51 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
-    <para>Now fix a regression causing the posix_memalign() function 
-    to be very slow in some conditions:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-memalign-patch;</userinput></screen>
-
-    <!-- CVE-2023-4527
-         https://sourceware.org/bugzilla/show_bug.cgi?id=30842
-         https://sourceware.org/ml/libc-alpha/2023-September/151522.html -->
-    <para>Then fix a security vulnerability exploitable when the
-    <option>no-aaaa</option> option is used in
-    <filename>/etc/resolv.conf</filename>:</para>
-
-<screen><userinput remap="pre">sed \
-  -E "/__res_context_search/\
-      {N;N;s/(search \(([^,]*,){6}[^,]*)NULL/\1\&amp;alt_dns_packet_buffer/}" \
-  -i resolv/nss_dns/dns-host.c</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>The Glibc documentation recommends building Glibc
@@ -340 +328 @@
     following:</para>
 
-<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
+<screen revision='sysv'><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
 <literal># Begin /etc/nsswitch.conf
 
@@ -348 +336 @@
 
 hosts: files dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+# End /etc/nsswitch.conf</literal>
+EOF</userinput></screen>
+
+<screen revision='systemd'><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
+<literal># Begin /etc/nsswitch.conf
+
+passwd: files systemd
+group: files systemd
+shadow: files systemd
+
+hosts: mymachines resolve [!UNAVAIL=return] files myhostname dns
 networks: files