--- a/ChangeLog	Thu Jul 14 03:39:40 2016 +0100
+++ b/ChangeLog	Wed Jul 20 14:00:17 2016 +0100
@@ -1,3 +1,26 @@
+2016-07-20  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to icedtea-2.7.0pre06.
+	(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: Updated.
+	* configure.ac: Bump to 2.7.0pre06.
+	* hotspot.map.in: Update to icedtea-2.7.0pre06.
+	* patches/boot/ecj-diamond.patch:
+	Add new case in sun.java2d.cmm.lcms.LCMSProfile.
+	* patches/boot/jar.patch:
+	Adapt to fix for PR2799/RH1195203.
+
 2016-04-26  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add 2.6.6 release notes.

--- a/Makefile.am	Thu Jul 14 03:39:40 2016 +0100
+++ b/Makefile.am	Wed Jul 20 14:00:17 2016 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = cbe0edb3d345
-JAXP_CHANGESET = 4b0a1c213416
-JAXWS_CHANGESET = 76aade5c18f8
-JDK_CHANGESET = 3fc5cbcd46dd
-LANGTOOLS_CHANGESET = caa50dd46a14
-OPENJDK_CHANGESET = 7f245987a287
-
-CORBA_SHA256SUM = b1257121829a728d1850382ac3ae1ea65ecf0461605824ad6e6b3583ebf8908f
-JAXP_SHA256SUM = 77e3b7f148a5876299d535b084f1b8bbfb58e173e9697a3560f2e59931aa73a2
-JAXWS_SHA256SUM = bc65e3078623f2d85df47f7a877121e57248068859c18ea03960b533af44a80e
-JDK_SHA256SUM = 44adca39f854ce57defd7692796c193f9bf638a1110e283cc369552ec66bbba2
-LANGTOOLS_SHA256SUM = 1a7195adfc1f05ecdf17559dd8afccbbd9b8c61e96f290a1e2ca9659856b4fa7
-OPENJDK_SHA256SUM = 72ab3fe89fab55d430af49ffaae216317e8a88b963350a7a695870f7fd744c33
+CORBA_CHANGESET = b6bef4d9a428
+JAXP_CHANGESET = a2cd36a76d22
+JAXWS_CHANGESET = 5c8bb4727c60
+JDK_CHANGESET = d35404fe9590
+LANGTOOLS_CHANGESET = bd3480b6d64a
+OPENJDK_CHANGESET = 05d8ac2f0610
+
+CORBA_SHA256SUM = b867a0abce87e74decaa8a3b3376f31cca1f53b9a2915ed6fa449b071215fe73
+JAXP_SHA256SUM = c82f8df09f60ba56c149f4e115cc286f836158ae45964c438757a6c27c9cdeb5
+JAXWS_SHA256SUM = bcd111e8fffd5fd5409af96d8cb7bd4ef1a79e21c7f52b76d7dec3de0b5b8a4e
+JDK_SHA256SUM = 8c61ecafde4c3f5f68ceaaeea40b77b00dafb5597505f004c86c3cb5df76445d
+LANGTOOLS_SHA256SUM = 20d515c4c71055c1f3632d7b9f054f866e8b77dce8214d4618d17ec5e9752999
+OPENJDK_SHA256SUM = b692c2f521c6880f9ddfff642ad44cc258abae5d8f47ddc614761f2b95be1f88
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 

--- a/NEWS	Thu Jul 14 03:39:40 2016 +0100
+++ b/NEWS	Wed Jul 20 14:00:17 2016 +0100
@@ -15,7 +15,45 @@
 New in release 2.7.0 (201X-XX-XX):
 
 * Backports
-  - S8076221, PR2809: Disable RC4 cipher suites
+  - S2178143, PR2958: JVM crashes if the number of bound CPUs changed during runtime
+  - S4900206, PR3101: Include worst-case rounding tests for Math library functions
+  - S6260348, PR3067: GTK+ L&F JTextComponent not respecting desktop caret blink rate
+  - S6934604, PR3075: enable parts of EliminateAutoBox by default
+  - S7043064, PR3020: sun/java2d/cmm/ tests failed against RI b141 & b138-nightly
+  - S7051394, PR3020: NullPointerException when running regression tests LoadProfileTest by using openjdk-7-b144
+  - S7086015, PR3013: fix test/tools/javac/parser/netbeans/JavacParserTest.java
+  - S7119487, PR3013: JavacParserTest.java test fails on Windows platforms
+  - S7124245, PR3020: [lcms] ColorConvertOp to color space CS_GRAY apparently converts orange to 244,244,0
+  - S7159445, PR3013: (javac) emits inaccurate diagnostics for enhanced for-loops
+  - S7175845, PR1437, RH1207129: 'jar uf' changes file permissions unexpectedly
+  - S8005402, PR3020: Need to provide benchmarks for color management
+  - S8005530, PR3020: [lcms] Improve performance of ColorConverOp for default destinations
+  - S8005930, PR3020: [lcms] ColorConvertOp: Alpha channel is not transferred from source to destination.
+  - S8013430, PR3020: REGRESSION: closed/java/awt/color/ICC_Profile/LoadProfileTest/LoadProfileTest.java fails with java.io.StreamCorruptedException: invalid type code: EE since 8b87
+  - S8014286, PR3075: failed java/lang/Math/DivModTests.java after 6934604 changes
+  - S8014959, PR3075: assert(Compile::current()->live_nodes() < (uint)MaxNodeLimit) failed: Live Node limit exceeded limit
+  - S8019247, PR3075: SIGSEGV in compiled method c8e.e.t_.getArray(Ljava/lang/Class;)[Ljava/lang/Object
+  - S8024511, PR3020: Crash during color profile destruction
+  - S8025429, PR3020: [parfait] warnings from b107 for sun.java2d.cmm: JNI exception pending
+  - S8026702, PR3020: Fix for 8025429 breaks jdk build on windows
+  - S8026780, PR3020, RH1142587: Crash on PPC and PPC v2 for Java_awt test suit
+  - S8047066, PR3020: Test test/sun/awt/image/bug8038000.java fails with ClassCastException
+  - S8069181, PR3012, RH1015612: java.lang.AssertionError when compiling JDK 1.4 code in JDK 8
+  - S8076221, PR2809, RH1302385: Disable RC4 cipher suites
+  - S8151841, PR3098: Build needs additional flags to compile with GCC 6
+  - S8158260, PR2992, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
+  - S8159244, PR3075: Partially initialized string object created by C2's string concat optimization may escape
+* Bug fixes
+  - PR2799, RH1195203: Files are missing from resources.jar
+  - PR2900: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+* AArch64 port
+  - S8148328: aarch64: redundant lsr instructions in stub code.
+  - S8148783: aarch64: SEGV running SpecJBB2013
+  - S8148948: aarch64: generate_copy_longs calls align() incorrectly
+  - S8150045: arraycopy causes segfaults in SATB during garbage collection
+  - S8154537: AArch64: some integer rotate instructions are never emitted
+  - S8154739: AArch64: TemplateTable::fast_xaccess loads in wrong mode
+  - S8157906: aarch64: some more integer rotate instructions are never emitted
 
 New in release 2.6.6 (2016-04-21):
 

--- a/configure.ac	Thu Jul 14 03:39:40 2016 +0100
+++ b/configure.ac	Wed Jul 20 14:00:17 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.7.0pre05], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.7.0pre06], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])

--- a/hotspot.map.in	Thu Jul 14 03:39:40 2016 +0100
+++ b/hotspot.map.in	Wed Jul 20 14:00:17 2016 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 88abb663cdf9 b98e7d51fae5dc6380a18658f5b75158b4de5ddc618a21fee616c73a2a162014
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 601fbf4bf8c1 598f983e760f1f439444c837d1baa7fd6e5f3483c14a88a0862b1b6fb8aad595

--- a/patches/boot/ecj-diamond.patch	Thu Jul 14 03:39:40 2016 +0100
+++ b/patches/boot/ecj-diamond.patch	Wed Jul 20 14:00:17 2016 +0100
@@ -7552,3 +7552,15 @@
          List<Thread> threads = new ArrayList<Thread>();
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java	2016-07-20 03:24:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java	2016-07-20 04:22:41.946636327 +0100
+@@ -61,7 +61,7 @@
+ 
+         TagCache(LCMSProfile p) {
+             profile = p;
+-            tags = new HashMap<>();
++            tags = new HashMap<Integer, TagData>();
+         }
+ 
+         TagData getTag(int sig) {

--- a/patches/boot/jar.patch	Thu Jul 14 03:39:40 2016 +0100
+++ b/patches/boot/jar.patch	Wed Jul 20 14:00:17 2016 +0100
@@ -1,27 +1,36 @@
 diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk	2011-06-13 16:08:46.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk	2011-06-13 17:06:49.515488800 +0100
-@@ -627,9 +627,19 @@
+--- openjdk-boot.orig/jdk/make/common/Release.gmk	2016-07-20 03:31:53.349151607 +0100
++++ openjdk-boot/jdk/make/common/Release.gmk	2016-07-20 03:41:37.223480082 +0100
+@@ -728,12 +728,28 @@
  RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
- $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE)
+ $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE) $(IMPORT_JAR_FILELIST)
  	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
  	$(CD) $(CLASSBINDIR) && \
  	    $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
  	        @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
+ 	$(CD) $(IMPORTSRCDIR) && \
+ 	    $(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS) $@ \
+ 	        @$(IMPORT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
 +else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
 +	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(OTHER_JAR_MANIFEST_FILE) $@ \
 +	    $(BOOT_JAR_JFLAGS))
++	(cd $(IMPORTSRCDIR) && $(CAT) $(IMPORT_JAR_FILELIST) | \
++	$(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS)@ $@ \
++	    $(BOOT_JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
 +	$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
-+	    $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
++	    $(BOOT_JAR_JFLAGS) `$(CAT) $(RES_JAR_FILELIST)`)
++	(cd $(IMPORTSRCDIR) && \
++	$(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS) $@ \
++	    $(BOOT_JAR_JFLAGS) `$(CAT) $(IMPORT_JAR_FILELIST)`)
 +endif
  	@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
+ 	@$(CD) $(IMPORTSRCDIR) && $(java-vm-cleanup)
  
- # Create jsse.jar containing SunJSSE implementation classes
-@@ -683,9 +693,19 @@
+@@ -788,9 +804,19 @@
  RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar
  $(RT_JAR): $(RT_JAR_FILELIST) $(RT_JAR_MANIFEST_FILE)
  	$(prep-target)