# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1375796562 -3600
# Node ID 9f0405f155d92b68585ba358b88dd0b6571fdbf1
# Parent  63207151eedca4123e34686b42f30c60bffbdf81
Bring in 8014925 and 8016814 from forest.

2013-08-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	* Makefile.am:
	(CORBA_CHANGESET): Update to IcedTea 2.3 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: Add changes from forest.
	* hotspot.map: Update default to IcedTea 2.3 HotSpot
	HEAD.

diff -r 63207151eedc -r 9f0405f155d9 ChangeLog
--- a/ChangeLog	Thu Jan 17 00:39:24 2013 +0000
+++ b/ChangeLog	Tue Aug 06 14:42:42 2013 +0100
@@ -1,3 +1,22 @@
+2013-08-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to IcedTea 2.3 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: Add changes from forest.
+	* hotspot.map: Update default to IcedTea 2.3 HotSpot
+	HEAD.
+
 2013-01-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* acinclude.m4:
diff -r 63207151eedc -r 9f0405f155d9 Makefile.am
--- a/Makefile.am	Thu Jan 17 00:39:24 2013 +0000
+++ b/Makefile.am	Tue Aug 06 14:42:42 2013 +0100
@@ -4,19 +4,19 @@
 JDK_UPDATE_VERSION = 25
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = ea108ff3be9a
-JAXP_CHANGESET = 332f0234a53e
-JAXWS_CHANGESET = fdc4ad9f30c6
-JDK_CHANGESET = 4a0cf2c05cc6
-LANGTOOLS_CHANGESET = 6c9b532f4281
-OPENJDK_CHANGESET = e62743867f54
+CORBA_CHANGESET = 7f6068c72726
+JAXP_CHANGESET = 5393f32bae76
+JAXWS_CHANGESET = ab28ab1e1484
+JDK_CHANGESET = 64c0a3fb78cd
+LANGTOOLS_CHANGESET = 7bd72dadca4a
+OPENJDK_CHANGESET = 8f7b2e697b59
 
-CORBA_SHA256SUM = 818f5613b218fe2a2036e6c65622b970839986c0c1ca95563f911b379a52b765
-JAXP_SHA256SUM = a3f99615331cdc3d5e38e7169bb4b03dc43ede25c73834114240b8768207b9dc
-JAXWS_SHA256SUM = b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab
-JDK_SHA256SUM = badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0
-LANGTOOLS_SHA256SUM = b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b
-OPENJDK_SHA256SUM = 7bc64e2285b5bfefeb6a3900729c58beb2f04f2c57184a4fe48341c5087c3f61
+CORBA_SHA256SUM = 2ce092d00be6c04fb6f3bdba8d9ffb0efcf8da339a3be3d124603faf61e62ba5
+JAXP_SHA256SUM = 1017d087c3c6b89c1b20bcf7802d384db492cfc7e5ba998e11124330ea8623f1
+JAXWS_SHA256SUM = b9bb3c916abb5dfe80c48c4918a2e52ee488404db10927b7c3a85b40f7215225
+JDK_SHA256SUM = 221a2961a004d45b1cfb5ce7d08225dca46a8bef1930f26fb1cf10c52a29e9d5
+LANGTOOLS_SHA256SUM = 160b1d61c22c5d4d6bc63c80acc7926791310b0ee8827ba5e15c5b36123dc012
+OPENJDK_SHA256SUM = 2b12839074a86cafbe78b5fc8a8c36cc9e8f3d497079a9c45a3c0bf9fe8a8644
 
 CACAO_VERSION = a567bcb7f589
 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r 63207151eedc -r 9f0405f155d9 NEWS
--- a/NEWS	Thu Jan 17 00:39:24 2013 +0000
+++ b/NEWS	Tue Aug 06 14:42:42 2013 +0100
@@ -12,6 +12,12 @@
 
 New in release 2.3.13 (2013-XX-XX):
 
+* Backports
+  - S8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a temporary switch to re-enable it
+  - S8016814: sun.reflect.Reflection.getCallerClass returns the frame off by 1
+* Bug fixes
+  - Enable Zero when there is no HotSpot JIT and an alternate VM has not been explictly enabled.
+
 New in release 2.3.12 (2013-07-26):
 
 * ARM Port
diff -r 63207151eedc -r 9f0405f155d9 hotspot.map
--- a/hotspot.map	Thu Jan 17 00:39:24 2013 +0000
+++ b/hotspot.map	Tue Aug 06 14:42:42 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a6502a8a6b31 5c73225a03c33109a4cbea6274bf5af634a14feddb80ed7471af0c1445c93204