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 revision="systemd">
+      <para>2023-02-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Repackage the systemd man pages to prevent stray
+          man pages from ending up in /usr/share/man.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-02-02</para>
       <itemizedlist>

chapter08/glibc.xml

@@ -50,8 +50,12 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
-    <!-- https://sourceware.org/bugzilla/show_bug.cgi?id=30068 -->
-    <para>Fix an issue identified upstream:</para>
+    <!-- https://sourceware.org/bugzilla/show_bug.cgi?id=30068
+         Upstream fix also added a test case and renamed "prec" to
+         "prec_inc".  We'll test this with MPFR test suite so we don't
+         need the test here, and the renaming does not affect program
+         behavior.  -->
+    <para>Fix a security issue identified upstream:</para>
 
 <screen><userinput remap="pre">sed '/width -=/s/workend - string/number_length/' \
     -i stdio-common/vfprintf-process-arg.c</userinput></screen>

packages.ent

@@ -655,11 +655,11 @@
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-md5      "b9456750a212dd54d81caeb3c38134b6">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "252">
+<!ENTITY systemd-man-version "252-2">
 <!ENTITY systemd-man-size "628 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
-<!ENTITY systemd-man-md5  "856ffb33ac16962f0628dcb533d76e5c">
+<!ENTITY systemd-man-md5  "c1df1aefdbc4840b5f82a8783f3b72c1">
 <!ENTITY systemd-fin-du   "258 MB">
 <!ENTITY systemd-fin-sbu  "2.5 SBU">