--- a/ChangeLog	Sat Jan 24 02:09:56 2015 +0000
+++ b/ChangeLog	Tue Jan 27 17:06:06 2015 +0000
@@ -1,3 +1,25 @@
+2015-01-27  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am,
+	(BUILD_VERSION): Bump to b31.
+	(CORBA_CHANGESET): Update to icedtea-2.5.5pre01.
+	(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.5.5pre01.
+	* hotspot.map.in: Update to icedtea-2.5.5pre01.
+	* patches/boot/ecj-multicatch.patch:
+	Add new case for sun.security.provider.SecureRandom
+
 2015-01-21  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Set release date.

--- a/Makefile.am	Sat Jan 24 02:09:56 2015 +0000
+++ b/Makefile.am	Tue Jan 27 17:06:06 2015 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
 JDK_UPDATE_VERSION = 75
-BUILD_VERSION = b13
+BUILD_VERSION = b31
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 3c9f523bf96e
-JAXP_CHANGESET = ca26767d3375
-JAXWS_CHANGESET = 9a6c90336922
-JDK_CHANGESET = 1e6db4f8b0f3
-LANGTOOLS_CHANGESET = 960cdffa8b3f
-OPENJDK_CHANGESET = 6cf2880aab5e
+CORBA_CHANGESET = e8e7ada7819c
+JAXP_CHANGESET = 91f042201bb6
+JAXWS_CHANGESET = be14a67897fc
+JDK_CHANGESET = e1bfd77b6e1a
+LANGTOOLS_CHANGESET = 62af99c4ba80
+OPENJDK_CHANGESET = cf5639f1ca27
 
-CORBA_SHA256SUM = 7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b
-JAXP_SHA256SUM = 84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3
-JAXWS_SHA256SUM = 4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b
-JDK_SHA256SUM = e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09
-LANGTOOLS_SHA256SUM = 4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a
-OPENJDK_SHA256SUM = 88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1
+CORBA_SHA256SUM = a0ad9c9bec9f9381ff32aa7e0fa4a6cacd30bbf77bb7c4a7a416990e6bf3e254
+JAXP_SHA256SUM = a31439d977298cb49c4c6c7b2fe5a54f5d434d9744c7e9d19da1fd223dfbf6ce
+JAXWS_SHA256SUM = c04aa71beccb31dba2b65a5cb31f1de8b614985722b00d8afa55f0c7809de1a1
+JDK_SHA256SUM = a6b60a3d1236cca2649e8071cdcbf56b3697384332daa161b35c6e5c59878f0c
+LANGTOOLS_SHA256SUM = fb200d190bd3544dcece20eb3c43619134c6a8be2c8d96ab2c5484b477648621
+OPENJDK_SHA256SUM = 3268954c04d6d9b11f5c56b0ea4ecfc099ee37fc3a9ff9a67bdde42b1d1bdf2f
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 

--- a/NEWS	Sat Jan 24 02:09:56 2015 +0000
+++ b/NEWS	Tue Jan 27 17:06:06 2015 +0000
@@ -12,6 +12,62 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 2.5.5 (2015-04-XX):
+
+* Backports
+  - S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running
+  - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called
+  - S7195480: javax.smartcardio does not detect cards on Mac OS X
+  - S8001472: api/java_awt/Window/indexTGF_* tests fail because expected colors aren't equal
+  - S8011646: SEGV in compiled code with loop predication
+  - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode
+  - S8016545: java.beans.XMLEncoder.writeObject output is wrong
+  - S8019324: assert(_f2 == 0 || _f2 == f2) failed: illegal field change
+  - S8019623: Lack of synchronization in AppContext.getAppContext()
+  - S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert
+  - S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers
+  - S8024061: Exception thrown when drag and drop between two components is executed quickly
+  - S8028616: Htmleditorkit parser doesn't handle leading slash (/)
+  - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed
+  - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty since 7u40b33
+  - S8031290: Adjust call to getisax() for additional words returned
+  - S8032872: [macosx] Cannot select from JComboBox in a JWindow
+  - S8032874: ArrayIndexOutOfBoundsException in JTable while clearing data in JTable
+  - S8032878: Editable combos in table do not behave as expected
+  - S8033113: wsimport fails on WSDL:header parameter name customization
+  - S8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction
+  - S8036022: D3D: rendering with XOR composite causes InternalError.
+  - S8036709: Java 7 jarsigner displays warning about cert policy tree
+  - S8036819: JAB: mneumonics not read for textboxes
+  - S8036983: JAB:Multiselection Ctrl+CursorUp/Down and ActivateDescenderPropertyChanged event
+  - S8037477: Reproducible hang of JAWS and webstart application with JAB 2.0.4
+  - S8038925: Java with G1 crashes in dump_instance_fields using jmap or jcmd without fullgc
+  - S8039050: Crash in C2 compiler at Node::rematerialize
+  - S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR))
+  - S8039319: (smartcardio) Card.transmitControlCommand() does not work on Mac OS X
+  - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request
+  - S8042059: Various fixes to linux/sparc
+  - S8042857: 14 stuck threads waiting for notification on LDAPRequest
+  - S8043200: Decrease the preference mode of RC4 in the enabled cipher suite list
+  - S8043205: Incorrect system traps.h include path
+  - S8043206: Fix signed vs. unsigned comparison warning in copy_sparc.hpp
+  - S8043207: Add const to Address argument for Assembler::swap
+  - S8043210: Add _BIG_ENDIAN define on linux/sparc
+  - S8043507: javax.smartcardio.CardTerminals.list() fails on MacOSX
+  - S8044602: Increment minor version of HSx for 7u72 and initialize the build number
+  - S8044659: Java SecureRandom on SPARC T4 much slower than on x86/Linux
+  - S8046769: Set T family feature bit on Niagara systems
+  - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX
+  - S8049081: Increment hsx 24.72 build to b02 for 7u72-b03
+  - S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow
+  - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04
+  - S8050158: Introduce system property to maintain RC4 preference order
+  - S8050165: linux-sparcv9: NMT detail causes assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) failed: younger_sp must be valid
+  - S8050167: linux-sparcv9: hs_err file does not show any stack information
+  - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11
+  - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure
+  - S8068405: GenerateCurrencyData throws RuntimeException for old data
+
 New in release 2.5.4 (2015-01-21):
 
 * Security fixes
@@ -38,11 +94,11 @@
   - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
   - S7028073: The currency symbol for Peru is wrong
   - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
-  - S7183753: [TEST] Some colon in the diff for this test
   - S7077119, PR2165, G534118: remove past transition dates from CurrencyData.properties file
   - S7085757: Currency Data: ISO 4217 Amendment 152
   - S7169142: CookieHandler does not work with localhost
   - S7172012, PR2067: Make test-in-build an option (Queens)
+  - S7183753: [TEST] Some colon in the diff for this test
   - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations
   - S7195759: ISO 4217 Amendment 154
   - S8000897, RH1155012: VM crash in CompileBroker

--- a/configure.ac	Sat Jan 24 02:09:56 2015 +0000
+++ b/configure.ac	Tue Jan 27 17:06:06 2015 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.4], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.5.5pre01], [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	Sat Jan 24 02:09:56 2015 +0000
+++ b/hotspot.map.in	Tue Jan 27 17:06:06 2015 +0000
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6144ca9b6a72 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ bbda609c9d24 006cee4f215f228f1131a8c5cfcd3e1d9d33f8fe980a1172bf208606a0100b68
 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef

--- a/patches/boot/ecj-multicatch.patch	Sat Jan 24 02:09:56 2015 +0000
+++ b/patches/boot/ecj-multicatch.patch	Tue Jan 27 17:06:06 2015 +0000
@@ -552,3 +552,54 @@
              // Missing VK is okay
              return 0;
          }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SecureRandom.java openjdk-boot/jdk/src/share/classes/sun/security/provider/SecureRandom.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SecureRandom.java	2015-01-27 03:06:33.100525224 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SecureRandom.java	2015-01-27 03:15:51.615360901 +0000
+@@ -94,14 +94,22 @@
+      * and sets the seed, if given.
+      */
+     private void init(byte[] seed) {
++        Exception ex = null;
++
+         try {
+             /*
+              * Use the local SUN implementation to avoid native
+              * performance overhead.
+              */
+             digest = MessageDigest.getInstance("SHA", "SUN");
+-        } catch (NoSuchProviderException | NoSuchAlgorithmException e) {
+-            // Fallback to any available.
++        } catch (NoSuchProviderException e) {
++            ex = e;
++        } catch (NoSuchAlgorithmException e) {
++            ex = e;
++        }
++
++        // Fallback to any available.
++        if (ex != null) {
+             try {
+                 digest = MessageDigest.getInstance("SHA");
+             } catch (NoSuchAlgorithmException exc) {
+@@ -265,6 +273,7 @@
+      */
+     private void readObject(java.io.ObjectInputStream s)
+         throws IOException, ClassNotFoundException {
++	Exception ex = null;
+ 
+         s.defaultReadObject ();
+ 
+@@ -274,7 +283,13 @@
+              * performance overhead.
+              */
+             digest = MessageDigest.getInstance("SHA", "SUN");
+-        } catch (NoSuchProviderException | NoSuchAlgorithmException e) {
++        } catch (NoSuchProviderException e) {
++	    ex = e;
++        } catch (NoSuchAlgorithmException e) {
++	    ex = e;
++	}
++
++	if (ex != null) {
+             // Fallback to any available.
+             try {
+                 digest = MessageDigest.getInstance("SHA");