--- a/ChangeLog	Thu Jun 06 17:06:23 2013 +0100
+++ b/ChangeLog	Thu Jun 06 19:52:57 2013 +0100
@@ -1,3 +1,31 @@
+2013-06-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	S7191872: Xrender: No text displayed using
+	64 bit JDK on solaris11-sparc
+	S8014469: (tz) Support tzdata2013c
+	S8014618, RH962568: Need to strip leading zeros
+	in TlsPremasterSecret of DHKeyAgreement
+	PR1435: OpenJDK 7 returns incorrect TrueType
+	font metrics
+	PR728: GTKLookAndFeel does not honor
+	gtk-alternative-button-order
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to IcedTea7 forest head.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Mention S7191872, S8014469, S8014618/RH962568,
+	PR1435 and PR728.
+	* hotspot.map: Update to IcedTea7 forest head.
+
 2013-06-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* ChangeLog: Update my Red Hat e-mail address.

--- a/Makefile.am	Thu Jun 06 17:06:23 2013 +0100
+++ b/Makefile.am	Thu Jun 06 19:52:57 2013 +0100
@@ -4,19 +4,19 @@
 JDK_UPDATE_VERSION = 40
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = 4366e0fe59d5
-JAXP_CHANGESET = 5a11895b645d
-JAXWS_CHANGESET = 29619865cc64
-JDK_CHANGESET = 5e20c1a72aa8
-LANGTOOLS_CHANGESET = 718a945bfdb9
-OPENJDK_CHANGESET = 6579f526e5e4
+CORBA_CHANGESET = fd00f67b65c4
+JAXP_CHANGESET = 7dc9a882c6f8
+JAXWS_CHANGESET = ea9a36dfd4ee
+JDK_CHANGESET = 3f1f89553b54
+LANGTOOLS_CHANGESET = 68c60cde94a7
+OPENJDK_CHANGESET = 78c6b2167b94
 
-CORBA_SHA256SUM = b23b0980c704247a0a690f6fb663ec561f56e2fcdc5d69f13d9629d2c1937f32
-JAXP_SHA256SUM = a0f4516cdabb60bea73ce157db3c31c24634bc4058d35257b981b6b1be5114ba
-JAXWS_SHA256SUM = 53e63c8b63380f4a34ae955f91455ece2f687dbe3dd47e4c14ac03761cb3daee
-JDK_SHA256SUM = 5b9f736df39198eec25a697792783d361e4ea4a8289b4dc7f156bcb307278b0c
-LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02
-OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c
+CORBA_SHA256SUM = 57e71ca50c31456ef8a3086cfe81e6ff627ea207645bbd4dced1e73c51528c56
+JAXP_SHA256SUM = 293bcceac6557965c201437b123cef23c5855dbb22b25f487ba87ccdd1991355
+JAXWS_SHA256SUM = 814fc497356289efb153509837cd97d5a019c388f7f9b1ad98247cf445b9c11d
+JDK_SHA256SUM = ca8ff71beba0303d2593f97706a8638ea1948d8387a533a16fce70d6bb85bf88
+LANGTOOLS_SHA256SUM = 807e8d5301dee8e0f532096237987f4b812c472e3d9182d349c1b3371676ec59
+OPENJDK_SHA256SUM = 8de6db8e7b249577f8cfbd343de3a76068200af5ead43255e8f77de3ac34a38f
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab

--- a/NEWS	Thu Jun 06 17:06:23 2013 +0100
+++ b/NEWS	Thu Jun 06 19:52:57 2013 +0100
@@ -547,6 +547,7 @@
   - S7191556: (fs) UnixNativeDispatcher.getextmntent should be moved into platform specific code
   - S7191587: (se) SelectionKey.interestOps does not defer changing the interest set to the next select [macosx]
   - S7191765: make jdk8 the default jprt release for hs24
+  - S7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc
   - S7191926: Remove MKS dependency in Hotspot regression tests
   - S7192128: G1: Extend fix for 6948537 to G1's BOT
   - S7192167: JSR 292: C1 has old broken code which needs to be removed
@@ -789,8 +790,10 @@
   - S8011745: Unknown CertificateChoices
   - S8011867: Accept unknown PKCS #9 attributes
   - S8012572: Exclude sun/tools/jmap/Basic.sh for short term
+  - S8014469: (tz) Support tzdata2013c
 * Backports
   - PR1197, S8003120, RH868136: ResourceManager.getApplicationResources() does not close InputStreams
+  - S8014618, RH962568: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
 * Bug fixes
   - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use
   - Add NSS (commented out) to other platforms.
@@ -813,6 +816,8 @@
   - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive
   - PR1358: Make XRender mandatory
   - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
+  - PR1435: OpenJDK 7 returns incorrect TrueType font metrics
+  - PR728: GTKLookAndFeel does not honor gtk-alternative-button-order
 * CACAO
   - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned.
   - src/native/jni.cpp (GetObjectClass): Remove null pointer check.

--- a/hotspot.map	Thu Jun 06 17:06:23 2013 +0100
+++ b/hotspot.map	Thu Jun 06 19:52:57 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2fc73bd48efa 1f4a059d6b25d05145a0f6313b24e36641a541dbf9ff33d6780143b1513a1946
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 25fe5bf8dee3 844c0c901bda689dd28f3e7846973431bf354bed1efc793d75b78844e21107ce