# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1372542574 -3600
# Node ID 59a35368e3f7e78df432f8c6da490581cc47099a
# Parent  c8f337eac82690bff92c036ca4c667e48c7490fb
Remove 8001330 patch which causes build to fail.

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

	* Makefile.am,
	(HOTSPOT_CHANGESET): Update to revised IcedTea7 2.2.9
	tag, removing 8001330.
	(HOTSPOT_SHA256SUM): Likewise.
	* NEWS: Remove 8001330.
	* patches/boot/ecj-stringswitch.patch:
	Merge two MethodHandleNatives patches.

diff -r c8f337eac826 -r 59a35368e3f7 ChangeLog
--- a/ChangeLog	Fri Jun 28 02:49:03 2013 +0100
+++ b/ChangeLog	Sat Jun 29 22:49:34 2013 +0100
@@ -1,3 +1,13 @@
+2013-06-29  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am,
+	(HOTSPOT_CHANGESET): Update to revised IcedTea7 2.2.9
+	tag, removing 8001330.
+	(HOTSPOT_SHA256SUM): Likewise.
+	* NEWS: Remove 8001330.
+	* patches/boot/ecj-stringswitch.patch:
+	Merge two MethodHandleNatives patches.
+
 2013-06-25  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add Red Hat bugzilla references.
diff -r c8f337eac826 -r 59a35368e3f7 Makefile.am
--- a/Makefile.am	Fri Jun 28 02:49:03 2013 +0100
+++ b/Makefile.am	Sat Jun 29 22:49:34 2013 +0100
@@ -4,7 +4,7 @@
 JDK_UPDATE_VERSION = 05
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-HOTSPOT_CHANGESET = 89a7d38e2e31
+HOTSPOT_CHANGESET = 4f1ec3403248
 CORBA_CHANGESET = 4fdf74f61b48
 JAXP_CHANGESET = 5ce90e84aa21
 JAXWS_CHANGESET = 5942fdde2af6
@@ -12,7 +12,7 @@
 LANGTOOLS_CHANGESET = 1c14c3a8ea14
 OPENJDK_CHANGESET = 0cc24300e6de
 
-HOTSPOT_SHA256SUM = 895802e8e5d3661ef9ed7f8530a595c899f056faf73b4cfa7d603777ba8f28f0
+HOTSPOT_SHA256SUM = af0c2f7ce58eecec8f2c6bb3a7093bae7817852dcd3f690474aa065fb9e1b0e2
 CORBA_SHA256SUM = 01da9cb128138afa48f9d17e800f90d1fea54db876551fe10145f4aaac01b0b3
 JAXP_SHA256SUM = 479516db3d57f1cf6ec67c26229fb70f59499a6794b90cbabb4c47d930d13229
 JAXWS_SHA256SUM = 535c443eb71aead164a9e790f368c8424a51190d25027847820a6705bee3ff72
diff -r c8f337eac826 -r 59a35368e3f7 NEWS
--- a/NEWS	Fri Jun 28 02:49:03 2013 +0100
+++ b/NEWS	Sat Jun 29 22:49:34 2013 +0100
@@ -28,7 +28,6 @@
   - S8001308: Update display of applet windows
   - S8001309: Better handling of annotation interfaces
   - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
-  - S8001330, CVE-2013-2443: Improve on checking order
   - S8003703, CVE-2013-2412: Update RMI connection dialog box
   - S8004288, CVE-2013-2449: (fs) Files.probeContentType problems
   - S8004584: Augment applet contextualization
diff -r c8f337eac826 -r 59a35368e3f7 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch	Fri Jun 28 02:49:03 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Sat Jun 29 22:49:34 2013 +0100
@@ -484,9 +484,6 @@
              return defc == java.util.logging.Logger.class;
          }
          return false;
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-27 16:08:36.739202429 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-06-27 16:40:02.673171484 +0100
 @@ -528,10 +528,10 @@
      private static boolean canBeCalledVirtual(MemberName mem) {
          assert(mem.isInvocable());