--- a/ChangeLog	Tue Jul 07 14:50:13 2015 +0100
+++ b/ChangeLog	Wed Jul 08 13:16:41 2015 +0100
@@ -1,3 +1,35 @@
+2015-07-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL:
+	Document --enable-system-sctp option
+	and necessary dependencies.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.6pre24.
+	(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.
+	(ICEDTEA_ENV): Add SYSTEM_SCTP, SCTP_CFLAGS
+	and SCTP_LIBS to support the system SCTP
+	option.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_PCSC): Turn this option on
+	by default.
+	(IT_CHECK_FOR_SCTP): Add --enable-system-sctp
+	option.
+	* configure.ac: Invoke IT_CHECK_FOR_SCTP.
+	* hotspot.map.in: Update to icedtea-2.6pre24.
+	* patches/boot/ecj-stringswitch.patch:
+	Add case in sun.security.smartcardio.PlatformPCSC
+
 2015-07-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* INSTALL: Update list of detected

--- a/INSTALL	Tue Jul 07 14:50:13 2015 +0100
+++ b/INSTALL	Wed Jul 08 13:16:41 2015 +0100
@@ -32,6 +32,7 @@
 fontconfig (for --enable-system-fontconfig)
 libc6-dev & libattr-devel/libattr1-dev (for --enable-compile-against-syscalls)
 libpcsclite (for --enable-system-pcsc)
+lksctp-tools (for --enable-system-sctp)
 rhino (can be disabled using --without-rhino)
 libffi (for --enable-zero or on archs other than x86/x86_64/sparc/ppc64)
 LLVM 2.5 or later (for --enable-shark)
@@ -119,6 +120,8 @@
   fontconfig instead of trying to dynamically open it at runtime.
 * --enable-system-pcsc: Build and link against the system installation of
   libpcsclite instead of trying to dynamically open it at runtime.
+* --enable-system-sctp: Build and link against the system installation of
+  libsctp instead of trying to dynamically open it at runtime.
 * --enable-system-kerberos: Link against the system Kerberos library and
   query it at runtime to obtain the cache location, rather than using a
   hardcoded value.

--- a/Makefile.am	Tue Jul 07 14:50:13 2015 +0100
+++ b/Makefile.am	Wed Jul 08 13:16:41 2015 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b32
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 9d5c92264131
-JAXP_CHANGESET = 9150a16a7b80
-JAXWS_CHANGESET = 87290096a2fa
-JDK_CHANGESET = ec336c81a545
-LANGTOOLS_CHANGESET = 403eeedf70f4
-OPENJDK_CHANGESET = 88ad67ad5b51
+CORBA_CHANGESET = e3445769412d
+JAXP_CHANGESET = e3b08dc13807
+JAXWS_CHANGESET = 299588405837
+JDK_CHANGESET = 444d55ffed65
+LANGTOOLS_CHANGESET = bc95d2472055
+OPENJDK_CHANGESET = dbfa75121aca
 
-CORBA_SHA256SUM = 744b293bd34a570bc2155698a3e46572cb0e8433f7edcdcb594a37d8f8ac1cdd
-JAXP_SHA256SUM = 7325b18725730e780049259b428c8814fa8686f49c27ff419e03cc6926e88f87
-JAXWS_SHA256SUM = 760c32f84da4cf8794d685431135a7017217f48a16449b78313648d8aeb89097
-JDK_SHA256SUM = 7019b768badebe30ec3cea2fe04b240b8760e9879d8d215f3b6151d8f1dce9ba
-LANGTOOLS_SHA256SUM = 4389ea4ab8032be7ad1e4ad5f16d6b563059776b766e1672ecfff4b80d46f3e1
-OPENJDK_SHA256SUM = f2c024cae6479b49a864685a7c87b0e8109099e8057de878147363b579aa33ff
+CORBA_SHA256SUM = 5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb
+JAXP_SHA256SUM = 8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07
+JAXWS_SHA256SUM = 816a6d7a4bd302871d73f5681f6b35459000d76bfb9fa04b3479ffb630dc39f5
+JDK_SHA256SUM = 34544d1b058158ea57b9fccf1ca7f4c4fcb8dc36bb146371dc87366ccc73e0ef
+LANGTOOLS_SHA256SUM = 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661
+OPENJDK_SHA256SUM = 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -531,6 +531,9 @@
 	SYSTEM_PCSC="${ENABLE_SYSTEM_PCSC}" \
 	PCSC_LIBS="${PCSC_LIBS}" \
 	PCSC_CFLAGS="${PCSC_CFLAGS}" \
+	SYSTEM_SCTP="${ENABLE_SYSTEM_SCTP}" \
+	SCTP_LIBS="${SCTP_LIBS}" \
+	SCTP_CFLAGS="${SCTP_CFLAGS}" \
 	COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}" \
 	ARM32JIT="${ARM32JIT_STATUS}" \
 	INSTALL_LOCATION="${prefix}" \

--- a/NEWS	Tue Jul 07 14:50:13 2015 +0100
+++ b/NEWS	Wed Jul 08 13:16:41 2015 +0100
@@ -288,18 +288,24 @@
   - S4890063, PR2305, RH1214835: HPROF: default text truncated when using doe=n option
   - S6991580, PR2308, RH1210739: IPv6 Nameservers in resolv.conf throws NumberFormatException
   - S8021120, PR2301: TieredCompilation can be enabled even if TIERED is undefined
+  - S8025613, PR2437: clang: remove -Wno-unused-value
+  - S8039921, PR2421: SHA1WithDSA with key > 1024 bits not working
   - S8048214, PR2357, G548784: Linker error when compiling G1SATBCardTableModRefBS after include order changes
   - S8072385, PR2387: Only the first DNSName entry is checked for endpoint identification
+  - S8074761, PR2470, RH1194226: Empty optional parameters of LDAP query are not interpreted as empty
   - 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"
+  - S8081315, PR2405: Avoid giflib interlacing workaround with giflib 5.0.0 on
+  - S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5
 * 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
   - PR1816: Split download/extraction rules for OpenJDK so they can run in parallel
   - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
   - PR1847: Synchronise javac.in with IcedTea6
+  - PR1883: Search Debian multiarch paths when looking for pcsclite
   - 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_*
@@ -311,6 +317,10 @@
   - PR2341: Update README & INSTALL files
   - PR2394: ppc64le does not support -Xshare:dump
   - PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
+  - PR2446: Support system libsctp
+  - PR2458: Policy JAR files should be timestamped with the date of the policy file they hold
+  - PR2482, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock
+  - PR2496: Enable system PCSC support by default
 * AArch64 port
   - Add copyright to aarch64_ad.m4
   - S8069593: Changes to JavaThread::_thread_state must use acquire and release

--- a/acinclude.m4	Tue Jul 07 14:50:13 2015 +0100
+++ b/acinclude.m4	Wed Jul 08 13:16:41 2015 +0100
@@ -2220,7 +2220,7 @@
     ENABLE_SYSTEM_PCSC="${enableval}"
   ],
   [
-    ENABLE_SYSTEM_PCSC="no"
+    ENABLE_SYSTEM_PCSC="yes"
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_PCSC})
   if test x"${ENABLE_SYSTEM_PCSC}" = "xyes"; then
@@ -2991,3 +2991,29 @@
   AM_CONDITIONAL(USE_SYSTEM_GCONF, test x"${ENABLE_SYSTEM_GCONF}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_GCONF)
 ])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_SCTP],
+[
+  AC_MSG_CHECKING([whether to use the system libsctp install])
+  AC_ARG_ENABLE([system-sctp],
+	      [AS_HELP_STRING(--enable-system-sctp,use the system SCTP [[default=yes]])],
+  [
+    ENABLE_SYSTEM_SCTP="${enableval}"
+  ],
+  [
+    ENABLE_SYSTEM_SCTP="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_SYSTEM_SCTP})
+  if test x"${ENABLE_SYSTEM_SCTP}" = "xyes"; then
+    dnl Check for SCTP headers and libraries.
+    AC_CHECK_LIB([sctp], [sctp_bindx],
+        , [AC_MSG_ERROR([Could not find SCTP library; install SCTP or build with --disable-system-sctp to use the in-tree copy.])])
+    AC_CHECK_HEADER([netinet/sctp.h],
+        , [AC_MSG_ERROR([Could not find SCTP header; install SCTP or build with --disable-system-sctp to use the in-tree copy.])])
+    SCTP_LIBS="-lsctp"
+    AC_SUBST(SCTP_LIBS)
+    ENABLE_SYSTEM_SCTP=true
+  fi
+  AM_CONDITIONAL(USE_SYSTEM_SCTP, test x"${ENABLE_SYSTEM_SCTP}" = "xtrue")
+  AC_SUBST(ENABLE_SYSTEM_SCTP)
+])

--- a/configure.ac	Tue Jul 07 14:50:13 2015 +0100
+++ b/configure.ac	Wed Jul 08 13:16:41 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre23], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre24], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -220,6 +220,7 @@
 IT_CHECK_FOR_CUPS
 IT_CHECK_FOR_SYSCALLS
 IT_CHECK_FOR_PCSC
+IT_CHECK_FOR_SCTP
 AC_CONFIG_FILES([remove-intree-libraries.sh])
 
 dnl Check for Xproto headers and libraries.

--- a/hotspot.map.in	Tue Jul 07 14:50:13 2015 +0100
+++ b/hotspot.map.in	Wed Jul 08 13:16:41 2015 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1afefe2d5f90 e12e2d3d7b228abc3fa12a75455d3af883bce94f58df65e16e7f953592747054
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 94f15794d5e7 8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c

--- a/patches/boot/ecj-stringswitch.patch	Tue Jul 07 14:50:13 2015 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Wed Jul 08 13:16:41 2015 +0100
@@ -576,3 +576,33 @@
  
          // Handle annotation member accessors
          Object result = memberValues.get(member);
+diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java openjdk-boot/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java	2015-07-08 04:13:13.914186008 +0100
++++ openjdk-boot/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java	2015-07-08 04:14:07.193257306 +0100
+@@ -101,19 +101,17 @@
+         k = lib.indexOf("$ARCH");
+         if (k != -1) {
+             String arch = System.getProperty("os.arch");
+-            switch (arch) {
+-            case "amd64":
++	    if ("amd64".equals(arch)) {
+                 arch = "x86_64";
+-                break;
+-            case "ppc":
++	    }
++	    if ("ppc".equals(arch)) {
+                 arch = "powerpc";
+-                break;
+-            case "ppc64":
++	    }
++	    if ("ppc64".equals(arch)) {
+                 arch = "powerpc64";
+-                break;
+-            case "ppc64le":
++	    }
++            if ("ppc64le".equals(arch)) {
+                 arch = "powerpc64le";
+-                break;
+             }
+             lib = replace(k, lib, "$ARCH", arch);
+         }