--- a/ChangeLog	Wed Jun 03 23:36:26 2015 +0100
+++ b/ChangeLog	Tue Jun 09 17:31:28 2015 +0100
@@ -1,3 +1,24 @@
+2015-06-09  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to icedtea-2.6pre22.
+	(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.6.0pre22.
+	* hotspot.map.in: Update to icedtea-2.6pre22.
+	* patches/boot/ecj-diamond.patch:
+	Add new case in sun.security.ssl.ClientHandshaker
+
 2015-06-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Remove backport listed in 2.5.5

--- a/Makefile.am	Wed Jun 03 23:36:26 2015 +0100
+++ b/Makefile.am	Tue Jun 09 17:31:28 2015 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b05
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 0cc5634fda95
-JAXP_CHANGESET = 522863522a4d
-JAXWS_CHANGESET = 231ef27a86e2
-JDK_CHANGESET = 533e9029af35
-LANGTOOLS_CHANGESET = 5331b041c889
-OPENJDK_CHANGESET = 513069c9fc20
+CORBA_CHANGESET = c92957e8516c
+JAXP_CHANGESET = 8904cf73c048
+JAXWS_CHANGESET = d4de5503ba99
+JDK_CHANGESET = d17bcae64927
+LANGTOOLS_CHANGESET = a322987c412f
+OPENJDK_CHANGESET = 851deec2e741
 
-CORBA_SHA256SUM = c569baf05545be674997c4946854f6a46746f52d247f9950c2682d92d134826c
-JAXP_SHA256SUM = 68b06c1deb15777f330ff84b83d5fdc90cfa192a34029e88b530df66dcb32c5c
-JAXWS_SHA256SUM = c72a4b88b0a981b920c635ef34cfd19a9c58fcc2c865e408f500ee6806c6d04a
-JDK_SHA256SUM = a322bdd3321257074e7e6477e6e5bae1ddf401834820160e34886c5d0767bdf2
-LANGTOOLS_SHA256SUM = 4d7db1be0e622563b947f54d5c50c7e8448f9801c5b9d62b1ab9ee841fa7e394
-OPENJDK_SHA256SUM = 4fe7fa6640be238b499c846b5f308c68b5fbd34dbe188393c34e2e4f08dc33f2
+CORBA_SHA256SUM = a07d372afc8d4478922dce71194f16dddaa339a590caac44ed63ec7a495419d0
+JAXP_SHA256SUM = ef5f00ad6ee1306502a75c4a99711cd4ec8202e891b734ab76f051255942bc46
+JAXWS_SHA256SUM = 809959c2c1a055e7997c064a5637e80b748f891a9908e37e4b97a8e9b5439868
+JDK_SHA256SUM = 542b0505e137e72148c948d92c3c1c280d01f46ed179b2e761b9f62935d3eae7
+LANGTOOLS_SHA256SUM = b83f713eb0908083f1535c99bb27715612ddd1be73a847518976d8cf2ea7ef2c
+OPENJDK_SHA256SUM = 29c4ec54bfaad49e3b1f144562975c6e22504b576a9984a7bd61f17928eba219
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 

--- a/NEWS	Wed Jun 03 23:36:26 2015 +0100
+++ b/NEWS	Tue Jun 09 17:31:28 2015 +0100
@@ -268,17 +268,42 @@
   - S8068338: Better message about incompatible zlib in Deflater.init
   - S8068507: (fc) Rename the new jdk.net.enableFastFileTransfer system property to jdk.nio.enableFastFileTransfer
   - S8068639: Make certain annotation classfile warnings opt-in
+* Backports
+  - S4890063, PR2305, RH1214835: HPROF: default text truncated when using doe=n option
+  - S6991580, PR2308: IPv6 Nameservers in resolv.conf throws NumberFormatException
+  - S8021120, PR2301: TieredCompilation can be enabled even if TIERED is undefined
+  - S8048214, PR2357: Linker error when compiling G1SATBCardTableModRefBS after include order changes
+  - S8072385, PR2387: Only the first DNSName entry is checked for endpoint identification
+  - S8075136: Unnecessary sign extension for byte array access
+  - S8076212, PR2314: AllocateHeap() and ReallocateHeap() should be inlined.
+  - S8078654, PR2333: CloseTTFontFileFunc callback should be removed
+  - S8078666, PR2326: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
 * Bug fixes
+  - PR1661: Cleanup SYSTEM_GCONF option and allow it to be set false
   - PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
   - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
   - PR1847: Synchronise javac.in with IcedTea6
   - PR2060: Fix warnings found by Gentoo ebuild QA with gcc 4.9.1
   - PR2144: make dist fails due to lack of HotSpot-specific patches
+  - PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_*
   - PR2233, RH1190835: Discover gsettings symbols separately so early versions of GLib can be used (e.g. on RHEL 6)
   - PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it
+  - PR2320: Allow use of system GConf
+  - PR2323: System GConf without system GIO configuration broken
   - PR2328: GCJ uses ppc64el named libarch directory on ppc64le
   - PR2394: ppc64le does not support -Xshare:dump
   - PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
+* AArch64 port
+  - Add copyright to aarch64_ad.m4
+  - S8069593: Changes to JavaThread::_thread_state must use acquire and release
+  - S8074349: AARCH64: C2 generates poor code for some byte and character stores
+  - S8075045: AARCH64: Stack banging should use store rather than load
+  - S8075324: Costs of memory operands in aarch64.ad are inconsistent
+  - S8075443: AARCH64: Missed L2I optimizations in C2
+  - S8075930: AARCH64: Use FP Register in C2
+  - S8076467: AARCH64: assertion fail with -XX:+UseG1GC
+  - S8079203: AARCH64: Need to cater for different partner implementations
+  - S8080586: aarch64: hotspot test compiler/codegen/7184394/TestAESMain.java fails
 
 New in release 2.5.5 (2015-04-14):
 

--- a/configure.ac	Wed Jun 03 23:36:26 2015 +0100
+++ b/configure.ac	Tue Jun 09 17:31:28 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre21], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre22], [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	Wed Jun 03 23:36:26 2015 +0100
+++ b/hotspot.map.in	Tue Jun 09 17:31:28 2015 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1939c010fd37 ac35bd6620553478700aaf8c825e373a7329d66473899f7184eb5a317f3db97f
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ cb42e88f9787 a5d774f3d3fe6589fb24d16307070489acb6f68903495c472d3f552284321e08

--- a/patches/boot/ecj-diamond.patch	Wed Jun 03 23:36:26 2015 +0100
+++ b/patches/boot/ecj-diamond.patch	Tue Jun 09 17:31:28 2015 +0100
@@ -5738,6 +5738,15 @@
              for (CipherSuite suite : cipherSuites.collection()) {
                  if (suite != CipherSuite.C_SCSV) {
                      cipherList.add(suite);
+@@ -1548,7 +1548,7 @@
+                 if ((subAltDnsName != null) && !subAltDnsName.isEmpty()) {
+                     if (subAltDnsNames == null) {
+                         subAltDnsNames =
+-                                new HashSet<>(subjectAltNames.size());
++                                new HashSet<String>(subjectAltNames.size());
+                     }
+                     subAltDnsNames.add(subAltDnsName);
+                 }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
 --- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	2015-01-29 22:21:31.000000000 +0000
 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	2015-01-30 03:30:15.901326207 +0000