From 608a225bd0d4b80bd2a7e15aafbdd21da93cf8ad Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 14 May 2006 19:47:38 +0000
Subject: [PATCH] Updated to Apache HTTPD-2.2.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6078 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  5 ++++-
 server/major/apache.xml            | 14 +++++++-------
 server/major/openssh.xml           | 14 +-------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/general.ent b/general.ent
index 4bf361d7d8..8a2cad9c5a 100644
--- a/general.ent
+++ b/general.ent
@@ -312,7 +312,7 @@
 
 <!-- Part VI -->
 <!-- Chapter 21 -->
-<!ENTITY apache-version               "2.2.0">
+<!ENTITY apache-version               "2.2.2">
 <!-- bind (chapter 19) -->
 <!ENTITY nfs-utils-version            "1.0.8">
 <!-- openssh (chapter 18) -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 585f056768..36f9d379fc 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>May 14th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Apache HTTPD-2.2.2.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Added a note to the MySQL instructions about TCP
           Wrapper and MySQL's test suite.</para>
@@ -53,7 +56,7 @@
           Wrapper and cURL's test suite.</para>
         </listitem>
         <listitem>
-          <para>[dj] - Updated OpenOffice patch for system firefox and added
+          <para>[dj] - Updated OpenOffice patch for system SeaMonkey and added
           OpenOffice to list of packages that will utilize system nss in
           Mozilla product pages.</para>
         </listitem>
diff --git a/server/major/apache.xml b/server/major/apache.xml
index 0767a4a363..2986594f37 100644
--- a/server/major/apache.xml
+++ b/server/major/apache.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY apache-download-http "http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  "ftp://ftp.tux.org/pub/net/apache/dist/httpd/httpd-&apache-version;.tar.bz2">
-  <!ENTITY apache-md5sum        "402b90a2e47205f94b3b1d91e1a8c459">
+  <!ENTITY apache-md5sum        "9c759a9744436de6a6aa2ddbc49d6e81">
   <!ENTITY apache-size          "4.8 MB">
   <!ENTITY apache-buildsize     "91.5 MB">
-  <!ENTITY apache-time          "2.1 SBU">
+  <!ENTITY apache-time          "2.0 SBU">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
@@ -101,9 +101,9 @@ useradd -c "Apache Server" -d /dev/null -g apache \
 
     <note><para>The above command directs the <application>Apache</application>
     user's home directory to <filename>/dev/null</filename>.  This may not work
-    for some add-ons such as the <ulink
-    url='http://www.viewvc.org/'><application>ViewVC</application></ulink> that
-    is a browser interface for CVS and Subversion version control repositories.
+    for some add-ons such as <ulink
+    url='http://www.viewvc.org/'><application>ViewVC</application></ulink>, a
+    browser interface for CVS and Subversion version control repositories.
     See the User Notes for details for specific applications.</para></note> 
 
     <para>The following patch modifies the layout of destination
@@ -150,8 +150,8 @@ chown -v -R apache:apache /srv/www</userinput></screen>
     <title>Command Explanations</title>
 
     <para><option>--with-expat=/usr</option>: Uses the system installed
-    <application>expat</application>. <emphasis>If you have installed
-    <application>expat</application> and do not use this switch, the
+    <application>expat</application>. <emphasis role="strong">If you have
+    installed  <application>expat</application> and do not use this switch, the
     <application>Apache</application> installation may overwrite some files
     from the <application>expat</application> installation.</emphasis></para>
 
diff --git a/server/major/openssh.xml b/server/major/openssh.xml
index aa96f66c2d..fa3e3a5003 100644
--- a/server/major/openssh.xml
+++ b/server/major/openssh.xml
@@ -4,18 +4,6 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
   <!ENTITY openssh-download-http "http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
   <!ENTITY openssh-download-ftp  "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
   <!ENTITY openssh-md5sum        "7e9880ac20a9b9db0d3fea30a9ff3d46">
@@ -85,7 +73,7 @@
     <xref linkend="jdk"/>,
     <xref linkend="net-tools"/>,
     <xref linkend="sysstat"/>,
-    <ulink url="http://www.opensc-project.org/">OpenSC</ulink> and
+    <ulink url="http://www.opensc-project.org/">OpenSC</ulink>, and
     <ulink
     url="http://www.citi.umich.edu/projects/smartcard/sectok.html">libsectok</ulink></para>