--- a/ChangeLog	Wed Jun 04 14:49:24 2014 +0100
+++ b/ChangeLog	Thu Jun 05 02:53:33 2014 +0100
@@ -1,3 +1,61 @@
+2014-06-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(BUILD_VERSION): Bump to b30.
+	(CORBA_CHANGESET): Update to icedtea-2.5pre07 tag.
+	(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 pre07.
+	* hotspot.map: Update to icedtea-2.5pre07tag.
+
+2014-04-23  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1742: Allow SunEC provider to be built with changes
+	in NSS >= 3.16.1
+	* Makefile.am:
+	(ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS
+	instead of NSS_LIBS and NSS_CFLAGS respectively.
+	* acinclude.m4:
+	(IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS
+	for clarity as NSS_CFLAGS and NSS_LIBS are also set
+	by the NSS detection.
+
+2014-04-18  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1699: Support building the SunEC provider with system NSS
+	* Makefile.am:
+	(ICEDTEA_ENV): Only add DISABLE_INTREE_EC if
+	ENABLE_SUNEC is not set. Set SYSTEM_NSS in both
+	cases and NSS_LIBS, NSS_CFLAGS and ECC_JUST_SUITE_B
+	when ENABLE_SUNEC is set.
+	* acinclude.m4:
+	(IT_LOCATE_NSS): Fix wording to make it clear that
+	this is the PKCS11 provider, using NSS as the
+	implementation.
+	(IT_ENABLE_SUNEC): Allow the Sun elliptic curve
+	crypto provider to be enabled.
+	* configure.ac:
+	Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which
+	depends on the former).
+	* fsg.sh:
+	Only delete the SunEC implementation code at this
+	level. This is the part that is legally dubious,
+	due to the use of many more elliptic curves than
+	those provided by the NSS version.
+	* remove-intree-libraries.sh.in:
+	Include the remaining SunEC deletion from fsg.sh
+	here and make it optional.
+
 2014-06-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* INSTALL: Replace documentation of

--- a/Makefile.am	Wed Jun 04 14:49:24 2014 +0100
+++ b/Makefile.am	Thu Jun 05 02:53:33 2014 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
 JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b15
+BUILD_VERSION = b30
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 1650f85c0dee
-JAXP_CHANGESET = 49ca8c230020
-JAXWS_CHANGESET = 3a7c902a4390
-JDK_CHANGESET = 575b3a2fa6c9
-LANGTOOLS_CHANGESET = 853f886673d8
-OPENJDK_CHANGESET = 716796f6c6f0
+CORBA_CHANGESET = 03a1bf9a9e89
+JAXP_CHANGESET = f4ad8e860eaf
+JAXWS_CHANGESET = 9699fe5c5232
+JDK_CHANGESET = 5607f5a99784
+LANGTOOLS_CHANGESET = 454870780579
+OPENJDK_CHANGESET = d42df0b6ea9d
 
-CORBA_SHA256SUM = 11503511cac59fa9d18d955b0db1de2217723be3e3b997a5485aa19ca0353c5a
-JAXP_SHA256SUM = b65e71685224d288be7f9656372463944dcb56f1e0688d94b78f1b1616e34af8
-JAXWS_SHA256SUM = b879454336dba2a27bb61528e80ba242a5e2cda657fd5096f8242a8b9c8331ce
-JDK_SHA256SUM = abe758688db8a41b338eb09ce2e3b84e205e271ae51f76de39528ed84a49a70a
-LANGTOOLS_SHA256SUM = 2d6f659521792661cdc3156cfa6efaebc84a77548d613a66331805ff0fbe8115
-OPENJDK_SHA256SUM = 7c8142b0981d4f47818754a1e1d15d9a99c351eadd173c8af7248f5163413dc7
+CORBA_SHA256SUM = 5f7f0c37aa0b370947bda59c6799db94e8da6aba1a82750b29907109e0326069
+JAXP_SHA256SUM = 9fe737e113ecc1424c6036fefaee4f34cd6df657a4a2ecc7b61bbab1b61e8d25
+JAXWS_SHA256SUM = cc2fc8f11e30b51cde58af756814ffa395d9b8119f9849c2681c3453f0e60d83
+JDK_SHA256SUM = 6e3070303649fe2dc98a8407f8ad9fad33208302e504dd623695e8ad0b12fae8
+LANGTOOLS_SHA256SUM = e5f761b19b250d71449cf247b265ba3cb6a0b1963621133a5712dbe30643f5d0
+OPENJDK_SHA256SUM = 9ffde89bb02d1da7ef5ca77ac100d4eefd4767cb93a87cda1deaefb6a5e1a750
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -473,7 +473,6 @@
 	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
 	DEBUG_CLASSFILES="true" \
 	DEBUG_BINARIES="true" \
-	DISABLE_INTREE_EC="true" \
 	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
 	VERBOSE="$(VERBOSE)" \
 	STATIC_CXX="false" \
@@ -562,6 +561,18 @@
 	PAX_COMMAND="${PAX_COMMAND}"
 endif
 
+if ENABLE_SUNEC
+ICEDTEA_ENV += \
+	SYSTEM_NSS="true" \
+	NSS_LIBS="${SUNEC_LIBS}" \
+	NSS_CFLAGS="${SUNEC_CFLAGS}" \
+	ECC_JUST_SUITE_B="true"
+else
+ICEDTEA_ENV += \
+	SYSTEM_NSS="false" \
+	DISABLE_INTREE_EC="true"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \

--- a/NEWS	Wed Jun 04 14:49:24 2014 +0100
+++ b/NEWS	Thu Jun 05 02:53:33 2014 +0100
@@ -217,9 +217,11 @@
   - S8036147: Increment hsx 24.55 build to b02 for 7u55-b11
   - S8036584: Review comments from 8035897
   - S8036837: Increment hsx 24.55 build to b03 for 7u55-b12
+  - S8036861: Application can't be loaded fine,the save dialog can't show up.
   - S8037012: (tz) Support tzdata2014a
   - S8037340: Linux semaphores to use CLOCK_REALTIME
   - S8037510: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
+  - S8038306: (tz) Support tzdata2014b
   - S8039097: Some tests fail with NPE since 7u60 b12
 * Backports
   - S7103549: Remove dependencies on libjava and libjvm from security libraries
@@ -228,6 +230,7 @@
   - S8001579: Cleanup warnings in security native code
   - S8007607: security native code doesn't always use malloc, realloc, and calloc correctly
   - S8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change
+  - S8012224: AWT_TopLevels/TopLevelEvents/Automated/WindowIconifyDeiconifyEventsTest02 fails on Ubuntu 12.04 Unity shell
   - S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
   - S8038392, RH1064383: Generating prelink cache breaks JAVA 'jinfo' utility normal behavior
 * Bug fixes
@@ -266,6 +269,7 @@
   - PR1781: NSS PKCS11 provider fails to handle multipart AES encryption
   - RH1059925: RFE: Version Java libraries to allow using multiple Java versions with Linux capabilities enabled
   - RH905128: [CRASH] OpenJDK-1.7.0 while using NSS security provider and kerberos
+  - PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1
 * PPC & AIX port
   - Add AIX-specific build instructions to README-ppc.html
   - Added AIX as testing platform for more jtreg tests written in shell-script

--- a/acinclude.m4	Wed Jun 04 14:49:24 2014 +0100
+++ b/acinclude.m4	Thu Jun 05 02:53:33 2014 +0100
@@ -1759,10 +1759,10 @@
 AC_DEFUN_ONCE([IT_LOCATE_NSS],
 [
 AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR])
-AC_MSG_CHECKING([whether to enable the NSS-based security provider])
+AC_MSG_CHECKING([whether to enable the PKCS11 crypto provider using NSS])
 AC_ARG_ENABLE([nss],
 	      [AS_HELP_STRING([--enable-nss],
-	      		      [Enable inclusion of NSS security provider])],
+	      		      [Enable inclusion of PKCS11 crypto provider using NSS])],
 	      [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no'])
 AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
 if test "x${ENABLE_NSS}" = "xyes"
@@ -2690,3 +2690,41 @@
   AC_MSG_RESULT([$enable_arm32jit])
   AM_CONDITIONAL([ENABLE_ARM32JIT], test x"${enable_arm32jit}" = "xyes")
 ])
+
+AC_DEFUN_ONCE([IT_ENABLE_SUNEC],
+[
+  AC_REQUIRE([IT_LOCATE_NSS])
+  AC_MSG_CHECKING([whether to enable the Sun elliptic curve crypto provider])
+  AC_ARG_ENABLE([sunec],
+                [AS_HELP_STRING(--enable-sunec,build the Sun elliptic curve crypto provider [[default=no]])],
+  [
+    case "${enableval}" in
+      yes)
+        enable_sunec=yes
+        ;;
+      *)
+        enable_sunec=no
+        ;;
+    esac
+  ],
+  [
+    enable_sunec=no
+  ])
+  AC_MSG_RESULT([$enable_sunec])
+  AM_CONDITIONAL([ENABLE_SUNEC], test x"${enable_sunec}" = "xyes")
+  if test x"${enable_sunec}" = "xyes"; then
+    PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
+    PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
+    if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+      SUNEC_CFLAGS="$NSS_SOFTOKN_CFLAGS -lfreebl";
+      SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
+    elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+      SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+      SUNEC_LIBS=$NSS_JAVA_LIBS;
+    else
+      AC_MSG_ERROR([Could not find a suitable NSS installation to use for the SunEC provider.])
+    fi
+    AC_SUBST(SUNEC_CFLAGS)
+    AC_SUBST(SUNEC_LIBS)
+  fi
+])

--- a/configure.ac	Wed Jun 04 14:49:24 2014 +0100
+++ b/configure.ac	Thu Jun 05 02:53:33 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5pre06], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.5pre07], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -53,6 +53,7 @@
 IT_DISABLE_HOTSPOT_TESTS
 IT_DISABLE_LANGTOOLS_TESTS
 IT_DISABLE_JDK_TESTS
+IT_ENABLE_SUNEC
 
 # Use xvfb-run if found to run gui tests (check-jdk).
 AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
@@ -74,7 +75,6 @@
 AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
 AC_MSG_RESULT(${ENABLE_DOCS})
 
-IT_LOCATE_NSS
 IT_GET_PKGVERSION
 IT_GET_LSB_DATA
 

--- a/fsg.sh	Wed Jun 04 14:49:24 2014 +0100
+++ b/fsg.sh	Thu Jun 05 02:53:33 2014 +0100
@@ -106,10 +106,4 @@
 rm -rvf openjdk/jdk/test/com/sun/servicetag
 
 echo "Removing EC source code we don't build"
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
-rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java
-rm -rvf openjdk/jdk/src/share/native/sun/security/ec
-rm -rvf openjdk/jdk/make/sun/security/ec
+rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl

--- a/hotspot.map	Wed Jun 04 14:49:24 2014 +0100
+++ b/hotspot.map	Thu Jun 05 02:53:33 2014 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot 3017276776bf 8e111a2364e5127c6ae2043a605a5ea8ec6220684a325fd3a69d1df4ae93868a
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot f106b1f551d7 4da4d84ee1b73e0cdf537e8f5b4ee351673eac14490da6de958098d827077adb
 aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c

--- a/remove-intree-libraries.sh.in	Wed Jun 04 14:49:24 2014 +0100
+++ b/remove-intree-libraries.sh.in	Thu Jun 05 02:53:33 2014 +0100
@@ -63,3 +63,13 @@
   echo "Removing libpcsc headers"
   rm -rvf ${PCSC_SRC}
 fi
+
+if test "x@ENABLE_SUNEC@" = "xno"; then
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java
+rm -rvf openjdk/jdk/src/share/native/sun/security/ec
+rm -rvf openjdk/jdk/make/sun/security/ec
+fi