Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 52a4df28989dd82afe80681d4b63b92457434193)
+++ general/prog/openjdk.xml	(revision 6f01fd2e437500fb6bc4bef0d336032531ac3e8c)
@@ -8,38 +8,38 @@
   <!ENTITY icedtea-download              "http://icedtea.classpath.org/download/source/icedtea-&icedtea-version;.tar.xz">
 
-  <!ENTITY icedtea-md5sum                "3a2051b025d73534f14531c783de4455">
+  <!ENTITY icedtea-md5sum                "2f67a2a8960e151131b3bd97f5f76faf">
   <!ENTITY icedtea-size                  "3.3 MB">
 
   <!ENTITY corba-download                "&anduin-download;/corba.tar.gz">
-  <!ENTITY corba-md5sum                  "adf888756629bdcb37f71451269ac42e">
+  <!ENTITY corba-md5sum                  "8a725ed6fd9cf8d8b4b978e95d990d12">
   <!ENTITY corba-size                    "1.4 MB">
 
   <!ENTITY hotspot-download              "&anduin-download;/hotspot.tar.gz">
-  <!ENTITY hotspot-md5sum                "67bb16313215e6da72bda7dc0090bb6a">
-  <!ENTITY hotspot-size                  "9.2 MB">
+  <!ENTITY hotspot-md5sum                "969192666fed1827295aaf2459217a2c">
+  <!ENTITY hotspot-size                  "9.3 MB">
 
   <!ENTITY jaxp-download                 "&anduin-download;/jaxp.tar.gz">
-  <!ENTITY jaxp-md5sum                   "1c42344779d49baed24724535a7e2c9b">
-  <!ENTITY jaxp-size                     "3.8 MB">
+  <!ENTITY jaxp-md5sum                   "5c8e75f4e67d60f766d443de210a8710">
+  <!ENTITY jaxp-size                     "3.7 MB">
 
   <!ENTITY jaxws-download                "&anduin-download;/jaxws.tar.gz">
-  <!ENTITY jaxws-md5sum                  "256148d7e7f5619addde91fd14bc3361">
-  <!ENTITY jaxws-size                    "2.7 MB">
+  <!ENTITY jaxws-md5sum                  "7b52ff1abbd5343f95e1ef6de724aabd">
+  <!ENTITY jaxws-size                    "2.6 MB">
 
   <!ENTITY jdk-download                  "&anduin-download;/jdk.tar.gz">
-  <!ENTITY jdk-md5sum                    "3370074398071b4104e0e89efc9a4a56">
-  <!ENTITY jdk-size                      "39 MB">
+  <!ENTITY jdk-md5sum                    "5204915d151730e8345530471dc58e9a">
+  <!ENTITY jdk-size                      "38.1 MB">
 
   <!ENTITY langtools-download            "&anduin-download;/langtools.tar.gz">
-  <!ENTITY langtools-md5sum              "7605555236ffd8ac6bdedc6bc9b61c26">
+  <!ENTITY langtools-md5sum              "0a0ca66666dafcd5ad2a856a83ddb6cc">
   <!ENTITY langtools-size                "2.2 MB">
 
   <!ENTITY openjdk-download              "&anduin-download;/openjdk.tar.gz">
-  <!ENTITY openjdk-md5sum                "09b9db8ca0b833070326573c3dac56e2">
-  <!ENTITY openjdk-size                  "136 KB">
-
-  <!ENTITY rhino-download                "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip">
-  <!ENTITY rhino-md5sum                  "99d94103662a8d0b571e247a77432ac5">
-  <!ENTITY rhino-size                    "4.5 MB">
+  <!ENTITY openjdk-md5sum                "3d319d270c57fa206475cf713d7fdcb9">
+  <!ENTITY openjdk-size                  "134 KB">
+
+  <!ENTITY rhino-download                "https://github.com/downloads/mozilla/rhino/rhino1_7R4.zip">
+  <!ENTITY rhino-md5sum                  "ad67a3dff135e3a70f0c3528a2d6edf2">
+  <!ENTITY rhino-size                    "6.2 MB">
 
   <!ENTITY openjdk-buildsize             "8.5-11 GB">
@@ -225,4 +225,8 @@
         <para><ulink
         url="&patch-root;/icedtea-&icedtea-version;-fix_tests-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/icedtea-&icedtea-version;-upstream_fix-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -271,6 +275,7 @@
       <xref linkend="lsb-release"/>,
       <xref linkend="mercurial"/>,
-      <xref linkend="mitkrb"/>, and
-      <xref linkend="pulseaudio"/>
+      <xref linkend="mitkrb"/>,
+      <xref linkend="pulseaudio"/>, and
+      <xref linkend="xorg-server"/> (for the tests)
     </para>
 
@@ -300,7 +305,7 @@
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>unzip ../rhino1_7R3.zip             &amp;&amp;
+<screen role="root"><userinput>unzip ../rhino1_7R4.zip             &amp;&amp;
 install -v -d -m755 /usr/share/java &amp;&amp;
-install -v -m755 rhino1_7R3/*.jar /usr/share/java</userinput></screen>
+install -v -m755 rhino1_7R4/*.jar /usr/share/java</userinput></screen>
 
     <para>As mentioned previously, <application>OpenJDK</application> is
@@ -317,4 +322,9 @@
 cp -v ../langtools.tar.gz . &amp;&amp;
 cp -v ../openjdk.tar.gz   .</userinput></screen>
+
+<!-- Remove for 2.4.7: already applied upstream -->
+    <para>Apply a patch to fix a defect in <command>configure</command>:</para>
+
+<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-upstream_fix-1.patch</userinput></screen>
 
     <para>Apply a patch to generate a valid cacerts file using the system CA
@@ -392,5 +402,5 @@
     location of the temporary <application>JDK</application>.</para>
 
-    <para><parameter>--with-pkgversion</parameter>: This switch can be used
+    <para><option>--with-pkgversion</option>: This switch can be used
     to modify the version string in addition to "IcedTea".</para>
 
@@ -477,5 +487,5 @@
     user:</para>
 
-<screen><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
+<screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
 <literal>MANDATORY_MANPATH     /opt/jdk/man
 MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
