--- a/ChangeLog	Fri Dec 12 20:13:40 2014 +0000
+++ b/ChangeLog	Tue Jan 06 18:27:44 2015 +0000
@@ -1,3 +1,38 @@
+2015-01-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.5.4pre03.
+	(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.4pre03.
+	* hotspot.map.in: Update to icedtea-2.5.4pre03.
+	* patches/boot/pr64174.patch: Drop the Lithuanian
+	changeover date now, as it's in the past.
+
+2014-12-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_BOOT_PATCHES): Add workaround for bug
+	in parsing end-of-year dates (Classpath PR64174).
+	* acinclude.m4:
+	(IT_PR64174_CHECK): Detect if the boot JDK suffers
+	from PR64174 and apply the patch if so.
+	* configure.ac: Call IT_PR64174_CHECK.
+	* patches/boot/pr64174.patch: Drop the Latvian
+	Euro changeover date, which is in the past anyway,
+	and move Lithuania's two hours forward so it enters
+	2015 and avoids the bug.
+
 2014-12-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2124: Synchronise elliptic curves in

--- a/Makefile.am	Fri Dec 12 20:13:40 2014 +0000
+++ b/Makefile.am	Tue Jan 06 18:27:44 2015 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b14
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 946d8c68cc64
-JAXP_CHANGESET = bd7f82f68cf1
-JAXWS_CHANGESET = 686552a98cae
-JDK_CHANGESET = cc61d8104f31
-LANGTOOLS_CHANGESET = 622e6cf4c032
-OPENJDK_CHANGESET = f94395c841f4
+CORBA_CHANGESET = b894abb26bbf
+JAXP_CHANGESET = 95795ef2016e
+JAXWS_CHANGESET = c604500818da
+JDK_CHANGESET = 4a7c0da7e219
+LANGTOOLS_CHANGESET = 412a4f8c67e8
+OPENJDK_CHANGESET = 1bcd6e8a9bc0
 
-CORBA_SHA256SUM = 25a968346d3ef2770e39871237661796d993c080557b0b1961f5ad0360b9b4eb
-JAXP_SHA256SUM = ea04b339d7630bc56343a28ce9b3370b06c9e4cdc1ee2e839b5d52cef0f01ed0
-JAXWS_SHA256SUM = a15642120bcfa6e0407c0d75a1250b7d5b75074416450bdcfcaee0b5d9e4ed61
-JDK_SHA256SUM = 6add81916bf68410fe63d64dcc4e233f999dc0d31f74a42939ac05b6993ad047
-LANGTOOLS_SHA256SUM = e4406c3a3f680e98ce34f857a4997cd72c739b080ad02929670fc584ca522338
-OPENJDK_SHA256SUM = 77bff21ea4cdc8ea05dfde1c1fb33d6b7f8a56355e68054c971933511cbc68ad
+CORBA_SHA256SUM = 186b1b89345d6bd55bedf4f0fe698b5d0b01dbd80fc09991390acc22eb2e4b60
+JAXP_SHA256SUM = 08aed5ef796520bebebd8de66000fd4541390f061c663ac4b7134ffd8ca62360
+JAXWS_SHA256SUM = 0ef87b304ecc345a49367280be4b172b4b3ea7616f6f3a9f34a7dd84b88781d4
+JDK_SHA256SUM = 16d8ed6f93b15c516d76b1f92e5284957eb47a05d11a319d17eb312ac0231ad2
+LANGTOOLS_SHA256SUM = c78ca45bfb184c855532e41bc55939bdc221110ef2dca08f86593f80ef8fa4c8
+OPENJDK_SHA256SUM = 6c6865742d6196cab82db424698d1f42b010cc33c0bb3dc9c2fbf6926e32a6aa
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -408,6 +408,12 @@
 ICEDTEA_BOOT_PATCHES +=	patches/boot/use_target_6_for_bootstrap_classes.patch 
 endif
 
+# If date parsing bug is present, drop Lithuania and Latvia EUR transition
+# dates as they are already in the past anyway.
+if CP64174
+ICEDTEA_BOOT_PATCHES += patches/boot/pr64174.patch
+endif
+
 ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
 
 # OpenJDK build environment.

--- a/NEWS	Fri Dec 12 20:13:40 2014 +0000
+++ b/NEWS	Tue Jan 06 18:27:44 2015 +0000
@@ -17,14 +17,21 @@
 * Backports
   - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec
   - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
+  - S7028073: The currency symbol for Peru is wrong
+  - S7077119, PR2165: 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)
   - 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
   - S8001105: findVirtual of Object[].clone produces internal error
   - S8005232: (JEP-149) Class Instance size reduction
+  - S8006748: getISO3Country() returns wrong value
   - S8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS
   - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE
+  - S8020190, PR2160, RH1176718: Fatal: Bug in native code: jfieldID must match object
+  - S8021121: ISO 4217 Amendment Number 156
   - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address
   - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition
   - S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
@@ -45,6 +52,7 @@
   - S8041408: Increment hsx 24.55 build to b04 for 7u55-b34
   - S8044603: Increment minor version of HSx for 7u71 and initialize the build number
   - S8050485: super() in a try block in a ctor causes VerifyError
+  - S8055222: Currency update needed for ISO 4217 Amendment #159
   - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset failed with GTKLookAndFeel on Linux and Solaris
   - S8067364, PR2145, RH114622: Printing to Postscript doesn't support dieresis
 * Bug fixes
@@ -82,11 +90,11 @@
   - S8042797, CVE-2014-6502: Avoid strawberries in LogRecord
   - S8044274, CVE-2014-6531: Proper property processing
 * Backports
-  - S4963723: Implement SHA-224
-  - S7044060: Need to support NSA Suite B Cryptography algorithms
+  - S4963723, RH1131221: Implement SHA-224
+  - S7044060, RH1131221: Need to support NSA Suite B Cryptography algorithms
   - S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations
   - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called
-  - S8006935: Need to take care of long secret keys in HMAC/PRF compuation
+  - S8006935, RH1131221: Need to take care of long secret keys in HMAC/PRF compuation
   - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode
   - S8028192: Use of PKCS11-NSS provider in FIPS mode broken
   - S8038000: java.awt.image.RasterFormatException: Incorrect scanline stride

--- a/acinclude.m4	Fri Dec 12 20:13:40 2014 +0000
+++ b/acinclude.m4	Tue Jan 06 18:27:44 2015 +0000
@@ -2869,3 +2869,49 @@
   AC_MSG_RESULT([$enable_queens])
   AM_CONDITIONAL([ENABLE_QUEENS], test x"${enable_queens}" = "xyes")
 ])
+
+AC_DEFUN_ONCE([IT_PR64174_CHECK],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+AC_CACHE_CHECK([if java.text.SimpleDateFormat exhibits Classpath bug 64174], it_cv_cp64174, [
+  CLASS=Test.java
+  BYTECODE=$(echo $CLASS|sed 's#\.java##')
+  mkdir tmp.$$
+  cd tmp.$$
+  cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class Test
+{
+  public static void main(String[] args)
+    throws ParseException
+  {
+    SimpleDateFormat format;
+
+    format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US);
+    format.setTimeZone(TimeZone.getTimeZone("GMT"));
+    format.setLenient(false);
+    System.out.println(format.parse("2014-12-31-22-00-00"));
+  }
+}]
+EOF
+  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+    if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+      it_cv_cp64174=no;
+    else
+      it_cv_cp64174=yes;
+    fi
+  else
+    it_cv_cp64174=yes;
+  fi
+  rm -f $CLASS *.class
+  cd ..
+  rmdir tmp.$$
+  ])
+AM_CONDITIONAL([CP64174], test x"${it_cv_cp64174}" = "xyes")
+AC_PROVIDE([$0])dnl
+])

--- a/configure.ac	Fri Dec 12 20:13:40 2014 +0000
+++ b/configure.ac	Tue Jan 06 18:27:44 2015 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.4pre02], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.5.4pre03], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -148,6 +148,9 @@
 dnl Check whether the HTTP server API is present in the bootstrap JDK, required by JAXWS
 IT_CHECK_FOR_CLASS([COM_SUN_NET_HTTPSERVER_HEADERS], [com.sun.net.httpserver.Headers])
 
+dnl Check whether the JDK can parse the dates used in the currency file
+IT_PR64174_CHECK
+
 IT_CHECK_ENABLE_WARNINGS
 IT_DIAMOND_CHECK
 IT_BYTECODE7_CHECK

--- a/hotspot.map.in	Fri Dec 12 20:13:40 2014 +0000
+++ b/hotspot.map.in	Tue Jan 06 18:27:44 2015 +0000
@@ -1,3 +1,3 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 7a4b0596c539 4e18aa918730808bf0477c99c1c00a485663e4b79da61199cd8b4b4f762c42f8
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 606de1136fd1 8a386eb729b2d241ad01eb6f8dade087d5c452f854f1eaac29c0cf6822896963
 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/pr64174.patch	Tue Jan 06 18:27:44 2015 +0000
@@ -0,0 +1,21 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties	2014-12-04 15:09:06.030312835 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties	2014-12-04 15:10:07.527160626 +0000
+@@ -320,7 +320,7 @@
+ # LAO PEOPLE'S DEMOCRATIC REPUBLIC
+ LA=LAK
+ # LATVIA
+-LV=LVL;2013-12-31-22-00-00;EUR
++LV=EUR
+ # LEBANON
+ LB=LBP
+ # LESOTHO
+@@ -332,7 +332,7 @@
+ # LIECHTENSTEIN
+ LI=CHF
+ # LITHUANIA
+-LT=LTL;2014-12-31-22-00-00;EUR
++LT=EUR
+ # LUXEMBOURG
+ LU=EUR
+ # MACAU