From 2f65edb6c514b12b0780518bef8a52678487d30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Sun, 16 Oct 2005 15:52:15 +0000
Subject: [PATCH] Updated to PHP-5.0.5.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5210 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/prog/php.xml               | 22 ++++++++++++----------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/general.ent b/general.ent
index bb281ec288..06bc6cf89f 100644
--- a/general.ent
+++ b/general.ent
@@ -153,7 +153,7 @@
 <!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "0.98.39">
 <!ENTITY pdl-version                  "2.4.2">
-<!ENTITY php-version                  "5.0.4">
+<!ENTITY php-version                  "5.0.5">
 <!ENTITY Python-version               "2.4.2">
 <!ENTITY ruby-version                 "1.8.2">
 <!ENTITY tcl-version                  "8.4.11">
diff --git a/general/prog/php.xml b/general/prog/php.xml
index 3ca86c52a7..c9992924cd 100644
--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY php-download-http "http://us2.php.net/distributions/php-&php-version;.tar.bz2">
   <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.bz2">
-  <!ENTITY php-md5sum        "fb1aac107870f897d26563a9cc5053c0">
+  <!ENTITY php-md5sum        "b5d4ca75bbb11ee5b830fa67213d9f7f">
   <!ENTITY php-size          "4.7 MB">
   <!ENTITY php-buildsize     "138 MB">
   <!ENTITY php-time          "1.9 SBU">
@@ -72,15 +72,17 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="apache"/></para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="libxml2"/></para>
+
     <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
-    <para><xref linkend="libxml2"/>,
-    <xref linkend="libxslt"/>,
+    <para><xref linkend="libxslt"/>,
     <xref linkend="gamin"/>,
     <xref linkend="gmp"/>,
     <xref linkend="pcre"/>,
     <xref linkend="aspell"/>,
     <xref linkend="pkgconfig"/>,
-    <xref linkend="expat"/>,
+    <xref linkend="expat"/> (deprecated alternative to <xref linkend="libxml2"/>),
     <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
     <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
     <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
@@ -159,7 +161,7 @@
       is highly recommended, as their online docs are very good.</para>
     </note>
 
-    <para>Remove the <option>--disable-libxml</option> switch if you
+    <para>Remove the <parameter>--disable-libxml</parameter> switch if you
     have <xref linkend="libxml2"/> installed otherwise
     <command>pear</command> will not be built.</para>
 
@@ -230,15 +232,15 @@ chown -v -R root:root /usr/share/doc/php-&php-version;/html</userinput></screen>
 
       <para><parameter>--enable-bcmath</parameter>: Enables
       <command>bc</command> style precision math functions.</para>
-
-      <para><parameter>--with-bz2</parameter>: Add support for
+  
+      <para><parameter>--with-bz2</parameter>: Adds support for
       <application>Bzip2</application> compression functions.</para>
 
       <para><parameter>--enable-calendar</parameter>: This parameter
       provides support for calendar conversion.</para>
 
       <para><parameter>--enable-dba</parameter>: This parameter enables
-      numerous database support including Berkeley DB functions.</para>
+      support for database (dbm-style) abstraction layer functions.</para>
 
       <para><parameter>--enable-exif</parameter>: Enables functions
       to access metadata from images.</para>
@@ -259,8 +261,8 @@ chown -v -R root:root /usr/share/doc/php-&php-version;/html</userinput></screen>
       enables command line <application>Readline</application> support.</para>
 
       <para><parameter>--disable-libxml</parameter>: This parameter
-      disables XML support functions. This should be removed if you have
-      <application>Libxml2</application> installed.</para>
+      allows building PHP without <application>Libxml2</application>
+      installed.</para>
 
   </sect2>
                     
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ea72f70d4a..576c84cf59 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>October 16th, 2005</para>
       <itemizedlist>
+        <listitem>
+          <para>[igor] - Updated to PHP-5.0.5.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Modified dependencies in the libgtkhtml
           instructions.</para>