From fe323d3ab074b1fd6508ad6375f2e162a5dc0c4d Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Sun, 26 Sep 2021 08:24:34 +0200
Subject: [PATCH] Upgrade php-8.0.11

---
 general/prog/php.xml               | 16 ++++++++--------
 introduction/welcome/changelog.xml | 10 ++++++++++
 packages.ent                       |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/general/prog/php.xml b/general/prog/php.xml
index 9b8295702d..af1a933b1f 100644
--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "349ee590787ab46e62dae517d90b5101">
-  <!ENTITY php-size          "10.2 MB">
+  <!ENTITY php-md5sum        "d6bf70d71969f4829fbeee30fed77fb8">
+  <!ENTITY php-size          "10.3 MB">
   <!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.
@@ -18,23 +18,23 @@
        No timeouts on 8.0.5 -bdubbs
        No timeouts, one failure on 8.0.9 -bdubbs
        No timeouts on 8.0.10 - thomas
+       No timeouts on 8.0.11 - thomas
 
 TEST RESULT SUMMARY
 
 Exts skipped    :   24
 Exts tested     :   48
 
-
-Number of tests : 16397             12639
+Number of tests : 16408             12646
 Tests borked    :    3 (  0.0%)
-Tests skipped   : 3755 ( 22.9%)
+Tests skipped   : 3759 ( 22.9%)
 Tests warned    :    2 (  0.0%) (  0.0%)
 Tests failed    :   29 (  0.2%) (  0.2%)
 Expected fail   :   30 (  0.2%) (  0.2%)
-Tests passed    : 12578 ( 76.7%) ( 99.5%)
+Tests passed    : 12585 ( 76.7%) ( 99.5%)
 
-Time taken      :  583 seconds
-       -->
+Time taken      :  520 seconds
+-->
 ]>
 
 <sect1 id="php" xreflabel="PHP-&php-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 9853d2b6f9..4438105437 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>September 26th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to php-8.0.11. Fixes
+          <ulink url="&blfs-ticket-root;15611">#15611</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>September 25th, 2021</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 6ed02e2d21..243e63810b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -357,7 +357,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.10">
+<!ENTITY php-version                  "8.0.11">
 
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python2-patch                "18">