From 13c75b20fa0b3bb3676908f6d54c00db2430f8bb Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 21 Dec 2021 10:00:16 -0600
Subject: [PATCH] Package updates. Update to httpd-2.4.52. Update to
 asciidoc-10.1.1. Update to icewm-2.9.3.

---
 general/prog/asciidoc.xml          |  2 +-
 introduction/welcome/changelog.xml | 18 ++++++++++++++++++
 packages.ent                       |  6 +++---
 server/major/apache.xml            |  8 ++++----
 x/wm/icewm.xml                     |  4 ++--
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/general/prog/asciidoc.xml b/general/prog/asciidoc.xml
index 120ee5d5ef..ea6b666c00 100644
--- a/general/prog/asciidoc.xml
+++ b/general/prog/asciidoc.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
   <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "557018db4fabf976bc43d02c4581f834">
+  <!ENTITY asciidoc-md5sum        "39569c2399bbb018256e74d14255c79c">
   <!ENTITY asciidoc-size          "212 KB">
   <!ENTITY asciidoc-buildsize     "2.7 MB">
   <!ENTITY asciidoc-time          "less than 0.1 SBU">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 1755b125aa..fc12de8b83 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,24 @@
     </listitem>
     -->
 
+    <listitem>
+      <para>December 21st, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to httpd-2.4.52. Fixes
+          <ulink url="&blfs-ticket-root;15882">#15882</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to asciidoc-10.1.1. Fixes
+          <ulink url="&blfs-ticket-root;15884">#15884</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to icewm-2.9.3. Fixes
+          <ulink url="&blfs-ticket-root;15778">#15778</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 20th, 2021</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 39e74dffa0..00701eedf4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -557,7 +557,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 
 <!-- Python module versions used in the Python Modules instructions -->
 <!-- <!ENTITY Beaker-version               "1.10.0"> -->
-<!ENTITY asciidoc-version             "10.1.0">
+<!ENTITY asciidoc-version             "10.1.1">
 <!ENTITY docutils-version             "0.18.1">
 <!ENTITY dbus-python-version          "1.2.18">
 <!ENTITY dbusmock-version             "0.24.1">
@@ -664,7 +664,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 
 <!-- Part V -->
 <!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.51">
+<!ENTITY apache-version               "2.4.52">
 <!ENTITY proftpd-version              "1.3.7c">
 <!ENTITY vsftpd-version               "3.0.5">
 
@@ -794,7 +794,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 
 <!-- Chapter 27 -->
 <!ENTITY fluxbox-version              "1.3.7">
-<!ENTITY icewm-version                "2.8.0">
+<!ENTITY icewm-version                "2.9.3">
 <!ENTITY openbox-version              "3.6.1">
 <!ENTITY sawfish-version              "1.12.0">
 
diff --git a/server/major/apache.xml b/server/major/apache.xml
index 7793072293..ea38d98dd8 100644
--- a/server/major/apache.xml
+++ b/server/major/apache.xml
@@ -7,10 +7,10 @@
   <!ENTITY apache-download-http
            "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "d2793fc1c8cb8ba355cee877d1f2d46d">
-  <!ENTITY apache-size          "7.2 MB">
-  <!ENTITY apache-buildsize     "127 MB">
-  <!ENTITY apache-time          "0.8 SBU">
+  <!ENTITY apache-md5sum        "a94ae42b84309d5ef6e613ae825b92fa">
+  <!ENTITY apache-size          "7.1 MB">
+  <!ENTITY apache-buildsize     "88 MB">
+  <!ENTITY apache-time          "0.4 SBU (Using parallelism=4)">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
diff --git a/x/wm/icewm.xml b/x/wm/icewm.xml
index 3f4db0b931..e7f05c4a21 100644
--- a/x/wm/icewm.xml
+++ b/x/wm/icewm.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY icewm-download-http "https://github.com/ice-wm/icewm/archive/&icewm-version;/icewm-&icewm-version;.tar.gz">
   <!ENTITY icewm-download-ftp  " ">
-  <!ENTITY icewm-md5sum        "57e43ee0637a24b93745da0915fe8dee">
+  <!ENTITY icewm-md5sum        "a94949065db31b9b927fb1f145a48ac3">
   <!ENTITY icewm-size          "2.2 MB">
-  <!ENTITY icewm-buildsize     "52 MB">
+  <!ENTITY icewm-buildsize     "44 MB">
   <!ENTITY icewm-time          "0.2 SBU (Using parallelism=4)">
 ]>