Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -39,6 +39,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2022-02-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Remove sed from glibc instructions in chapter 8.
+            It has been applied upstream.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-02-03</para>
       <itemizedlist>

chapter08/glibc.xml

@@ -43,11 +43,12 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
+<!-- applied in 2.35 (commit b805aebd42364fe696e417808a700fdb9800c9e8)
     <para>First, fix a security problem identified upstream:</para>
 
     <screen><userinput remap="pre">sed -e '/NOTIFY_REMOVED)/s/)/ \&amp;\&amp; data.attr != NULL)/' \
     -i sysdeps/unix/sysv/linux/mq_notify.c</userinput></screen>
-
+-->
     <para>Some of the Glibc programs use the non-FHS compliant
     <filename class="directory">/var/db</filename> directory to store
     their runtime data. Apply the following patch to make such programs