Automatic merge of trunk into multilib

appendices/dependencies.xml

@@ -2811,6 +2811,7 @@
               url="&blfs-book;general/python-modules.html#lxml">lxml</ulink>,
             <ulink url="http://lz4.github.io/lz4/">LZ4</ulink>,
             <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>,
+            <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
             <ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink>,
             <ulink url="&blfs-book;postlfs/polkit.html">Polkit</ulink>,
             <ulink url="&blfs-book;postlfs/qemu.html">qemu</ulink>,

chapter01/changelog.xml

@@ -44,6 +44,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-08-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - add p11-kit to dependencies list for systemd.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-08-14</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -39,9 +39,9 @@
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bash &bash-version;</para>
     </listitem>

general.ent

@@ -7,7 +7,7 @@
      for releases (including -rc) -->
 <!--
 <!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-rc1">
+<!ENTITY versiond        "10.2-systemd-rc1">
 <!ENTITY releasedate     "August 26th, 2021">
 <!ENTITY copyrightdate   "1999-2021">
 -->