Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision e13349f800c22866f9b24cc63359f6b0c9cb366f)
+++ general/prog/jdk.xml	(revision 9f154556d48d5c51c6425931a507d319e2543e83)
@@ -6,7 +6,21 @@
 
   <!ENTITY jdk-download-binary       "http://java.sun.com/javase/downloads/index.jsp">
-  <!ENTITY jdk-bin-md5sum            "dfb8b697591cf63d7f289fd621571db7">
-  <!ENTITY jdk-bin-size              "66 MB">
-  <!ENTITY jdk-bin-buildsize         "202 MB">
+  <!ENTITY jdk-bin-md5sum            "f7528500c17c09546566e05988beda86">
+  <!ENTITY jdk-bin-size              "67 MB">
+  <!ENTITY jdk-bin-buildsize         "207 MB">
+  <!ENTITY jdk-bin-version           "6u5">
+
+  <!ENTITY jdk-source-jrl-md5sum     "83390379fb9f3193e93a9d5eed5b31d9">
+  <!ENTITY jdk-source-bin-md5sum     "8b6f1b8d8dec051c18385539111141ec">
+  <!ENTITY jdk-source-moz-md5sum     "6dcaf7af16211617adff5d672a8b79f4">
+
+  <!ENTITY jdk-source-jrl-size       "111 MB">
+  <!ENTITY jdk-source-bin-size       "2 MB">
+  <!ENTITY jdk-source-moz-size       "8.2 MB">
+
+  <!ENTITY jdk-src-buildsize         "1.5 GB">
+  <!ENTITY jdk-time                  "12.5 SBU (for both installations)">
+  <!ENTITY jdk-version-string        "6u3">
+  <!ENTITY jdk-bin-version-string    "1.6.0_05">
 
   <!ENTITY jdk-download-source-jrl "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-src-b05-jrl-24_sep_2007.jar">
@@ -14,17 +28,4 @@
   <!ENTITY jdk-download-source-moz "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-mozilla_headers-b05-unix-24_sep_2007.jar">
 
-
-  <!ENTITY jdk-source-jrl-md5sum     "83390379fb9f3193e93a9d5eed5b31d9">
-  <!ENTITY jdk-source-bin-md5sum     "8b6f1b8d8dec051c18385539111141ec">
-  <!ENTITY jdk-source-moz-md5sum     "6dcaf7af16211617adff5d672a8b79f4">
-
-  <!ENTITY jdk-source-jrl-size       "111 MB">
-  <!ENTITY jdk-source-bin-size       "2 MB">
-  <!ENTITY jdk-source-moz-size       "8.2 MB">
-
-  <!ENTITY jdk-src-buildsize         "1.5 GB">
-  <!ENTITY jdk-time                  "12.5 SBU (for both installations)">
-  <!ENTITY jdk-version-string        "6u3">
-  <!ENTITY jdk-bin-version-string    "1.6.0_03">
 ]>
 
@@ -56,13 +57,5 @@
     in the <application>JDK</application> binary package was unusable on LFS
     owing to incompatibilities with <application>GCC</application>-3 compiled
-    browsers.  This is not the case anymore.</para>
-
-    <para>In order to use the source code and patches, you must read and agree
-    to the Sun <ulink url="http://www.java.net/jrl.csp"> Java Research
-    License</ulink> or optionally, the Sun <ulink
-    url="http://java.net/jiul.csp">Java Internal Use License</ulink>.  In
-    addition, the source code is not allowed to be downloaded to some
-    countries, so for users in those countries, the binary is the only
-    option.</para> -->
+    browsers.  This is not the case anymore.</para> -->
 
     <para>The <application>JDK</application> comes in two flavors, a
@@ -70,13 +63,35 @@
     and install the binary version of the <application>JDK</application>
     (you'll need to click and agree to the <quote>Sun Microsystems, Inc.
-    Binary Code License Agreement</quote>). To build from the source, you will
-    also need to download the additional files and patches to complete the
-    source build as detailed below. Note that in some countries you cannot
-    download the source code.</para>
+    Binary Code License Agreement</quote>). To build from the source, you
+    will need to read, and agree to the Sun
+    <ulink url="http://www.java.net/jrl.csp">Java Research License</ulink>.
+    You will also need to download the additional files and patches to
+    complete the source build as detailed below. Note that in some countries
+    you cannot download the source code.</para>
+
+    <warning><para>Sun has recently decided not to provide JRL sources for
+    the latest update versions of the JDK.  The source build instructions and
+    patches are here for reference only, and contain known security
+    vulnerabilities.  For more information, please see Sun Alerts
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-231246-1">231246</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233321-1">233321</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233322-1">233322</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233323-1">233323</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233324-1">233324</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233325-1">233325</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233326-1">233326</ulink>, and
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233327-1">233327</ulink>.</para>
+    <para>  Sun is actively working on a GPL'd version of the JDK, titled
+    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
+    This new JDK will be licensed under the
+    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
+    Public License, version 2, with the Classpath Exception</ulink>.
+    A stable OpenJDK was not available at the time of writing.</para></warning>
+
 
     <bridgehead renderas="sect3">Binary Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Binary download (jdk-&jdk-version-string;-linux-i586.bin):
+        <para>Binary download (jdk-&jdk-bin-version;-linux-i586.bin):
         <ulink url="&jdk-download-binary;"/></para>
       </listitem>
@@ -150,18 +165,19 @@
     <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required (to Build JDK from Source)</bridgehead>
+    <bridgehead renderas="sect4">Optional Runtime Depenedencies (for binary
+    installation)</bridgehead>
+    <para role="optional">
+    <xref linkend="alsa-lib"/>,
+    <xref linkend="cups"/>, and
+    <xref linkend="gtk2"/></para>
+
+    <bridgehead renderas="sect4">Additional Requirements
+    (for source build, including optional requirements)</bridgehead>
     <para role="required">
-    <xref linkend="alsa-lib"/>,
     <xref linkend="cpio"/>,
-    <xref linkend="cups"/>,
     <xref linkend="ksh"/>,
     <xref linkend="unzip"/>,
-    <xref linkend="which"/>,
-    <xref linkend="x-window-system"/>, and
+    <xref linkend="which"/>, and
     <xref linkend="zip"/></para>
-
-    <bridgehead renderas="sect4">Runtime Dependency (to use the binary 
-    browser plugin)</bridgehead>
-    <para><xref linkend="gcc3"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -178,5 +194,5 @@
 
     <tip>
-      <para>The <command>./jdk-&jdk-version-string;-linux-i586.bin</command>
+      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
       command below unpacks the distribution into a
       <filename class='directory'>jdk&jdk-bin-version-string;</filename>
@@ -198,15 +214,15 @@
     following commands:</para>
 
-<screen><userinput>chmod 755 jdk-&jdk-version-string;-linux-i586.bin &amp;&amp;
-./jdk-&jdk-version-string;-linux-i586.bin</userinput></screen>
+<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
+./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>cd jdk&jdk-bin-version-string; &amp;&amp;
-install -v -m755 -d /opt/jdk-bin-&jdk-version-string; &amp;&amp;
-mv -v * /opt/jdk-bin-&jdk-version-string; &amp;&amp;
-chown -v -R root:root /opt/jdk-bin-&jdk-version-string; &amp;&amp;
+install -v -m755 -d /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
+mv -v * /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
+chown -v -R root:root /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
 ln -v -sf xawt/libmawt.so \
-    /opt/jdk-bin-&jdk-version-string;/jre/lib/i386/ &amp;&amp;
+    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
 cd ..</userinput></screen>
 
@@ -218,5 +234,12 @@
 
 <screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
-    /opt/jdk-bin-&jdk-version-string;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
+    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
+
+    <note><para>The installation will end with a message 
+    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
+    javaprefix is unset in the environment.  This is by design as
+    <application>GTK+</application> may not be installed during the
+    installation, however, the installation will still exit with a zero error
+    value if scripting the build.</para></note>
 
     <para>The binary version is now installed.</para>
