--- a/ChangeLog	Fri Mar 25 03:18:14 2016 +0000
+++ b/ChangeLog	Fri Mar 25 05:38:58 2016 +0000
@@ -1,3 +1,31 @@
+2016-03-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	Bump to icedtea-2.6.5.
+	* INSTALL: Update X11 dependency documentation.
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 99.
+	(CORBA_CHANGESET): Update to icedtea-2.6.5.
+	(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.5. Add check
+	for libXcomposite as required by fix
+	for PR2866. Correct variables used by
+	xproto check.
+	* hotspot.map.in: Update to icedtea-2.6.5.
+	* patches/boot/ecj-multicatch.patch:
+	Add new cases in java.lang.invoke.MemberName
+	and sun.invoke.util.VerifyAccess
+
 2016-03-18  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2886: Location of 'stap' executable is hard-coded

--- a/INSTALL	Fri Mar 25 03:18:14 2016 +0000
+++ b/INSTALL	Fri Mar 25 05:38:58 2016 +0000
@@ -11,7 +11,7 @@
   - GNU libgcj 4.4.0 (or equivalent class library based on GNU Classpath >= 0.95) (--enable-bootstrap mode only, the default)
   - IcedTea6 or IcedTea7
 CUPS
-libX11 (libXp, libXtst, libXi, libXt, libXinerama)
+libX11 (xproto, libX11, libXext, libXtst, libXi, libXt, libXinerama, libXrender, libXcomposite, libXau, libXdmcp)
 Freetype2
 patch
 sed

--- a/Makefile.am	Fri Mar 25 03:18:14 2016 +0000
+++ b/Makefile.am	Fri Mar 25 05:38:58 2016 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 95
+JDK_UPDATE_VERSION = 99
 BUILD_VERSION = b00
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 2135da66cc53
-JAXP_CHANGESET = bc6edb6c12a7
-JAXWS_CHANGESET = 271b555de438
-JDK_CHANGESET = dc86038147b2
-LANGTOOLS_CHANGESET = fd0a34cb97b4
-OPENJDK_CHANGESET = 4f1e498cad9c
-
-CORBA_SHA256SUM = 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08
-JAXP_SHA256SUM = 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62
-JAXWS_SHA256SUM = da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1
-JDK_SHA256SUM = 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63
-LANGTOOLS_SHA256SUM = f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc
-OPENJDK_SHA256SUM = bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2
+CORBA_CHANGESET = 389551542e13
+JAXP_CHANGESET = 8a56658cb829
+JAXWS_CHANGESET = 9c049d7f5adc
+JDK_CHANGESET = e727fe32654c
+LANGTOOLS_CHANGESET = f6593c32cc46
+OPENJDK_CHANGESET = 8e728c41fec5
+
+CORBA_SHA256SUM = 427969fdd78513a11ddd9d5131a068e0b26ca2c8f14951bf8b161fecd07fe77f
+JAXP_SHA256SUM = 7bb5e1bc9f0807061e157aeb356dd0e3b9fa019fb316beee3aa0181a335ba37a
+JAXWS_SHA256SUM = 4e759ade7e47713f6f26afc1ffcd02f2edf967582fae2ec6b4d73dc81be926d0
+JDK_SHA256SUM = cd3810553b1066c21f2fe08a73de72e38ba7e72295cd32dec70db481a24421ba
+LANGTOOLS_SHA256SUM = 6c6c676c60af61638a0c3176f0312fcc0abad16d1d3cdbe11aeefcc3357a78d9
+OPENJDK_SHA256SUM = c66f56a91a6fa9e3c889bbbc5432a4e082b7d3735188fb508fa7ec70c142abdb
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 

--- a/NEWS	Fri Mar 25 03:18:14 2016 +0000
+++ b/NEWS	Fri Mar 25 05:38:58 2016 +0000
@@ -14,6 +14,18 @@
 
 New in release 2.6.5 (2016-04-XX):
 
+* Security fixes
+  - S8152335, CVE-2016-0636: Improve MethodHandle consistency
+* Import of OpenJDK 7 u99 build 0
+  - S6425769, PR2858: Allow specifying an address to bind JMX remote connector
+  - S6961123: setWMClass fails to null-terminate WM_CLASS string
+  - S8145982, PR2858: JMXInterfaceBindingTest is failing intermittently
+  - S8146015, PR2858: JMXInterfaceBindingTest is failing intermittently for IPv6 addresses
+* Backports
+  - S8028727, PR2814: [parfait] warnings from b116 for jdk.src.share.native.sun.security.ec: JNI pending exceptions
+  - S8048512, PR2814: Uninitialised memory in jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
+  - S8071705. PR2819, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
+  - S8150954, PR2866, RH1176206: AWT Robot not compatible with GNOME Shell
 * Bug fixes
   - PR2803: Make system CUPS optional
   - PR2886: Location of 'stap' executable is hard-coded
@@ -21,6 +33,30 @@
   - PR2894: Add missing test directory in make check.
 * CACAO
   - PR2781, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
+* AArch64 port
+  - PR2852: Add support for large code cache
+  - PR2852: Apply ReservedCodeCacheSize default limiting to AArch64 only.
+  - S8081289, PR2852: aarch64: add support for RewriteFrequentPairs in interpreter
+  - S8131483, PR2852: aarch64: illegal stlxr instructions
+  - S8133352, PR2852: aarch64: generates constrained unpredictable instructions
+  - S8133842, PR2852: aarch64: C2 generates illegal instructions with int shifts >=32
+  - S8134322, PR2852: AArch64: Fix several errors in C2 biased locking implementation
+  - S8136615, PR2852: aarch64: elide DecodeN when followed by CmpP 0
+  - S8138575, PR2852: Improve generated code for profile counters
+  - S8138641, PR2852: Disable C2 peephole by default for aarch64
+  - S8138966, PR2852: Intermittent SEGV running ParallelGC
+  - S8143067, PR2852: aarch64: guarantee failure in javac
+  - S8143285, PR2852: aarch64: Missing load acquire when checking if ConstantPoolCacheEntry is resolved
+  - S8143584, PR2852: Load constant pool tag and class status with load acquire
+  - S8144201, PR2852: aarch64: jdk/test/com/sun/net/httpserver/Test6a.java fails with --enable-unlimited-crypto
+  - S8144582, PR2852: AArch64 does not generate correct branch profile data
+  - S8146709, PR2852: AArch64: Incorrect use of ADRP for byte_map_base
+  - S8147805, PR2852: aarch64: C1 segmentation fault due to inline Unsafe.getAndSetObject
+  - S8148240, PR2852: aarch64: random infrequent null pointer exceptions in javac
+* PPC & AIX port
+  - S8034797, PR2851: AIX: Fix os::naked_short_sleep() in os_aix.cpp after 8028280
+  - S8139258, PR2851: PPC64LE: argument passing problem when passing 15 floats in native call
+  - S8139421, PR2851: PPC64LE: MacroAssembler::bxx64_patchable kill register R12
 
 New in release 2.6.4 (2016-01-19):
 

--- a/configure.ac	Fri Mar 25 03:18:14 2016 +0000
+++ b/configure.ac	Fri Mar 25 05:38:58 2016 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.5pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.5], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -237,8 +237,8 @@
   AC_MSG_ERROR([Could not find Xproto headers - \
   Try installing xorg-x11-proto-devel.])
 fi
-AC_SUBST(XT_CFLAGS)
-AC_SUBST(XT_LIBS)
+AC_SUBST(XPROTO_CFLAGS)
+AC_SUBST(XPROTO_LIBS)
 
 dnl Check for libXt headers and libraries.
 PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no])
@@ -278,6 +278,13 @@
 Try installing libXrender-devel.])
 fi
 
+PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, [XCOMPOSITE_FOUND=yes], [XCOMPOSITE_FOUND=no])
+if test "x${XCOMPOSITE_FOUND}" = xno
+then AC_MSG_ERROR([Could not find Xcomposite extension.  Try installing libXcomposite-devel.])
+fi
+AC_SUBST(XCOMPOSITE_CFLAGS)
+AC_SUBST(XCOMPOSITE_LIBS)
+
 AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
                 [SDT_H_FOUND='no';
                    AC_MSG_WARN([systemtap support needs sys/sdt.h header])])

--- a/hotspot.map.in	Fri Mar 25 03:18:14 2016 +0000
+++ b/hotspot.map.in	Fri Mar 25 05:38:58 2016 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 19d919ae5506 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 04d7046d2d41 43983232fb10abeac99478e7045c04a93fef86185e2b9ee9c7b46f2903441cfc

--- a/patches/boot/ecj-multicatch.patch	Fri Mar 25 03:18:14 2016 +0000
+++ b/patches/boot/ecj-multicatch.patch	Fri Mar 25 05:38:58 2016 +0000
@@ -706,3 +706,34 @@
          }
      }
  
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java	2016-03-25 04:42:21.295105700 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java	2016-03-25 04:43:14.778216824 +0000
+@@ -862,7 +862,12 @@
+                 m = MethodHandleNatives.resolve(m, lookupClass);
+                 m.checkForTypeAlias(m.getDeclaringClass());
+                 m.resolution = null;
+-            } catch (ClassNotFoundException | LinkageError ex) {
++            } catch (ClassNotFoundException ex) {
++                // JVM reports that the "bytecode behavior" would get an error
++                assert(!m.isResolved());
++                m.resolution = ex;
++                return m;
++            } catch (LinkageError ex) {
+                 // JVM reports that the "bytecode behavior" would get an error
+                 assert(!m.isResolved());
+                 m.resolution = ex;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java	2016-03-25 04:42:03.663398723 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java	2016-03-25 04:42:45.170708900 +0000
+@@ -222,7 +222,9 @@
+                     public Class<?> run() {
+                         try {
+                             return Class.forName(name, false, refcLoader);
+-                        } catch (ClassNotFoundException | LinkageError e) {
++                        } catch (ClassNotFoundException e) {
++                            return null; // Assume the class is not found
++                        } catch (LinkageError e) {
+                             return null; // Assume the class is not found
+                         }
+                     }