--- a/ChangeLog	Fri Apr 18 17:11:05 2014 +0100
+++ b/ChangeLog	Wed Apr 23 22:32:19 2014 +0100
@@ -1,3 +1,33 @@
+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:
+	(BUILD_VERSION): Bump to b13.
+	(CORBA_CHANGESET): Update to icedtea-2.6pre02 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.
+	(ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS
+	instead of NSS_LIBS and NSS_CFLAGS respectively.
+	* NEWS: Updated.
+	* 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.
+	* configure.ac: Bump to pre02.
+	* hotspot.map: Update to icedtea-2.6pre03 tag.
+	* patches/boot/break-processbuilder-dependency.patch:
+	Regenerated.
+
 2014-04-18  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:

--- a/Makefile.am	Fri Apr 18 17:11:05 2014 +0100
+++ b/Makefile.am	Wed Apr 23 22:32:19 2014 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
 JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b04
+BUILD_VERSION = b13
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 7224b2d0d330
-JAXP_CHANGESET = 10314bfd5ba4
-JAXWS_CHANGESET = 1569dc36a61c
-JDK_CHANGESET = 9b6aff2241bf
-LANGTOOLS_CHANGESET = 702454ac1a07
-OPENJDK_CHANGESET = 9d6e6533c1e5
+CORBA_CHANGESET = 8293bea019e3
+JAXP_CHANGESET = a0138328f7db
+JAXWS_CHANGESET = ad282d85bae9
+JDK_CHANGESET = 6f22501ca73c
+LANGTOOLS_CHANGESET = 2040d4afc898
+OPENJDK_CHANGESET = 07a06f112424
 
-CORBA_SHA256SUM = 4ddb46ce96184185ed0dd1ebcdad9e7cf50282d84d01af4b9fcbc35c12d7be15
-JAXP_SHA256SUM = 88cd6490d3e9c2f021d9e41d72efb49843137578ac54b1f02d90aec7e0e90ed5
-JAXWS_SHA256SUM = 64427e4708659976d7a24b32560709b3a2ba0981592805f47c04400b0526a3fc
-JDK_SHA256SUM = 590e89d7aeaf6c9845cba0b9e3a9f3d00cfaeb8befcb5548fdde0ce429cfedfc
-LANGTOOLS_SHA256SUM = 632ab633f289720644e4d00de74535362c8635b2cf0c9515a43719a53cdedbd6
-OPENJDK_SHA256SUM = e88e17a0bae48fca22b163224c6cdefc84bf7a574733d08d0e0ce6b70de72b8c
+CORBA_SHA256SUM = b2b5b2afd249f1cc848ef876a143e8a1d33e8b672926ac217e0533761c4d85c3
+JAXP_SHA256SUM = 4be537603478482b22517940ff4677258eceb3f4f859c97ef8e8ed97a11d8337
+JAXWS_SHA256SUM = 398c4498799ad7e9c49eb059a2fd3f34f96a7b7240cc76c192222ba462e21dff
+JDK_SHA256SUM = 59171abadaf0f7332a8a8813b930b603cd25c8fad1a20efb96d092906b1ae9e0
+LANGTOOLS_SHA256SUM = 9d03b8c5b7452c712e7793882c16112db407eec9d36055ffe7f8f3312c3a9e54
+OPENJDK_SHA256SUM = ee7f094dddae85f3a7c9d49616e0b747fec84d402d46b98731a5f9fe66c88250
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -563,8 +563,8 @@
 if ENABLE_SUNEC
 ICEDTEA_ENV += \
 	SYSTEM_NSS="true" \
-	NSS_LIBS="${NSS_LIBS}" \
-	NSS_CFLAGS="${NSS_CFLAGS}" \
+	NSS_LIBS="${SUNEC_LIBS}" \
+	NSS_CFLAGS="${SUNEC_CFLAGS}" \
 	ECC_JUST_SUITE_B="true"
 else
 ICEDTEA_ENV += \

--- a/NEWS	Fri Apr 18 17:11:05 2014 +0100
+++ b/NEWS	Wed Apr 23 22:32:19 2014 +0100
@@ -16,27 +16,78 @@
 
 * OpenJDK
   - S5036554: unmarshal error on CORBA alias type in CORBA any
+  - S6412968: CMS: Long initial mark pauses
   - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
   - S7052170: javadoc -charset option generates wrong meta tag
   - S7076487: (sctp) SCTP API classes does not exist in JDK for Mac
   - S7084032: test/java/net/Inet6Address/B6558853.java fails on Windows XP/2003 if IPv6
   - S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations
+  - S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running
   - S7152892: some jtreg tests fail with permission denied
+  - S7161320: TEST_BUG: java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java fails (Invalid key code)
   - S7169142: CookieHandler does not work with localhost
   - S7176574: sun/security/krb5/auto/TcpTimeout.java failed with solaris-i586
+  - S7186887: Test T6567415.java can fail on a slow machine
+  - S7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
+  - S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx]
+  - S8002148: [TEST_BUG] The four lines printed are not the bold typeface.
+  - S8003253: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java hang intermittently [win]
+  - S8003285: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java fails again [macosx]
+  - S8003895: java/nio/channels/AsynchronousChannelGroup/Unbounded.java failing again [win64]
+  - S8004145: New improved hgforest.sh, ctrl-c now properly terminates mercurial processes.
   - S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled.
+  - S8006628: NEED_TEST for JDK-8002870
+  - S8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
+  - S8007625: race with nested repos in /common/bin/hgforest.sh
+  - S8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
+  - S8011178: improve common/bin/hgforest.sh python detection (MacOS)
+  - S8011194: Apps launched via double-clicked .jars have file.encoding value of US-ASCII on Mac OS X
+  - S8011342: hgforest.sh : 'python --version' not supported on older python
+  - S8011350: hgforest.sh uses non-POSIX sh features that may fail with some shells
+  - S8011944: Sort fails with ArrayIndexOutOfBoundsException
   - S8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS
+  - S8012244: java/net/Socket/asyncClose/Race.java fails intermittently on Windows
+  - S8013611: Modal dialog fails to obtain keyboard focus
+  - S8013945: CMS fatal error: must own lock MemberNameTable_lock
+  - S8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
+  - S8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
+  - S8014555: G1: Memory ordering problem with Conc refinement and card marking
   - S8014460: Need to check for non-empty EXT_LIBS_PATH before using it
   - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE
+  - S8016110: Japanese char (MS932) 0x5C cannot be used as an argument when quoted
+  - S8016328: Regression : Javadoc i18n regression caused by fix for 8012375
+  - S8017456: [TEST_BUG] java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html: test frames remain after test execution
+  - S8017779: java/net/Authenticator/B4769350.java fails
+  - S8019184: MethodHandles.catchException() fails when methods have 8 args + varargs
+  - S8019389: SA-JDI JSR292: sun.jvm.hotspot.jdi.StackFrame.thisObject() throws sun.jvm.hotspot.utilities.AssertionFailure: sanity check
+  - S8019623: Lack of synchronization in AppContext.getAppContext()
   - S8019800: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8017011
+  - S8019990: IM candidate window appears on the South-East corner of the display.
+  - S8020191: System.getProperty("os.name") returns "Windows NT (unknown)" on Windows 8.1
   - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address
+  - S8022531: [TEST_BUG] After double-click on the folder names , there is no 'OK' button in the dialog.
+  - S8022836: JVM crashes in JVMTIENVBASE::GET_CURRENT_CONTENDED_MONITOR and GET_OWNED_MONITOR
+  - S8023004: JSR 292: java.lang.RuntimeException: Original target method was called.
+  - S8023881: IDN.USE_STD3_ASCII_RULES option is too strict to use Unicode in IDN.toASCII
+  - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL)
   - S8023990: Regression: postscript size increase from 6u18
+  - S8024200: handle hg wrapper with space after #!
+  - S8024648: 7141246 & 8016131 break Zero port
   - S8024675: java/net/NetworkInterface/UniqueMacAddressesTest.java fails on Windows
+  - S8025305: Cleanup CardTableModRefBS usage in G1
+  - S8025796: hgforest.sh could trigger unbuffered output from hg without complicated machinations
   - S8027026: Change keytool -genkeypair to use -keyalg RSA
   - S8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently
+  - S8027348: (process) Enhancement of handling async close of ProcessInputStream
+  - S8027359: XML parser returns incorrect parsing results
+  - S8027973: javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java hangs (win)
   - S8028073: race condition in ObjectMonitor implementation causing deadlocks
+  - S8028391: Make the Min/MaxHeapFreeRatio flags manageable
   - S8028616: Htmleditorkit parser doesn't handle leading slash (/)
   - S8028623: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters.
+  - S8029073: (corba) New connection reclaimed when number of connection is greater than highwatermark
+  - S8029281: Synchronization issues in Logger and LogManager
+  - S8030698: Several GUI labels in jconsole need correction
   - S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning
   - S8030822: (tz) Support tzdata2013i
   - S8030878: JConsole issues meaningless message if SSL connection fails
@@ -44,23 +95,50 @@
   - S8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
   - S8031743: C2: loadI2L_immI broken for negative memory values
   - S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file
+  - S8031980: Add new j.u.l deadlock test for JDK-8027670 and JDK-8029281
   - S8032078: [macosx] CPlatformWindow.setWindowState throws RuntimeException, if windowState=ICONIFIED|MAXIMIZED_BOTH
+  - S8032207: C2: assert(VerifyOops || MachNode::size(ra_) <= (3+1)*4) failed: bad fixed size
   - S8032466: serviceability/sa/jmap-hashcode/Test8028623.java fails with compilation errors
   - S8032669: Mouse release not being delivered to Swing component in 7u45
   - S8032740: Need to create SE Embedded Source Bundles in 7 Release
+  - S8032832: Applet/browser deadlocks, when IIS integrated authentication is used
   - S8032872: [macosx] Cannot select from JComboBox in a JWindow
+  - S8032878: Editable combos in table do not behave as expected
+  - S8032909: XSLT string-length returns incorrect length when string includes complementary chars
+  - S8032960: Running forms URL throws NullPointerException in Javaconsole.
+  - S8032986: new hotspot build - hs24.60-b09
+  - S8033294: javac, spurious warning for instanceof operator
+  - S8033443: Test8000311 fails after latest changes to parallelize string and symbol table unlink
+  - S8033487: Improve GC option handling
   - S8033524: Set minor version for hotspot in 7u80 to 80 and build number to b01
   - S8033970: new hotspot build - hs24.80-b02
+  - S8034181: SIGBUS in SctpChannelImpl receive
+  - S8034262: Test java/lang/ProcessBuilder/CloseRace.java fails
   - S8034920: new hotspot build - hs24.80-b03
   - S8035283: Second phase of branch shortening doesn't account for loop alignment
   - S8035435: new hotspot build - hs24.80-b04
+  - S8035618: Four api/org_omg/CORBA TCK tests fail under plugin only
+  - S8035897: Better memory allocation for file descriptors greater than 1024 on macosx
+  - S8035963: The failed Kerberos tests due to timeouts
   - S8035973: NPE in ForwardBuilder
+  - S8035988: 7u60 l10n resource file translation update 1
+  - S8036022: D3D: rendering with XOR composite causes InternalError.
   - S8036584: Review comments from 8035897
   - S8036778: new hotspot build - hs24.80-b05
+  - S8036786: Update jdk7 testlibrary to match jdk8
   - S8036863: Update jdk7 testlibrary to match jdk8 in hotspot
+  - S8037012: (tz) Support tzdata2014a
   - S8037340: Linux semaphores to use CLOCK_REALTIME
+  - S8038481: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
+  - S8038640: new hotspot build - hs24.80-b06
+  - S8038785: hot workaround fix for a crash in C2 compiler at Node::rematerialize
 * Bug fixes
   - PR1737: Support prefixed variants of GNU tools used on *BSD systems
+  - Fix accidental reversion of PR1188 for armel
+  - PR1393: JPEG support in build is broken on non-system-libjpeg builds
+  - PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1
+  - Remove unused hgforest script
+  - Red Hat local: Fix for repo with path statting with / .
 
 New in release 2.5.0 (2014-XX-XX):
 

--- a/acinclude.m4	Fri Apr 18 17:11:05 2014 +0100
+++ b/acinclude.m4	Wed Apr 23 22:32:19 2014 +0100
@@ -2718,15 +2718,15 @@
     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
-      NSS_CFLAGS=$NSS_SOFTOKN_CFLAGS;
-      NSS_LIBS=$NSS_SOFTOKN_LIBS;
+      SUNEC_CFLAGS="$NSS_SOFTOKN_CFLAGS -lfreebl";
+      SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
     elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
-      NSS_CFLAGS=$NSS_JAVA_CFLAGS;
-      NSS_LIBS=$NSS_JAVA_LIBS;
+      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(NSS_CFLAGS)
-    AC_SUBST(NSS_LIBS)
+    AC_SUBST(SUNEC_CFLAGS)
+    AC_SUBST(SUNEC_LIBS)
   fi
 ])

--- a/configure.ac	Fri Apr 18 17:11:05 2014 +0100
+++ b/configure.ac	Wed Apr 23 22:32:19 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6pre01], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6pre02], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 

--- a/hotspot.map	Fri Apr 18 17:11:05 2014 +0100
+++ b/hotspot.map	Wed Apr 23 22:32:19 2014 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 882a93010fb9 6809c27690d51bb08cd3be8ee61ea0a891abe4ef5e44d5c3addbdb11e2734a57
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 138ef7288fd4 ab58d30c191974d5824d120896dcc89aff1f897fe74d9d35bdd4ba6169132127
 aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c

--- a/patches/boot/break-processbuilder-dependency.patch	Fri Apr 18 17:11:05 2014 +0100
+++ b/patches/boot/break-processbuilder-dependency.patch	Wed Apr 23 22:32:19 2014 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2013-12-26 22:11:52.199802211 +0000
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2014-04-23 15:10:18.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2014-04-23 16:15:09.818128046 +0100
 @@ -109,6 +109,32 @@
          });
      }
@@ -53,16 +53,16 @@
              new ProcessPipeInputStream(fds[2]);
  
          processReaperExecutor.execute(new Runnable() {
-@@ -331,7 +357,7 @@
-                 }
-             }
-             return (a == null) ?
--                    ProcessBuilder.NullInputStream.INSTANCE :
-+                    NullInputStream.INSTANCE :
-                     new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
-         }
- 
-@@ -377,7 +403,7 @@
+@@ -332,7 +358,7 @@
+                         byte[] stragglers = drainInputStream(in);
+                         in.close();
+                         this.in = (stragglers == null) ?
+-                            ProcessBuilder.NullInputStream.INSTANCE :
++                            NullInputStream.INSTANCE :
+                             new ByteArrayInputStream(stragglers);
+                     }
+                 } catch (IOException ignored) {}
+@@ -369,7 +395,7 @@
                      // We know of no reason to get an IOException, but if
                      // we do, there's nothing else to do but carry on.
                  }
@@ -72,8 +72,8 @@
          }
      }
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2013-12-26 22:12:18.024196383 +0000
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2014-04-23 15:10:18.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2014-04-23 16:14:45.373740831 +0100
 @@ -98,6 +98,32 @@
          });
      }