Index: general.ent
===================================================================
--- general.ent	(revision 912a09b64b8063adcd6dad4f93c1b0cbe4a5300e)
+++ general.ent	(revision ace3ef8c56daf94d0f67e5634c0c0da8a5a7fd6e)
@@ -1,3 +1,3 @@
-<!ENTITY day          "29">
+<!ENTITY day          "30">
 <!ENTITY month        "07">
 <!ENTITY year         "2004">
@@ -29,5 +29,5 @@
 <!ENTITY shadow-version               "4.0.4.1">  
 <!ENTITY iptables-version             "1.2.11"> 
-<!ENTITY gnupg-version                "1.2.4">  
+<!ENTITY gnupg-version                "1.2.5">  
 <!ENTITY tripwire-version             "2.3.1-2">   
 <!ENTITY heimdal-version              "0.6.2">   
@@ -359,5 +359,5 @@
 
 <!-- Chapter 35 -->        
-<!ENTITY mozilla-version              "1.7">  
+<!ENTITY mozilla-version              "1.7.1">  
 <!ENTITY firefox-version              "0.9.2"> 
 <!ENTITY galeon-version               "1.3.14a"> 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 912a09b64b8063adcd6dad4f93c1b0cbe4a5300e)
+++ introduction/welcome/changelog.xml	(revision ace3ef8c56daf94d0f67e5634c0c0da8a5a7fd6e)
@@ -19,4 +19,8 @@
 <itemizedlist>
 
+<listitem><para>July 30th, 2004 [randy]: Updated to Mozilla-1.7.1 and 
+GnuPG-1.2.5; added patches to both packages to fix various build 
+problems.</para></listitem>
+
 <listitem><para>July 29th, 2004 [bdubbs]: Updated svn bootscripts
 location.</para></listitem>
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 912a09b64b8063adcd6dad4f93c1b0cbe4a5300e)
+++ postlfs/security/gnupg.xml	(revision ace3ef8c56daf94d0f67e5634c0c0da8a5a7fd6e)
@@ -7,6 +7,6 @@
   <!ENTITY gnupg-download-http "http://public.ftp.planetmirror.com/pub/gnupg/gnupg-&gnupg-version;.tar.bz2">
   <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
-  <!ENTITY gnupg-size          "2.3 MB">
-  <!ENTITY gnupg-buildsize     "26 MB">
+  <!ENTITY gnupg-size          "2.5 MB">
+  <!ENTITY gnupg-buildsize     "28 MB">
   <!ENTITY gnupg-time          "0.44 SBU">
 ]>
@@ -36,8 +36,18 @@
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink 
+url="&patch-root;/gnupg-&gnupg-version;-po_install_fix-1.patch"/>
+</para></listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title><application>GnuPG</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openldap"/> and 
-<ulink url="../server/mail.html">MTA</ulink></para></sect4>
+<para><xref linkend="openldap"/>, <ulink url="../server/mail.html">MTA</ulink>, 
+<xref linkend="docbook-utils"/> and <ulink 
+url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink>
+</para></sect4>
 </sect3>
 
@@ -50,5 +60,6 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../gnupg-&gnupg-version;-po_install_fix-1.patch &amp;&amp;
+./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision 912a09b64b8063adcd6dad4f93c1b0cbe4a5300e)
+++ xsoft/graphweb/mozilla.xml	(revision ace3ef8c56daf94d0f67e5634c0c0da8a5a7fd6e)
@@ -7,9 +7,9 @@
   <!ENTITY mozilla-download-http "http://ftp.mozilla.org/pub/mozilla/releases/mozilla&mozilla-version;/src/mozilla-source-&mozilla-version;.tar.bz2">
   <!ENTITY mozilla-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla&mozilla-version;/src/mozilla-source-&mozilla-version;.tar.bz2">
-  <!ENTITY mozilla-size          "35 MB">
+  <!ENTITY mozilla-size          "34 MB">
   <!ENTITY mozilla-buildsize     "700 MB">
-  <!ENTITY mozilla-time          "15.22 SBU">
-
-  <!ENTITY enigmail-version      "0.84.1">
+  <!ENTITY mozilla-time          "10.37 SBU">
+
+  <!ENTITY enigmail-version      "0.85.0">
   <!ENTITY ipc-version           "1.0.5">
 ]>
@@ -58,4 +58,8 @@
 
 <sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink
+url="&patch-root;/mozilla-&mozilla-version;-freetype_fix-1.patch"/></para>
+</listitem></itemizedlist>
 
 <para>To enable the <application>Enigmail</application> extension to the 
@@ -89,4 +93,11 @@
 <sect4><title>Recommended</title>
 <para><xref linkend="gnupg"/> (for Enigmail extension)</para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gnome-vfs"/>, <xref linkend="libart_lgpl"/>, 
+<xref linkend="heimdal"/> or <xref linkend="mitkrb"/> 
+(for the GSSAPI libraries), 
+<ulink url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">GC</ulink> and 
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+</para></sect4>
 </sect3>
 
@@ -130,4 +141,5 @@
 <screen><userinput><command>export MOZILLA_OFFICIAL="1" &amp;&amp;
 export BUILD_OFFICIAL="1" &amp;&amp;
+patch -Np1 -i ../mozilla-&mozilla-version;-freetype_fix-1.patch &amp;&amp;
 ./configure --prefix=/usr \
             --with-default-mozilla-five-home=/usr/lib/mozilla \
@@ -242,5 +254,5 @@
 in a system wide prefix such as <filename>/usr</filename>.</para>
 
-<para><screen><option>--enable-toolkit-gtk2</option></screen>
+<para><screen><option>--enable-default-toolkit=gtk2</option></screen>
 Use the gtk2 toolkit.</para>
 
@@ -328,5 +340,5 @@
 <para>For installing various <application>Mozilla</application> plugins, refer 
 to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc 
-Project</ulink></para>
+Project</ulink>.</para>
 
 </sect2>
