From 65d8566876c1c73d71a422fe0f6469d2d005cd04 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 31 Jul 2021 19:51:38 -0500
Subject: [PATCH] 9ckage updates and fixes. Update to php-8.0.9. Update to
 cbindgen-0.20.0. Fix dependencies for elogind and p11kit. Fix gcr-3.40.0 to
 build properly with meson-0.59.

---
 general/prog/cbindgen.xml          |  6 +++---
 general/prog/php.xml               | 10 ++++++----
 general/sysutils/elogind.xml       | 16 ++++++++++++----
 gnome/platform/gcr.xml             |  9 +++++++++
 introduction/welcome/changelog.xml | 16 ++++++++++++++++
 packages.ent                       |  4 ++--
 postlfs/security/polkit.xml        |  3 +--
 7 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/general/prog/cbindgen.xml b/general/prog/cbindgen.xml
index e547be2a78..7269bbcb7b 100644
--- a/general/prog/cbindgen.xml
+++ b/general/prog/cbindgen.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY cbindgen-download-http "https://github.com/eqrion/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
   <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "b707b093702d4f1995f9a97f44ed081d">
+  <!ENTITY cbindgen-md5sum        "19e6e9bc319f689ef433eb59090e3f3c">
   <!ENTITY cbindgen-size          "192 KB">
-  <!ENTITY cbindgen-buildsize     "123 MB (add 533 MB for tests)">
-  <!ENTITY cbindgen-time          "0.6 SBU (add 0.4 SBU for tests), both on a 4-core machine">
+  <!ENTITY cbindgen-buildsize     "124 MB (add 568 MB for tests)">
+  <!ENTITY cbindgen-time          "0.8 SBU (add 0.4 SBU for tests), both on a 4-core machine">
 ]>
 
 <sect1 id="cbindgen" xreflabel="Cbindgen-&cbindgen-version;">
diff --git a/general/prog/php.xml b/general/prog/php.xml
index f08f9bbbe1..c6783c020f 100644
--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@@ -6,16 +6,18 @@
 
   <!ENTITY php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "ff8897b914cb8de9d218bbae877decc7">
+  <!ENTITY php-md5sum        "68a8cae879bb66425f6cfb11d94ceb02">
   <!ENTITY php-size          "10 MB">
-  <!ENTITY php-buildsize     "693 MB (with tests, add 182 MB for documentation)">
-  <!ENTITY php-time          "1.8 SBU (with parallelism=4; add 2.1 SBU for tests)">
+  <!ENTITY php-buildsize     "446 MB (with tests, add 182 MB for documentation)">
+  <!ENTITY php-time          "1.6 SBU (with parallelism=4; add 2.1 SBU for tests)">
   <!-- Tests were run for 8.0.1 at -j4, had two timeouts as well.
        Results were otherwise normal though, so I'm unsure of what caused the
        increase in time. -renodr
        No timeout for 8.0.2. Tests run at -j4 too. -pierre
        No timeouts on 8.0.3 for me this time. -renodr 
-       No timeouts on 8.0.5 -bdubbs -->
+       No timeouts on 8.0.5 -bdubbs 
+       No timeouts, one failure on 8.0.9 -bdubbs
+       -->
 ]>
 
 <sect1 id="php" xreflabel="PHP-&php-version;">
diff --git a/general/sysutils/elogind.xml b/general/sysutils/elogind.xml
index 7791ac898b..0a31de9274 100644
--- a/general/sysutils/elogind.xml
+++ b/general/sysutils/elogind.xml
@@ -87,10 +87,9 @@
     <para role="recommended">
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/> (all three to build the man pages),
+      <xref linkend="libxslt"/> (all three to build the man pages), 
       <xref linkend="linux-pam"/>, and
-      <xref linkend="polkit"/> (circular, build elogind first, then polkit,
-      then elogind again)
+      <xref linkend="polkit"/> (runtime)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -153,7 +152,9 @@ File systems ---&gt;
       commands:
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen><userinput>sed -i '/Disable polkit/,+8 d' meson.build &amp;&amp;
+
+mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 meson --prefix=/usr                        \
@@ -183,6 +184,13 @@ ln -sfvn elogind /usr/include/systemd</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed ... meson.build</command>: This change allows the
+      package to be built without polkit being installed (it is still a
+      runtime dependency) but able to use polkit after that package is 
+      installed.
+    </para>
+
     <para>
       <parameter>-Dcgroup-controller=elogind</parameter>: This switch ensures
       that <application>elogind</application> is selected as the cgroup
diff --git a/gnome/platform/gcr.xml b/gnome/platform/gcr.xml
index 810da91f72..96c9e5dee0 100644
--- a/gnome/platform/gcr.xml
+++ b/gnome/platform/gcr.xml
@@ -120,6 +120,10 @@
 
 <screen><userinput>sed -i 's:"/desktop:"/org:' schema/*.xml &amp;&amp;
 
+sed -e '208 s/@BASENAME@/gcr-viewer.desktop/'   \
+    -e '231 s/@BASENAME@/gcr-prompter.desktop/' \
+    -i ui/meson.build                           &amp;&amp;
+
 mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
@@ -150,6 +154,11 @@ ninja</userinput></screen>
       deprecated entry in the schema template.
     </para>
 
+    <para>
+      <command>sed ... ui/meson.build</command>:  This command fixes a
+      problem when building with meson-0.59.0.
+    </para>
+
     <!--
     <para>
       <!- - https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/52/ - ->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 42bd83faa1..fd3e40e99b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,22 @@
     <listitem>
       <para>July 30th, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to php-8.0.9. Fixes
+          <ulink url="&blfs-ticket-root;15332">#15332</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cbindgen-0.20.0. Fixes
+          <ulink url="&blfs-ticket-root;15331">#15331</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix dependencies for elogind and p11kit. Fixes
+          <ulink url="&blfs-ticket-root;15333">#15333</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix gcr-3.40.0 to build properly with meson-0.59. Fixes
+          <ulink url="&blfs-ticket-root;15329">#15329</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to xorg-server-1.20.13. Fixes
           <ulink url="&blfs-ticket-root;15328">#15328</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 6f32343554..5162917e59 100644
--- a/packages.ent
+++ b/packages.ent
@@ -330,7 +330,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!-- Chapter 13 -->
 <!ENTITY autoconf213-version          "2.13">
 <!ENTITY bazaar-version               "2.5.1">
-<!ENTITY cbindgen-version             "0.19.0">
+<!ENTITY cbindgen-version             "0.20.0">
 <!ENTITY check-version                "0.12.0">
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.21">
@@ -355,7 +355,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY nasm-version                 "2.15.05">
 <!ENTITY ninja-version                "1.9.0">
 <!ENTITY npapi-sdk-version            "0.27.2">
-<!ENTITY php-version                  "8.0.8">
+<!ENTITY php-version                  "8.0.9">
 
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python2-patch                "18">
diff --git a/postlfs/security/polkit.xml b/postlfs/security/polkit.xml
index adc082f3e9..de4588e79f 100644
--- a/postlfs/security/polkit.xml
+++ b/postlfs/security/polkit.xml
@@ -93,8 +93,7 @@
     <para role="recommended">
       <xref linkend="linux-pam"/>
       <phrase revision="sysv">
-        and <xref role="first" linkend="elogind"/> (circular, build
-        elogind first, then polkit, then elogind again).
+        and <xref role="first" linkend="elogind"/> 
       </phrase>
     </para>