Rename back to java-openjdk.

Rename to java-10-openjdk.
Initial import from f28.
2018-06-15 11:09:19 +02:00 · 2018-06-14 12:13:20 +02:00 · 2018-06-14 12:10:44 +02:00 · 2018-06-14 12:06:34 +02:00
27 changed files with 4252 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+*.rpm
+/systemtap-tapset-3.6.0pre02.tar.xz
+/jdk-jdk10-jdk-10+46.tar.xz
+/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
--- a/JDK-8193802-npe-jar-getVersionMap.patch
+++ b/JDK-8193802-npe-jar-getVersionMap.patch
@ -0,0 +1,72 @@
+# HG changeset patch
+# User sherman
+# Date 1525080541 -7200
+#      Mon Apr 30 11:29:01 2018 +0200
+# Node ID c3e284205e149a6d786ff5aa7dca9338cf70ba60
+# Parent  e541eaa797070bafe8c3dc41f4beec8395c78276
+8193802: NullPointerException from JarFileSystem.getVersionMap()
+Reviewed-by: mchung
+
+diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
+--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -109,7 +109,9 @@
+      */
+     private Function<byte[],byte[]> createVersionedLinks(int version) {
+         HashMap<IndexNode,byte[]> aliasMap = new HashMap<>();
+-        getVersionMap(version, getInode(getBytes("/META-INF/versions"))).values()
+        IndexNode verdir = getInode(getBytes("/META-INF/versions"));
+        if (verdir != null) {
+            getVersionMap(version, verdir).values()
+                 .forEach(versionNode -> {   // for each META-INF/versions/{n} directory
+                     // put all the leaf inodes, i.e. entries, into the alias map
+                     // possibly shadowing lower versioned entries
+@@ -124,6 +126,7 @@
+                         }
+                     });
+                 });
+        }
+         return path -> aliasMap.get(IndexNode.keyOf(path));
+     }
+ 
+diff --git a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
+--- a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
+++ b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
+@@ -23,7 +23,7 @@
+ 
+ /*
+  * @test
+- * @bug 8144355 8144062 8176709
+ * @bug 8144355 8144062 8176709 8193802
+  * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
+  * @library /lib/testlibrary/java/util/jar
+  * @build Compiler JarBuilder CreateMultiReleaseTestJars
+@@ -205,6 +205,21 @@
+         //testCustomMultiReleaseValue("true\r\n true", false);
+     }
+ 
+    @Test
+    public void testMultiReleaseJarWithNonVersionDir() throws Exception {
+        String jfname = "multi-release-non-ver.jar";
+        Path jfpath = Paths.get(jfname);
+        URI uri = new URI("jar", jfpath.toUri().toString() , null);
+        JarBuilder jb = new JarBuilder(jfname);
+        jb.addAttribute("Multi-Release", "true");
+        jb.build();
+        Map<String,String> env = Map.of("multi-release", "runtime");
+        try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {
+            Assert.assertTrue(true);
+        }
+        Files.delete(jfpath);
+    }
+
+     private static final AtomicInteger JAR_COUNT = new AtomicInteger(0);
+ 
+     private void testCustomMultiReleaseValue(String value, boolean expected)
--- a/JDK-8200556-aarch64-slowdebug-crash.patch
+++ b/JDK-8200556-aarch64-slowdebug-crash.patch
@ -0,0 +1,14 @@
+diff -r 214a94e9366c src/cpu/aarch64/vm/nativeInst_aarch64.cpp
+--- openjdk/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp	Mon Jul 17 12:11:32 2017 +0000
+++ openjdk/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp	Mon Jul 24 16:23:14 2017 +0100
+@@ -343,7 +343,7 @@
+   CodeBuffer cb(code_pos, instruction_size);
+   MacroAssembler a(&cb);
+ 
+-  a.mov(rscratch1, entry);
+  a.movptr(rscratch1, (uintptr_t)entry);
+   a.br(rscratch1);
+ 
+   ICache::invalidate_range(code_pos, instruction_size);
+
+
--- a/JDK-8201495-s390-java-opts.patch
+++ b/JDK-8201495-s390-java-opts.patch
@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1523874036 -7200
+#      Mon Apr 16 12:20:36 2018 +0200
+# Node ID fc3a72e286e0d5bf9b994d1b778b39f3b080c686
+# Parent  69bae761600bdbc97953500ac51a396d31f54ee9
+8201495: [Zero] Reduce limits of max heap size for boot JDK on s390
+Reviewed-by: ihse, aph, simonis
+
+diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
+--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.m4
+@@ -405,7 +405,7 @@
+   BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
+ 
+   # Maximum amount of heap memory and stack size.
+-  JVM_HEAP_LIMIT_32="1024"
+  JVM_HEAP_LIMIT_32="768"
+   # Running a 64 bit JVM allows for and requires a bigger heap
+   JVM_HEAP_LIMIT_64="1600"
+   STACK_SIZE_32=768
--- a/JDK-8201509-s390-atomic_store.patch
+++ b/JDK-8201509-s390-atomic_store.patch
@ -0,0 +1,18 @@
+diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
+--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
+@@ -50,10 +50,10 @@
+                   : "Q"(*(volatile long*)src));
+ #elif defined(S390) && !defined(_LP64)
+     double tmp;
+-    asm volatile ("ld  %0, 0(%1)\n"
+-                  "std %0, 0(%2)\n"
+-                  : "=r"(tmp)
+-                  : "a"(src), "a"(dst));
+    asm volatile ("ld  %0, %2\n"
+                  "std %0, %1\n"
+                  : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+                  : "Q"(*(volatile double*)src));
+ #else
+     *(jlong *) dst = *(const jlong *) src;
+ #endif
--- a/JDK-8201788-bootcycle-images-jobs.patch
+++ b/JDK-8201788-bootcycle-images-jobs.patch
@ -0,0 +1,27 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1524152606 -7200
+#      Thu Apr 19 17:43:26 2018 +0200
+# Node ID f7a3ca673e9cc831848fc890a2df3ae9acb447e4
+# Parent  dd26184768b0a1c4103a2e9eaa8b4d852a9eca1b
+8201788: Number of make jobs wrong for bootcycle-images target
+Reviewed-by: erikj, ihse
+
+diff --git a/make/Init.gmk b/make/Init.gmk
+--- a/make/Init.gmk
+++ b/make/Init.gmk
+@@ -310,9 +310,13 @@
+           ifneq ($(PARALLEL_TARGETS), )
+ 	    $(call StartGlobalTimer)
+ 	    $(call PrepareSmartJavac)
+            # JOBS will only be empty for a bootcycle-images recursive call
+            # or if specified via a make argument directly. In those cases
+            # treat it as NOT using jobs at all.
+ 	    ( cd $(TOPDIR) && \
+ 	        $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
+-	            -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
+                    $(if $(JOBS), -j $(JOBS)) \
+	            -f make/Main.gmk $(USER_MAKE_VARS) \
+ 	            $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
+ 	        ( exitcode=$$? && \
+ 	        $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
--- a/JDK-8202262-libjsig.so-extra-link-flags.patch
+++ b/JDK-8202262-libjsig.so-extra-link-flags.patch
@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1524663215 -7200
+#      Wed Apr 25 15:33:35 2018 +0200
+# Node ID c000e94e3d789bcb30d18541a3be33856bb3fe17
+# Parent  a29fc1f5b37d344c771f83f528dcd223ad240e6c
+8202262: libjsig.so not linked with extra linker flags from configure
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk
+--- a/make/hotspot/lib/CompileLibjsig.gmk
+++ b/make/hotspot/lib/CompileLibjsig.gmk
+@@ -36,7 +36,7 @@
+   ifeq ($(STATIC_BUILD), false)
+     ifeq ($(OPENJDK_TARGET_OS), linux)
+       LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS)
+-      LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_CFLAGS)
+      LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_LDFLAGS)
+       LIBJSIG_LIBS := $(LIBDL)
+ 
+       # NOTE: The old build compiled this library without -soname.
--- a/README.md
+++ b/README.md
@ -1,3 +1,3 @@
-# java-openjdk
+# JDK 10 branch of java-openjdk

-The java-openjdk package
+This is used by the jdk-10 module.
--- a/RHBZ-1249083-system-crypto-policy-PR3183.patch
+++ b/RHBZ-1249083-system-crypto-policy-PR3183.patch
@ -0,0 +1,88 @@
+
+# HG changeset patch
+# User andrew
+# Date 1478057514 0
+# Node ID 1c4d5cb2096ae55106111da200b0bcad304f650c
+# Parent  3d53f19b48384e5252f4ec8891f7a3a82d77af2a
+PR3183: Support Fedora/RHEL system crypto policy
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/classes/java/security/Security.java
+--- a/src/java.base/share/classes/java/security/Security.java	Wed Oct 26 03:51:39 2016 +0100
+++ b/src/java.base/share/classes/java/security/Security.java	Wed Nov 02 03:31:54 2016 +0000
+@@ -43,6 +43,9 @@
+  * implementation-specific location, which is typically the properties file
+  * {@code conf/security/java.security} in the Java installation directory.
+  *
+ * <p>Additional default values of security properties are read from a
+ * system-specific location, if available.</p>
+ *
+  * @author Benjamin Renaud
+  * @since 1.1
+  */
+@@ -52,6 +55,10 @@
+     private static final Debug sdebug =
+                         Debug.getInstance("properties");
+ 
+    /* System property file*/
+    private static final String SYSTEM_PROPERTIES =
+        "/etc/crypto-policies/back-ends/java.config";
+
+     /* The java.security properties */
+     private static Properties props;
+ 
+@@ -93,6 +100,7 @@
+                 if (sdebug != null) {
+                     sdebug.println("reading security properties file: " +
+                                 propFile);
+                    sdebug.println(props.toString());
+                 }
+             } catch (IOException e) {
+                 if (sdebug != null) {
+@@ -114,6 +122,31 @@
+         }
+ 
+         if ("true".equalsIgnoreCase(props.getProperty
+                ("security.useSystemPropertiesFile"))) {
+
+            // now load the system file, if it exists, so its values
+            // will win if they conflict with the earlier values
+            try (BufferedInputStream bis =
+                 new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
+                props.load(bis);
+                loadedProps = true;
+
+                if (sdebug != null) {
+                    sdebug.println("reading system security properties file " +
+                                   SYSTEM_PROPERTIES);
+                    sdebug.println(props.toString());
+                }
+            } catch (IOException e) {
+                if (sdebug != null) {
+                    sdebug.println
+                        ("unable to load security properties from " +
+                         SYSTEM_PROPERTIES);
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        if ("true".equalsIgnoreCase(props.getProperty
+                 ("security.overridePropertiesFile"))) {
+ 
+             String extraPropFile = System.getProperty
+diff -r 3d53f19b4838 -r 1c4d5cb2096a src/java.base/share/conf/security/java.security
+--- a/src/java.base/share/conf/security/java.security	Wed Oct 26 03:51:39 2016 +0100
+++ b/src/java.base/share/conf/security/java.security	Wed Nov 02 03:31:54 2016 +0000
+@@ -276,6 +276,13 @@
+ security.overridePropertiesFile=true
+ 
+ #
+# Determines whether this properties file will be appended to
+# using the system properties file stored at
+# /etc/crypto-policies/back-ends/java.config
+#
+security.useSystemPropertiesFile=true
+
+#
+ # Determines the default key and trust manager factory algorithms for
+ # the javax.net.ssl package.
+ #
--- a/RHBZ-1565658-system-nss-SunEC.patch
+++ b/RHBZ-1565658-system-nss-SunEC.patch
@ -0,0 +1,654 @@
+diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-options.m4
+--- openjdk/make/autoconf/jdk-options.m4
+++ openjdk/make/autoconf/jdk-options.m4
+@@ -264,9 +264,10 @@
+ #
+ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+ [
+  AC_REQUIRE([LIB_SETUP_MISC_LIBS])
+   AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
+ 
+-  if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+  if test "x${system_nss}" = "xyes" -o -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+     ENABLE_INTREE_EC=true
+     AC_MSG_RESULT([yes])
+   else
+diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
+--- openjdk/make/autoconf/libraries.m4
+++ openjdk/make/autoconf/libraries.m4
+@@ -175,6 +175,48 @@
+   AC_SUBST(LIBDL)
+   LIBS="$save_LIBS"
+ 
+  ###############################################################################
+  #
+  # Check for the NSS libraries
+  #
+
+  AC_MSG_CHECKING([whether to build the Sun EC provider against the system NSS libraries])
+
+  # default is bundled
+  DEFAULT_SYSTEM_NSS=no
+
+  AC_ARG_ENABLE([system-nss], [AS_HELP_STRING([--enable-system-nss],
+     [build the SunEC provider using the system NSS libraries @<:@disabled@:>@])],
+  [
+    case "${enableval}" in
+      yes)
+        system_nss=yes
+        ;;
+      *)
+        system_nss=no
+        ;;
+    esac
+  ],
+  [
+    system_nss=${DEFAULT_SYSTEM_NSS}
+  ])
+  AC_MSG_RESULT([$system_nss])
+
+  if test "x${system_nss}" = "xyes"; then
+      PKG_CHECK_MODULES(NSS_SOFTTKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
+      PKG_CHECK_MODULES(NSS, nss >= 3.16.1, [NSS_FOUND=yes], [NSS_FOUND=no])
+      if test "x${NSS_SOFTOKN_FOUND}" = "xyes" -a "x${NSS_FOUND}" = "xyes"; then
+          NSS_LIBS="$NSS_SOFTOKN_LIBS $NSS_LIBS -lfreebl";
+	  USE_EXTERNAL_NSS=true
+      else
+	  AC_MSG_ERROR([--enable-system-nss specified, but NSS not found.])
+      fi
+  else
+      USE_EXTERNAL_NSS=false
+  fi
+  AC_SUBST(USE_EXTERNAL_NSS)
+
+
+   # Deprecated libraries, keep the flags for backwards compatibility
+   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+     BASIC_DEPRECATED_ARG_WITH([dxsdk])
+diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
+--- openjdk/make/autoconf/spec.gmk.in
+++ openjdk/make/autoconf/spec.gmk.in
+@@ -764,6 +764,10 @@
+ # Libraries
+ #
+ 
+USE_EXTERNAL_NSS:=@USE_EXTERNAL_NSS@
+NSS_LIBS:=@NSS_LIBS@
+NSS_CFLAGS:=@NSS_CFLAGS@
+
+ USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
+ LCMS_CFLAGS:=@LCMS_CFLAGS@
+ LCMS_LIBS:=@LCMS_LIBS@
+diff --git openjdk/make/lib/Lib-jdk.crypto.ec.gmk openjdk/make/lib/Lib-jdk.crypto.ec.gmk
+--- openjdk/make/lib/Lib-jdk.crypto.ec.gmk
+++ openjdk/make/lib/Lib-jdk.crypto.ec.gmk
+@@ -29,9 +29,15 @@
+ 
+ ifeq ($(ENABLE_INTREE_EC), true)
+ 
+-  LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
+   BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
+ 
+  ifeq ($(USE_EXTERNAL_NSS), true)
+    LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+    BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
+  else
+    LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
+  endif
+
+   #
+   # On sol-sparc...all libraries are compiled with -xregs=no%appl
+   # (set in CFLAGS_REQUIRED_sparc)
+@@ -60,7 +66,7 @@
+       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+       LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
+       LIBS := $(LIBCXX), \
+-      LIBS_linux := -lc, \
+      LIBS_linux := -lc $(NSS_LIBS), \
+       LIBS_solaris := -lc, \
+       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
+       RC_FLAGS := $(RC_FLAGS) \
+diff --git openjdk/make/mapfiles/libsunec/mapfile-vers openjdk/make/mapfiles/libsunec/mapfile-vers
+--- openjdk/make/mapfiles/libsunec/mapfile-vers
+++ openjdk/make/mapfiles/libsunec/mapfile-vers
+@@ -31,6 +31,7 @@
+                 Java_sun_security_ec_ECDSASignature_signDigest;
+                 Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+                 Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
+                Java_sun_security_ec_SunEC_initialize;
+         local:
+                 *;
+ };
+diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.base/unix/native/include/jni_md.h
+--- openjdk/src/java.base/unix/native/include/jni_md.h
+++ openjdk/src/java.base/unix/native/include/jni_md.h
+@@ -36,6 +36,11 @@
+   #define JNIEXPORT
+   #define JNIIMPORT
+ #endif
+#if (defined(__GNUC__)) || __has_attribute(unused)
+  #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
+#else
+  #define UNUSED(x) UNUSED_ ## x
+#endif
+ 
+ #define JNICALL
+ 
+diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+--- openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+++ openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+@@ -61,6 +61,7 @@
+             AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                 public Void run() {
+                     System.loadLibrary("sunec"); // check for native library
+                    initialize();
+                     return null;
+                 }
+             });
+@@ -272,4 +273,9 @@
+         putService(new ProviderService(this, "KeyAgreement",
+             "ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
+     }
+
+    /**
+     * Initialize the native code.
+     */
+    private static native void initialize();
+ }
+diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+--- openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+@@ -25,7 +25,11 @@
+ 
+ #include <jni.h>
+ #include "jni_util.h"
+#ifdef SYSTEM_NSS
+#include "ecc_impl.h"
+#else
+ #include "impl/ecc_impl.h"
+#endif
+ 
+ #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
+ #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+@@ -33,6 +37,13 @@
+ #define INVALID_PARAMETER_EXCEPTION \
+         "java/security/InvalidParameterException"
+ #define KEY_EXCEPTION   "java/security/KeyException"
+#define INTERNAL_ERROR "java/lang/InternalError"
+
+#ifdef SYSTEM_NSS
+#define SYSTEM_UNUSED(x) UNUSED(x)
+#else
+#define SYSTEM_UNUSED(x) x
+#endif
+ 
+ extern "C" {
+ 
+@@ -55,8 +66,13 @@
+ /*
+  * Deep free of the ECParams struct
+  */
+-void FreeECParams(ECParams *ecparams, jboolean freeStruct)
+void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
+ {
+#ifdef SYSTEM_NSS
+    // Needs to be freed using the matching method to the one
+    // that allocated it. PR_TRUE means the memory is zeroed.
+    PORT_FreeArena(ecparams->arena, PR_TRUE);
+#else
+     // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
+     // Use B_TRUE to free both
+ 
+@@ -70,6 +86,7 @@
+     SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
+     if (freeStruct)
+         free(ecparams);
+#endif
+ }
+ 
+ jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
+@@ -95,7 +112,7 @@
+  */
+ JNIEXPORT jobjectArray
+ JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
+-  (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
+  (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
+ {
+     ECPrivateKey *privKey = NULL; // contains both public and private values
+     ECParams *ecparams = NULL;
+@@ -127,8 +144,17 @@
+     env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+ 
+     // Generate the new keypair (using the supplied seed)
+#ifdef SYSTEM_NSS
+    if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
+        != SECSuccess) {
+        ThrowException(env, KEY_EXCEPTION);
+        goto cleanup;
+    }
+    if (EC_NewKey(ecparams, &privKey) != SECSuccess) {    
+#else    
+     if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
+         jSeedLength, 0) != SECSuccess) {
+#endif
+         ThrowException(env, KEY_EXCEPTION);
+         goto cleanup;
+     }
+@@ -175,10 +201,15 @@
+         }
+         if (privKey) {
+             FreeECParams(&privKey->ecParams, false);
+#ifndef SYSTEM_NSS
+	    // The entire ECPrivateKey is allocated in the arena
+	    // when using system NSS, so only the in-tree version
+	    // needs to clear these manually.
+             SECITEM_FreeItem(&privKey->version, B_FALSE);
+             SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
+             SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
+             free(privKey);
+#endif
+         }
+ 
+         if (pSeedBuffer) {
+@@ -196,7 +227,7 @@
+  */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDSASignature_signDigest
+-  (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
+  (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
+ {
+     jbyte* pDigestBuffer = NULL;
+     jint jDigestLength = env->GetArrayLength(digest);
+@@ -255,8 +286,18 @@
+     env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+ 
+     // Sign the digest (using the supplied seed)
+#ifdef SYSTEM_NSS
+    if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
+        != SECSuccess) {
+        ThrowException(env, KEY_EXCEPTION);
+        goto cleanup;
+    }
+    if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
+        != SECSuccess) {    
+#else    
+     if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
+         (unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
+#endif
+         ThrowException(env, KEY_EXCEPTION);
+         goto cleanup;
+     }
+@@ -305,7 +346,7 @@
+  */
+ JNIEXPORT jboolean
+ JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
+-  (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+  (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+     jboolean isValid = false;
+ 
+@@ -362,9 +403,10 @@
+ 
+ cleanup:
+     {
+-        if (params_item.data)
+        if (params_item.data) {
+             env->ReleaseByteArrayElements(encodedParams,
+                 (jbyte *) params_item.data, JNI_ABORT);
+	}
+ 
+         if (pubKey.publicValue.data)
+             env->ReleaseByteArrayElements(publicKey,
+@@ -390,7 +432,7 @@
+  */
+ JNIEXPORT jbyteArray
+ JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
+-  (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+  (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+ {
+     jbyteArray jSecret = NULL;
+     ECParams *ecparams = NULL;
+@@ -466,9 +508,10 @@
+             env->ReleaseByteArrayElements(publicKey,
+                 (jbyte *) publicValue_item.data, JNI_ABORT);
+ 
+-        if (params_item.data)
+        if (params_item.data) {
+             env->ReleaseByteArrayElements(encodedParams,
+                 (jbyte *) params_item.data, JNI_ABORT);
+	}
+ 
+         if (ecparams)
+             FreeECParams(ecparams, true);
+@@ -477,4 +520,28 @@
+     return jSecret;
+ }
+ 
+JNIEXPORT void
+JNICALL Java_sun_security_ec_SunEC_initialize
+  (JNIEnv *env, jclass UNUSED(clazz))
+{
+#ifdef SYSTEM_NSS
+    if (SECOID_Init() != SECSuccess) {
+        ThrowException(env, INTERNAL_ERROR);
+    }
+    if (RNG_RNGInit() != SECSuccess) {
+        ThrowException(env, INTERNAL_ERROR);
+    }
+#endif
+}
+
+JNIEXPORT void
+JNICALL JNI_OnUnload
+  (JavaVM *vm, void *reserved)
+{
+#ifdef SYSTEM_NSS
+    RNG_RNGShutdown();
+    SECOID_Shutdown();
+#endif
+}
+
+ } /* extern "C" */
+diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
+new file mode 100644
+--- /dev/null
+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
+@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* *********************************************************************
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Last Modified Date from the Original Code: May 2017
+ *********************************************************************** */
+
+#ifndef _ECC_IMPL_H
+#define _ECC_IMPL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+#ifdef SYSTEM_NSS
+#include <secitem.h>
+#include <secerr.h>
+#include <keythi.h>
+#ifdef LEGACY_NSS
+#include <softoken.h>
+#else
+#include <blapi.h>
+#endif
+#else
+#include "ecl-exp.h"
+#endif
+
+/*
+ * Multi-platform definitions
+ */
+#ifdef __linux__
+#define B_FALSE FALSE
+#define B_TRUE TRUE
+typedef unsigned char uint8_t;
+typedef unsigned long ulong_t;
+typedef enum { B_FALSE, B_TRUE } boolean_t;
+#endif /* __linux__ */
+
+#ifdef _ALLBSD_SOURCE
+#include <stdint.h>
+#define B_FALSE FALSE
+#define B_TRUE TRUE
+typedef unsigned long ulong_t;
+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+#endif /* _ALLBSD_SOURCE */
+
+#ifdef AIX
+#define B_FALSE FALSE
+#define B_TRUE TRUE
+typedef unsigned char uint8_t;
+typedef unsigned long ulong_t;
+#endif /* AIX */
+
+#ifdef _WIN32
+typedef unsigned char uint8_t;
+typedef unsigned long ulong_t;
+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+#define strdup _strdup          /* Replace POSIX name with ISO C++ name */
+#endif /* _WIN32 */
+
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif  /* _KERNEL */
+
+#define EC_MAX_DIGEST_LEN 1024  /* max digest that can be signed */
+#define EC_MAX_POINT_LEN 145    /* max len of DER encoded Q */
+#define EC_MAX_VALUE_LEN 72     /* max len of ANSI X9.62 private value d */
+#define EC_MAX_SIG_LEN 144      /* max signature len for supported curves */
+#define EC_MIN_KEY_LEN  112     /* min key length in bits */
+#define EC_MAX_KEY_LEN  571     /* max key length in bits */
+#define EC_MAX_OID_LEN 10       /* max length of OID buffer */
+
+/*
+ * Various structures and definitions from NSS are here.
+ */
+
+#ifndef SYSTEM_NSS
+#ifdef _KERNEL
+#define PORT_ArenaAlloc(a, n, f)        kmem_alloc((n), (f))
+#define PORT_ArenaZAlloc(a, n, f)       kmem_zalloc((n), (f))
+#define PORT_ArenaGrow(a, b, c, d)      NULL
+#define PORT_ZAlloc(n, f)               kmem_zalloc((n), (f))
+#define PORT_Alloc(n, f)                kmem_alloc((n), (f))
+#else
+#define PORT_ArenaAlloc(a, n, f)        malloc((n))
+#define PORT_ArenaZAlloc(a, n, f)       calloc(1, (n))
+#define PORT_ArenaGrow(a, b, c, d)      NULL
+#define PORT_ZAlloc(n, f)               calloc(1, (n))
+#define PORT_Alloc(n, f)                malloc((n))
+#endif
+
+#define PORT_NewArena(b)                (char *)12345
+#define PORT_ArenaMark(a)               NULL
+#define PORT_ArenaUnmark(a, b)
+#define PORT_ArenaRelease(a, m)
+#define PORT_FreeArena(a, b)
+#define PORT_Strlen(s)                  strlen((s))
+#define PORT_SetError(e)
+
+#define PRBool                          boolean_t
+#define PR_TRUE                         B_TRUE
+#define PR_FALSE                        B_FALSE
+
+#ifdef _KERNEL
+#define PORT_Assert                     ASSERT
+#define PORT_Memcpy(t, f, l)            bcopy((f), (t), (l))
+#else
+#define PORT_Assert                     assert
+#define PORT_Memcpy(t, f, l)            memcpy((t), (f), (l))
+#endif
+
+#endif
+
+#define CHECK_OK(func) if (func == NULL) goto cleanup
+#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
+
+#ifndef SYSTEM_NSS
+typedef enum {
+        siBuffer = 0,
+        siClearDataBuffer = 1,
+        siCipherDataBuffer = 2,
+        siDERCertBuffer = 3,
+        siEncodedCertBuffer = 4,
+        siDERNameBuffer = 5,
+        siEncodedNameBuffer = 6,
+        siAsciiNameString = 7,
+        siAsciiString = 8,
+        siDEROID = 9,
+        siUnsignedInteger = 10,
+        siUTCTime = 11,
+        siGeneralizedTime = 12
+} SECItemType;
+
+typedef struct SECItemStr SECItem;
+
+struct SECItemStr {
+        SECItemType type;
+        unsigned char *data;
+        unsigned int len;
+};
+
+typedef SECItem SECKEYECParams;
+
+typedef enum { ec_params_explicit,
+               ec_params_named
+} ECParamsType;
+
+typedef enum { ec_field_GFp = 1,
+               ec_field_GF2m
+} ECFieldType;
+
+struct ECFieldIDStr {
+    int         size;   /* field size in bits */
+    ECFieldType type;
+    union {
+        SECItem  prime; /* prime p for (GFp) */
+        SECItem  poly;  /* irreducible binary polynomial for (GF2m) */
+    } u;
+    int         k1;     /* first coefficient of pentanomial or
+                         * the only coefficient of trinomial
+                         */
+    int         k2;     /* two remaining coefficients of pentanomial */
+    int         k3;
+};
+typedef struct ECFieldIDStr ECFieldID;
+
+struct ECCurveStr {
+        SECItem a;      /* contains octet stream encoding of
+                         * field element (X9.62 section 4.3.3)
+                         */
+        SECItem b;
+        SECItem seed;
+};
+typedef struct ECCurveStr ECCurve;
+
+typedef void PRArenaPool;
+
+struct ECParamsStr {
+    PRArenaPool * arena;
+    ECParamsType  type;
+    ECFieldID     fieldID;
+    ECCurve       curve;
+    SECItem       base;
+    SECItem       order;
+    int           cofactor;
+    SECItem       DEREncoding;
+    ECCurveName   name;
+    SECItem       curveOID;
+};
+typedef struct ECParamsStr ECParams;
+
+struct ECPublicKeyStr {
+    ECParams ecParams;
+    SECItem publicValue;   /* elliptic curve point encoded as
+                            * octet stream.
+                            */
+};
+typedef struct ECPublicKeyStr ECPublicKey;
+
+struct ECPrivateKeyStr {
+    ECParams ecParams;
+    SECItem publicValue;   /* encoded ec point */
+    SECItem privateValue;  /* private big integer */
+    SECItem version;       /* As per SEC 1, Appendix C, Section C.4 */
+};
+typedef struct ECPrivateKeyStr ECPrivateKey;
+
+typedef enum _SECStatus {
+        SECBufferTooSmall = -3,
+        SECWouldBlock = -2,
+        SECFailure = -1,
+        SECSuccess = 0
+} SECStatus;
+#endif
+
+#ifdef _KERNEL
+#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
+#else
+/*
+ This function is no longer required because the random bytes are now
+ supplied by the caller. Force a failure.
+*/
+#ifndef SYSTEM_NSS
+#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+#endif
+#endif
+#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+#define MP_TO_SEC_ERROR(err)
+
+#define SECITEM_TO_MPINT(it, mp)                                        \
+        CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
+
+extern int ecc_knzero_random_generator(uint8_t *, size_t);
+extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
+
+#ifdef SYSTEM_NSS
+#define EC_DecodeParams(a,b,c) EC_DecodeParams(a,b)
+#define ECDSA_VerifyDigest(a,b,c,d) ECDSA_VerifyDigest(a,b,c)
+#define ECDH_Derive(a,b,c,d,e,f) ECDH_Derive(a,b,c,d,e)
+#else
+extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
+
+extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
+extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
+    int);
+extern void SECITEM_FreeItem(SECItem *, boolean_t);
+
+/* This function has been modified to accept an array of random bytes */
+extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
+    const unsigned char* random, int randomlen, int);
+/* This function has been modified to accept an array of random bytes */
+extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
+    const unsigned char* random, int randomlen, int, int timing);
+extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
+    const SECItem *, int);
+extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
+    SECItem *, int);
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* _ECC_IMPL_H */ 
--- a/TestCryptoLevel.java
+++ b/TestCryptoLevel.java
@ -0,0 +1,72 @@
+/* TestCryptoLevel -- Ensure unlimited crypto policy is in use.
+   Copyright (C) 2012 Red Hat, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+
+import java.security.Permission;
+import java.security.PermissionCollection;
+
+public class TestCryptoLevel
+{
+  public static void main(String[] args)
+    throws NoSuchFieldException, ClassNotFoundException,
+           IllegalAccessException, InvocationTargetException
+  {
+    Class<?> cls = null;
+    Method def = null, exempt = null;
+
+    try
+      {
+        cls = Class.forName("javax.crypto.JceSecurity");
+      }
+    catch (ClassNotFoundException ex)
+      {
+        System.err.println("Running a non-Sun JDK.");
+        System.exit(0);
+      }
+    try
+      {
+        def = cls.getDeclaredMethod("getDefaultPolicy");
+        exempt = cls.getDeclaredMethod("getExemptPolicy");
+      }
+    catch (NoSuchMethodException ex)
+      {
+        System.err.println("Running IcedTea with the original crypto patch.");
+        System.exit(0);
+      }
+    def.setAccessible(true);
+    exempt.setAccessible(true);
+    PermissionCollection defPerms = (PermissionCollection) def.invoke(null);
+    PermissionCollection exemptPerms = (PermissionCollection) exempt.invoke(null);
+    Class<?> apCls = Class.forName("javax.crypto.CryptoAllPermission");
+    Field apField = apCls.getDeclaredField("INSTANCE");
+    apField.setAccessible(true);
+    Permission allPerms = (Permission) apField.get(null);
+    if (defPerms.implies(allPerms) && (exemptPerms == null || exemptPerms.implies(allPerms)))
+      {
+        System.err.println("Running with the unlimited policy.");
+        System.exit(0);
+      }
+    else
+      {
+        System.err.println("WARNING: Running with a restricted crypto policy.");
+        System.exit(-1);
+      }
+  }
+}
--- a/TestECDSA.java
+++ b/TestECDSA.java
@ -0,0 +1,49 @@
+/* TestECDSA -- Ensure ECDSA signatures are working.
+   Copyright (C) 2016 Red Hat, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.Signature;
+
+/**
+ * @test
+ */
+public class TestECDSA {
+
+    public static void main(String[] args) throws Exception {
+        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC");
+        KeyPair key = keyGen.generateKeyPair();
+        
+        byte[] data = "This is a string to sign".getBytes("UTF-8");
+        
+        Signature dsa = Signature.getInstance("NONEwithECDSA");
+        dsa.initSign(key.getPrivate());
+        dsa.update(data);
+        byte[] sig = dsa.sign();
+        System.out.println("Signature: " + new BigInteger(1, sig).toString(16));
+        
+        Signature dsaCheck = Signature.getInstance("NONEwithECDSA");
+        dsaCheck.initVerify(key.getPublic());
+        dsaCheck.update(data);
+        boolean success = dsaCheck.verify(sig);
+        if (!success) {
+            throw new RuntimeException("Test failed. Signature verification error");
+        }
+        System.out.println("Test passed.");
+    }
+}
--- a/accessible-toolkit.patch
+++ b/accessible-toolkit.patch
@ -0,0 +1,18 @@
+diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+--- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+@@ -883,9 +883,13 @@
+                     return null;
+                 }
+             });
+             if (!GraphicsEnvironment.isHeadless()) {
+-                loadAssistiveTechnologies();
+                try {
+                    loadAssistiveTechnologies();
+                } catch (AWTError error) {
+                    // ignore silently
+                }
+             }
+         }
+         return toolkit;
+     }
--- a/enableCommentedOutSystemNss.patch
+++ b/enableCommentedOutSystemNss.patch
@ -0,0 +1,11 @@
+diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
+--- openjdk/src/java.base/share/conf/security/java.security	Tue May 16 13:29:05 2017 -0700
+++ openjdk/src/java.base/share/conf/security/java.security	Tue Jun 06 14:05:12 2017 +0200
+@@ -83,6 +83,7 @@
+ #ifndef solaris
+ security.provider.tbd=SunPKCS11
+ #endif
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
+ 
+ #
+ # A list of preferred providers for specific algorithms. These providers will
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@ -0,0 +1,131 @@
+#!/bin/bash
+# Generates the 'source tarball' for JDK 8 projects.
+#
+# Example:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo
+# if your local repo follows upstream forests conventions, you may be enough by setting OPENJDK_URL
+# if you wont to use local copy of patch PR2126 set path to it to PR2126 variable
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk9
+# REPO_NAME=jdk9
+# VERSION=inDevelopment (but keyword tip will still do its job)
+# 
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+
+# This script creates a single source tarball out of the repository
+# based on the given tag and removes code not allowed in fedora/rhel. For
+# consistency, the source tarball will always contain 'openjdk' as the top
+# level folder, name is created, based on parameter
+#
+
+if [ ! "x$PR2126" = "x" ] ; then
+  if [ ! -f "$PR2126" ] ; then
+    echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+    exit 1
+  fi
+fi
+set -e
+
+OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
+COMPRESSION_DEFAULT=xz
+
+if [ "x$1" = "xhelp" ] ; then
+    echo -e "Behaviour may be specified by setting the following variables:\n"
+    echo "VERSION - the version of the specified OpenJDK project"
+    echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
+    echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
+    echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
+    echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
+    echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
+    echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
+    echo "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)"
+    echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
+    exit 1;
+fi
+
+
+if [ "x$VERSION" = "x" ] ; then
+    echo "No VERSION specified"
+    exit -2
+fi
+echo "Version: ${VERSION}"
+    
+# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
+if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
+  if [ "x$PROJECT_NAME" = "x" ] ; then
+    echo "No PROJECT_NAME specified"
+    exit -1
+  fi
+  echo "Project name: ${PROJECT_NAME}"
+  if [ "x$REPO_NAME" = "x" ] ; then
+    echo "No REPO_NAME specified"
+    exit -3
+  fi
+  echo "Repository name: ${REPO_NAME}"
+fi
+
+if [ "x$OPENJDK_URL" = "x" ] ; then
+    OPENJDK_URL=${OPENJDK_URL_DEFAULT}
+    echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
+else
+    echo "OpenJDK URL: ${OPENJDK_URL}"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+    # rhel 5 needs tar.gz
+    COMPRESSION=${COMPRESSION_DEFAULT}
+fi
+echo "Creating a tar.${COMPRESSION} archive"
+
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+    FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+    echo "No file name root specified; default to ${FILE_NAME_ROOT}"
+fi
+if [ "x$REPO_ROOT" = "x" ] ; then
+    REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
+    echo "No repository root specified; default to ${REPO_ROOT}"
+fi;
+
+if [ -d ${FILE_NAME_ROOT} ] ; then
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "${FILE_NAME_ROOT} exists, reusing !!!!!!!"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+else
+  mkdir "${FILE_NAME_ROOT}"
+  pushd "${FILE_NAME_ROOT}"
+    echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+    hg clone ${REPO_ROOT} openjdk -r ${VERSION}
+  popd
+fi
+pushd "${FILE_NAME_ROOT}"
+  pushd openjdk
+    if [ -d src ]; then 
+      echo "Removing EC source code we don't build"
+      CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
+      rm -vrf $CRYPTO_PATH
+      echo "Syncing EC list with NSS"
+      if [ "x$PR2126" = "x" ] ; then
+        # orriginally for 8:
+        # get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
+        # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
+        # there is currnetly no "upstram version of this patch, hardcoding custom version
+        PR2126="../../pr2126-10.patch"
+      fi;
+      echo "Applying ${PR2126}"
+      patch -Np1 < $PR2126
+    fi
+    find . -name '*.orig' -exec rm -vf '{}' ';'
+  popd
+
+  echo "Compressing remaining forest"
+  if [ "X$COMPRESSION" = "Xxz" ] ; then
+    tar --exclude-vcs -cJf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+  else
+    tar --exclude-vcs -czf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+  fi
+  mv ${FILE_NAME_ROOT}.tar.${COMPRESSION}  ..
+popd
+echo "Done. You may want to remove the uncompressed version."
+
+
--- a/generate_tarballs.sh
+++ b/generate_tarballs.sh
@ -0,0 +1,25 @@
+#!/bin/bash
+
+VERSION=3506c375241e
+ICEDTEA_URL=http://icedtea.classpath.org/hg/icedtea7/
+
+wget -O icedtea7.tar.gz ${ICEDTEA_URL}/archive/${VERSION}.tar.gz
+tar xzf icedtea7.tar.gz
+rm -f icedtea7.tar.gz
+pushd icedtea7-${VERSION}
+
+# desktop files
+#mv jconsole.desktop ../jconsole.desktop.in
+#mv policytool.desktop ../policytool.desktop.in
+# Icons were generally cloned fromicedtea, but now are mucvh more specific
+
+# tapsets
+mv tapset/hotspot{,-1.8.0}.stp.in || exit 1
+mv tapset/hotspot_gc{,-1.8.0}.stp.in || exit 1
+mv tapset/hotspot_jni{,-1.8.0}.stp.in || exit 1
+mv tapset/jstack{,-1.8.0}.stp.in || exit 1
+tar cvzf systemtap-tapset.tar.gz tapset
+mv systemtap-tapset.tar.gz ../
+
+popd
+rm -rf icedtea7-${VERSION}
--- a/java-atk-wrapper-security.patch
+++ b/java-atk-wrapper-security.patch
@ -0,0 +1,20 @@
+--- openjdk/src/java.base/share/conf/security/java.security
+++ openjdk/src/java.base/share/conf/security/java.security
+@@ -304,6 +304,8 @@
+ #
+ package.access=sun.misc.,\
+                sun.reflect.,\
+               org.GNOME.Accessibility.,\
+               org.GNOME.Bonobo.,\
+ 
+ #
+ # List of comma-separated packages that start with or equal this string
+@@ -316,6 +318,8 @@
+ #
+ package.definition=sun.misc.,\
+                    sun.reflect.,\
+                   org.GNOME.Accessibility.,\
+                   org.GNOME.Bonobo.,\
+ 
+ #
+ # Determines whether this properties file can be appended to
--- a/java-openjdk-s390-size_t.patch
+++ b/java-openjdk-s390-size_t.patch
@ -0,0 +1,134 @@
+diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
+--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
+@@ -405,7 +405,7 @@
+   add_heap(heap);
+ 
+   // Reserve Space
+-  size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
+  size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
+   size_initial = align_up(size_initial, os::vm_page_size());
+   if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
+     vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
+diff --git a/src/hotspot/share/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp
+--- a/src/hotspot/share/gc/cms/parNewGeneration.cpp
+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp
+@@ -200,7 +200,7 @@
+   const size_t num_overflow_elems = of_stack->size();
+   const size_t space_available = queue->max_elems() - queue->size();
+   const size_t num_take_elems = MIN3(space_available / 4,
+-                                     ParGCDesiredObjsFromOverflowList,
+                                     (size_t)ParGCDesiredObjsFromOverflowList,
+                                      num_overflow_elems);
+   // Transfer the most recent num_take_elems from the overflow
+   // stack to our work queue.
+diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+@@ -2296,7 +2296,7 @@
+   // of things to do) or totally (at the very end).
+   size_t target_size;
+   if (partially) {
+-    target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
+    target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
+   } else {
+     target_size = 0;
+   }
+diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+@@ -31,7 +31,7 @@
+ }
+ 
+ size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
+-  size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
+  size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
+ 
+   if (remaining > ObjArrayMarkingStride) {
+     push_array_slice(start_from + ObjArrayMarkingStride);
+diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+@@ -100,7 +100,7 @@
+   return reserved_size() - committed_size();
+ }
+ 
+-size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
+uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
+   return (addr - _low_boundary) / _page_size;
+ }
+ 
+diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+@@ -115,7 +115,7 @@
+   const size_t beg_index = size_t(index);
+   assert(beg_index < len || len == 0, "index too large");
+ 
+-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
+   const size_t end_index = beg_index + stride;
+   T* const base = (T*)obj->base();
+   T* const beg = base + beg_index;
+diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+@@ -905,8 +905,8 @@
+ void PSParallelCompact::initialize_dead_wood_limiter()
+ {
+   const size_t max = 100;
+-  _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
+-  _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
+  _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
+  _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
+   _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
+   DEBUG_ONLY(_dwl_initialized = true;)
+   _dwl_adjustment = normal_distribution(1.0);
+diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
+--- a/src/hotspot/share/gc/shared/plab.cpp
+++ b/src/hotspot/share/gc/shared/plab.cpp
+@@ -32,7 +32,7 @@
+ 
+ size_t PLAB::min_size() {
+   // Make sure that we return something that is larger than AlignmentReserve
+-  return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
+  return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
+ }
+ 
+ size_t PLAB::max_size() {
+diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
+--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
+@@ -1096,7 +1096,7 @@
+ WB_END
+ 
+ WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
+-  uintx result;
+  size_t result;
+   if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
+     ThreadToNativeFromVM ttnfv(thread);   // can't be in VM when we call JNI
+     return longBox(thread, env, result);
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -1586,7 +1586,7 @@
+   // Increase the code cache size - tiered compiles a lot more.
+   if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
+     FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
+-                  MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
+                  MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5)));
+   }
+   // Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
+   if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
+diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
+--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
+@@ -328,7 +328,7 @@
+   // Value of the conservative maximum heap alignment needed
+   static size_t  _conservative_max_heap_alignment;
+ 
+-  static uintx  _min_heap_size;
+  static size_t  _min_heap_size;
+ 
+   // -Xrun arguments
+   static AgentLibraryList _libraryList;
--- a/java-openjdk.spec
+++ b/java-openjdk.spec
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@
+Comment=Monitor and manage OpenJDK @JAVA_MAJOR_VERSION@ applications for @ARCH@
+Exec=@JAVA_HOME@/jconsole
+Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
+Terminal=false
+Type=Application
+StartupWMClass=sun-tools-jconsole-JConsole
+Categories=Development;Profiling;Java;
+Version=1.0
--- a/libjpeg-turbo-1.4-compat.patch
+++ b/libjpeg-turbo-1.4-compat.patch
@ -0,0 +1,19 @@
+Remove uses of FAR in jpeg code
+
+Upstream libjpeg-trubo removed the (empty) FAR macro:
+http://sourceforge.net/p/libjpeg-turbo/code/1312/
+
+Adjust our code to not use the undefined FAR macro anymore.
+
+diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+--- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+@@ -1385,7 +1385,7 @@
+     /* and fill it in */
+     dst_ptr = icc_data;
+     for (seq_no = first; seq_no < last; seq_no++) {
+-        JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
+        JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
+         unsigned int length =
+             icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
+ 
--- a/nss.cfg.in
+++ b/nss.cfg.in
@ -0,0 +1,5 @@
+name = NSS
+nssLibraryDirectory = @NSS_LIBDIR@
+nssDbMode = noDb
+attributes = compatibility
+handleStartupErrors = ignoreMultipleInitialisation
--- a/pr2126-10.patch
+++ b/pr2126-10.patch
@ -0,0 +1,675 @@
+diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+--- openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+++ openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+@@ -34,57 +34,6 @@
+     //
+     // See sun.security.util.CurveDB for the OIDs
+ 
+-    // NIST K-163
+-    SECT163_K1(1, NAMED_GROUP_ECDHE, "sect163k1", "1.3.132.0.1", true),
+-
+-    SECT163_R1(2, NAMED_GROUP_ECDHE, "sect163r1", "1.3.132.0.2", false),
+-
+-    // NIST B-163
+-    SECT163_R2(3, NAMED_GROUP_ECDHE, "sect163r2", "1.3.132.0.15", true),
+-
+-    SECT193_R1(4, NAMED_GROUP_ECDHE, "sect193r1", "1.3.132.0.24", false),
+-    SECT193_R2(5, NAMED_GROUP_ECDHE, "sect193r2", "1.3.132.0.25", false),
+-
+-    // NIST K-233
+-    SECT233_K1(6, NAMED_GROUP_ECDHE, "sect233k1", "1.3.132.0.26", true),
+-
+-    // NIST B-233
+-    SECT233_R1(7, NAMED_GROUP_ECDHE, "sect233r1", "1.3.132.0.27", true),
+-
+-    SECT239_K1(8, NAMED_GROUP_ECDHE, "sect239k1", "1.3.132.0.3", false),
+-
+-    // NIST K-283
+-    SECT283_K1(9, NAMED_GROUP_ECDHE, "sect283k1", "1.3.132.0.16", true),
+-
+-    // NIST B-283
+-    SECT283_R1(10, NAMED_GROUP_ECDHE, "sect283r1", "1.3.132.0.17", true),
+-
+-    // NIST K-409
+-    SECT409_K1(11, NAMED_GROUP_ECDHE, "sect409k1", "1.3.132.0.36", true),
+-
+-    // NIST B-409
+-    SECT409_R1(12, NAMED_GROUP_ECDHE, "sect409r1", "1.3.132.0.37", true),
+-
+-    // NIST K-571
+-    SECT571_K1(13, NAMED_GROUP_ECDHE, "sect571k1", "1.3.132.0.38", true),
+-
+-    // NIST B-571
+-    SECT571_R1(14, NAMED_GROUP_ECDHE, "sect571r1", "1.3.132.0.39", true),
+-
+-    SECP160_K1(15, NAMED_GROUP_ECDHE, "secp160k1", "1.3.132.0.9", false),
+-    SECP160_R1(16, NAMED_GROUP_ECDHE, "secp160r1", "1.3.132.0.8", false),
+-    SECP160_R2(17, NAMED_GROUP_ECDHE, "secp160r2", "1.3.132.0.30", false),
+-    SECP192_K1(18, NAMED_GROUP_ECDHE, "secp192k1", "1.3.132.0.31", false),
+-
+-    // NIST P-192
+-    SECP192_R1(19, NAMED_GROUP_ECDHE, "secp192r1", "1.2.840.10045.3.1.1", true),
+-
+-    SECP224_K1(20, NAMED_GROUP_ECDHE, "secp224k1", "1.3.132.0.32", false),
+-    // NIST P-224
+-    SECP224_R1(21, NAMED_GROUP_ECDHE, "secp224r1", "1.3.132.0.33", true),
+-
+-    SECP256_K1(22, NAMED_GROUP_ECDHE, "secp256k1", "1.3.132.0.10", false),
+-
+     // NIST P-256
+     SECP256_R1(23, NAMED_GROUP_ECDHE, "secp256r1", "1.2.840.10045.3.1.7", true),
+ 
+diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+--- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+@@ -116,12 +116,6 @@
+                     NamedGroup.SECP256_R1,
+                     NamedGroup.SECP384_R1,
+                     NamedGroup.SECP521_R1,
+-                    NamedGroup.SECT283_K1,
+-                    NamedGroup.SECT283_R1,
+-                    NamedGroup.SECT409_K1,
+-                    NamedGroup.SECT409_R1,
+-                    NamedGroup.SECT571_K1,
+-                    NamedGroup.SECT571_R1,
+ 
+                     // FFDHE 2048
+                     NamedGroup.FFDHE_2048,
+@@ -136,15 +130,6 @@
+                     NamedGroup.SECP256_R1,
+                     NamedGroup.SECP384_R1,
+                     NamedGroup.SECP521_R1,
+-                    NamedGroup.SECT283_K1,
+-                    NamedGroup.SECT283_R1,
+-                    NamedGroup.SECT409_K1,
+-                    NamedGroup.SECT409_R1,
+-                    NamedGroup.SECT571_K1,
+-                    NamedGroup.SECT571_R1,
+-
+-                    // non-NIST curves
+-                    NamedGroup.SECP256_K1,
+ 
+                     // FFDHE 2048
+                     NamedGroup.FFDHE_2048,
+diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
+--- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+@@ -168,114 +168,6 @@
+         Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
+ 
+         /* SEC2 prime curves */
+-        add("secp112r1", "1.3.132.0.6", P,
+-            "DB7C2ABF62E35E668076BEAD208B",
+-            "DB7C2ABF62E35E668076BEAD2088",
+-            "659EF8BA043916EEDE8911702B22",
+-            "09487239995A5EE76B55F9C2F098",
+-            "A89CE5AF8724C0A23E0E0FF77500",
+-            "DB7C2ABF62E35E7628DFAC6561C5",
+-            1, nameSplitPattern);
+-
+-        add("secp112r2", "1.3.132.0.7", P,
+-            "DB7C2ABF62E35E668076BEAD208B",
+-            "6127C24C05F38A0AAAF65C0EF02C",
+-            "51DEF1815DB5ED74FCC34C85D709",
+-            "4BA30AB5E892B4E1649DD0928643",
+-            "adcd46f5882e3747def36e956e97",
+-            "36DF0AAFD8B8D7597CA10520D04B",
+-            4, nameSplitPattern);
+-
+-        add("secp128r1", "1.3.132.0.28", P,
+-            "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+-            "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+-            "E87579C11079F43DD824993C2CEE5ED3",
+-            "161FF7528B899B2D0C28607CA52C5B86",
+-            "CF5AC8395BAFEB13C02DA292DDED7A83",
+-            "FFFFFFFE0000000075A30D1B9038A115",
+-            1, nameSplitPattern);
+-
+-        add("secp128r2", "1.3.132.0.29", P,
+-            "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+-            "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+-            "5EEEFCA380D02919DC2C6558BB6D8A5D",
+-            "7B6AA5D85E572983E6FB32A7CDEBC140",
+-            "27B6916A894D3AEE7106FE805FC34B44",
+-            "3FFFFFFF7FFFFFFFBE0024720613B5A3",
+-            4, nameSplitPattern);
+-
+-        add("secp160k1", "1.3.132.0.9", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+-            "0000000000000000000000000000000000000000",
+-            "0000000000000000000000000000000000000007",
+-            "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+-            "938CF935318FDCED6BC28286531733C3F03C4FEE",
+-            "0100000000000000000001B8FA16DFAB9ACA16B6B3",
+-            1, nameSplitPattern);
+-
+-        add("secp160r1", "1.3.132.0.8", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+-            "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+-            "4A96B5688EF573284664698968C38BB913CBFC82",
+-            "23A628553168947D59DCC912042351377AC5FB32",
+-            "0100000000000000000001F4C8F927AED3CA752257",
+-            1, nameSplitPattern);
+-
+-        add("secp160r2", "1.3.132.0.30", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+-            "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+-            "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+-            "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
+-            "0100000000000000000000351EE786A818F3A1A16B",
+-            1, nameSplitPattern);
+-
+-        add("secp192k1", "1.3.132.0.31", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+-            "000000000000000000000000000000000000000000000000",
+-            "000000000000000000000000000000000000000000000003",
+-            "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+-            "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
+-            "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
+-            1, nameSplitPattern);
+-
+-        add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+-            "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+-            "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+-            "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
+-            "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
+-            1, nameSplitPattern);
+-
+-        add("secp224k1", "1.3.132.0.32", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+-            "00000000000000000000000000000000000000000000000000000000",
+-            "00000000000000000000000000000000000000000000000000000005",
+-            "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+-            "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
+-            "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
+-            1, nameSplitPattern);
+-
+-        add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+-            "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+-            "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+-            "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
+-            1, nameSplitPattern);
+-
+-        add("secp256k1", "1.3.132.0.10", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
+-            "0000000000000000000000000000000000000000000000000000000000000000",
+-            "0000000000000000000000000000000000000000000000000000000000000007",
+-            "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
+-            "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
+-            1, nameSplitPattern);
+-
+         add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
+             "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
+             "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
+@@ -303,435 +195,6 @@
+             "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
+             1, nameSplitPattern);
+ 
+-        /* ANSI X9.62 prime curves */
+-        add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+-            "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
+-            "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
+-            "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
+-            "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
+-            1, nameSplitPattern);
+-
+-        add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+-            "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
+-            "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
+-            "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
+-            "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
+-            1, nameSplitPattern);
+-
+-        add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+-            "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
+-            "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
+-            "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
+-            1, nameSplitPattern);
+-
+-        add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+-            "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
+-            "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
+-            "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
+-            "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
+-            1, nameSplitPattern);
+-
+-        add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+-            "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
+-            "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
+-            "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
+-            "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
+-            1, nameSplitPattern);
+-
+-        /* SEC2 binary curves */
+-        add("sect113r1", "1.3.132.0.4", B,
+-            "020000000000000000000000000201",
+-            "003088250CA6E7C7FE649CE85820F7",
+-            "00E8BEE4D3E2260744188BE0E9C723",
+-            "009D73616F35F4AB1407D73562C10F",
+-            "00A52830277958EE84D1315ED31886",
+-            "0100000000000000D9CCEC8A39E56F",
+-            2, nameSplitPattern);
+-
+-        add("sect113r2", "1.3.132.0.5", B,
+-            "020000000000000000000000000201",
+-            "00689918DBEC7E5A0DD6DFC0AA55C7",
+-            "0095E9A9EC9B297BD4BF36E059184F",
+-            "01A57A6A7B26CA5EF52FCDB8164797",
+-            "00B3ADC94ED1FE674C06E695BABA1D",
+-            "010000000000000108789B2496AF93",
+-            2, nameSplitPattern);
+-
+-        add("sect131r1", "1.3.132.0.22", B,
+-            "080000000000000000000000000000010D",
+-            "07A11B09A76B562144418FF3FF8C2570B8",
+-            "0217C05610884B63B9C6C7291678F9D341",
+-            "0081BAF91FDF9833C40F9C181343638399",
+-            "078C6E7EA38C001F73C8134B1B4EF9E150",
+-            "0400000000000000023123953A9464B54D",
+-            2, nameSplitPattern);
+-
+-        add("sect131r2", "1.3.132.0.23", B,
+-            "080000000000000000000000000000010D",
+-            "03E5A88919D7CAFCBF415F07C2176573B2",
+-            "04B8266A46C55657AC734CE38F018F2192",
+-            "0356DCD8F2F95031AD652D23951BB366A8",
+-            "0648F06D867940A5366D9E265DE9EB240F",
+-            "0400000000000000016954A233049BA98F",
+-            2, nameSplitPattern);
+-
+-        add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
+-            "0800000000000000000000000000000000000000C9",
+-            "000000000000000000000000000000000000000001",
+-            "000000000000000000000000000000000000000001",
+-            "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
+-            "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
+-            "04000000000000000000020108A2E0CC0D99F8A5EF",
+-            2, nameSplitPattern);
+-
+-        add("sect163r1", "1.3.132.0.2", B,
+-            "0800000000000000000000000000000000000000C9",
+-            "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
+-            "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
+-            "0369979697AB43897789566789567F787A7876A654",
+-            "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
+-            "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
+-            2, nameSplitPattern);
+-
+-        add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
+-            "0800000000000000000000000000000000000000C9",
+-            "000000000000000000000000000000000000000001",
+-            "020A601907B8C953CA1481EB10512F78744A3205FD",
+-            "03F0EBA16286A2D57EA0991168D4994637E8343E36",
+-            "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
+-            "040000000000000000000292FE77E70C12A4234C33",
+-            2, nameSplitPattern);
+-
+-        add("sect193r1", "1.3.132.0.24", B,
+-            "02000000000000000000000000000000000000000000008001",
+-            "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
+-            "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
+-            "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
+-            "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
+-            "01000000000000000000000000C7F34A778F443ACC920EBA49",
+-            2, nameSplitPattern);
+-
+-        add("sect193r2", "1.3.132.0.25", B,
+-            "02000000000000000000000000000000000000000000008001",
+-            "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
+-            "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
+-            "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
+-            "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
+-            "010000000000000000000000015AAB561B005413CCD4EE99D5",
+-            2, nameSplitPattern);
+-
+-        add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
+-            "020000000000000000000000000000000000000004000000000000000001",
+-            "000000000000000000000000000000000000000000000000000000000000",
+-            "000000000000000000000000000000000000000000000000000000000001",
+-            "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
+-            "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
+-            "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
+-            4, nameSplitPattern);
+-
+-        add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
+-            "020000000000000000000000000000000000000004000000000000000001",
+-            "000000000000000000000000000000000000000000000000000000000001",
+-            "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
+-            "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
+-            "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
+-            "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
+-            2, nameSplitPattern);
+-
+-        add("sect239k1", "1.3.132.0.3", B,
+-            "800000000000000000004000000000000000000000000000000000000001",
+-            "000000000000000000000000000000000000000000000000000000000000",
+-            "000000000000000000000000000000000000000000000000000000000001",
+-            "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
+-            "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
+-            "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
+-            4, nameSplitPattern);
+-
+-        add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
+-            "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+-            "000000000000000000000000000000000000000000000000000000000000000000000000",
+-            "000000000000000000000000000000000000000000000000000000000000000000000001",
+-            "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
+-            "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
+-            "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
+-            4, nameSplitPattern);
+-
+-        add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
+-            "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+-            "000000000000000000000000000000000000000000000000000000000000000000000001",
+-            "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
+-            "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
+-            "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
+-            "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
+-            2, nameSplitPattern);
+-
+-        add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
+-            "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+-            "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
+-            "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
+-            "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
+-            4, nameSplitPattern);
+-
+-        add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
+-            "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+-            "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
+-            "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
+-            "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
+-            "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
+-            2, nameSplitPattern);
+-
+-        add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
+-            "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+-            "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
+-            "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
+-            "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
+-            4, nameSplitPattern);
+-
+-        add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
+-            "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+-            "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
+-            "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
+-            "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
+-            "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
+-            2, nameSplitPattern);
+-
+-        /* ANSI X9.62 binary curves */
+-        add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
+-            "800000000000000000000000000000000000000000000201",
+-            "2866537B676752636A68F56554E12640276B649EF7526267",
+-            "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
+-            "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
+-            "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
+-            "40000000000000000000000004A20E90C39067C893BBB9A5",
+-            2, nameSplitPattern);
+-
+-        add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
+-            "800000000000000000000000000000000000000000000201",
+-            "401028774D7777C7B7666D1366EA432071274F89FF01E718",
+-            "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
+-            "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
+-            "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
+-            "20000000000000000000000050508CB89F652824E06B8173",
+-            4, nameSplitPattern);
+-
+-        add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
+-            "800000000000000000000000000000000000000000000201",
+-            "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
+-            "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
+-            "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
+-            "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
+-            "155555555555555555555555610C0B196812BFB6288A3EA3",
+-            6, nameSplitPattern);
+-
+-        add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
+-            "800000000000000000000000000000000000000000000000001000000001",
+-            "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
+-            "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
+-            "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
+-            "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
+-            "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
+-            4, nameSplitPattern);
+-
+-        add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
+-            "800000000000000000000000000000000000000000000000001000000001",
+-            "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
+-            "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
+-            "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
+-            "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
+-            "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
+-            6, nameSplitPattern);
+-
+-        add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
+-            "800000000000000000000000000000000000000000000000001000000001",
+-            "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
+-            "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
+-            "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
+-            "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
+-            "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
+-            0xA, nameSplitPattern);
+-
+-        add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
+-            "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
+-            "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
+-            "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
+-            "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
+-            "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
+-            "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
+-            0x4C, nameSplitPattern);
+-
+-        add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
+-            "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
+-            "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
+-            "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
+-            "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
+-            "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
+-            "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
+-            0x2760, nameSplitPattern);
+-
+-        /* ANSI X9.62 binary curves from the 1998 standard but forbidden
+-         * in the 2005 version of the standard.
+-         * We don't register them but leave them here for the time being in
+-         * case we need to support them after all.
+-         */
+-/*
+-        add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
+-            "080000000000000000000000000000000000000107",
+-            "072546B5435234A422E0789675F432C89435DE5242",
+-            "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
+-            "07AF69989546103D79329FCC3D74880F33BBE803CB",
+-            "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
+-            "0400000000000000000001E60FC8821CC74DAEAFC1",
+-            2, nameSplitPattern);
+-
+-        add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
+-            "080000000000000000000000000000000000000107",
+-            "0108B39E77C4B108BED981ED0E890E117C511CF072",
+-            "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
+-            "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
+-            "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
+-            "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
+-            2, nameSplitPattern);
+-
+-        add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
+-            "080000000000000000000000000000000000000107",
+-            "07A526C63D3E25A256A007699F5447E32AE456B50E",
+-            "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
+-            "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
+-            "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
+-            "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
+-            2, nameSplitPattern);
+-
+-        add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
+-            "0100000000000000000000000000000000080000000007",
+-            "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
+-            "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
+-            "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
+-            "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
+-            "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
+-            0xFF6E, nameSplitPattern);
+-
+-        add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
+-            "010000000000000000000000000000000800000000000000000007",
+-            "0000000000000000000000000000000000000000000000000000",
+-            "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
+-            "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
+-            "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
+-            "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
+-            0xFE48, nameSplitPattern);
+-
+-        add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
+-            "010000000000000000000000000000000000000000000000000000010000000000000B",
+-            "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
+-            "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
+-            "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
+-            "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
+-            "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
+-            0xFF06, nameSplitPattern);
+-
+-        add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
+-            "010000000000000000000000000000000000000000000000000000000000000000000000000807",
+-            "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
+-            "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
+-            "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
+-            "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
+-            "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
+-            0xFE2E, nameSplitPattern);
+-
+-        add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
+-            "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
+-            "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
+-            "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
+-            "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
+-            "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
+-            "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
+-            0xFF70, nameSplitPattern);
+-*/
+-
+-        /*
+-         * Brainpool curves (RFC 5639)
+-         * (Twisted curves are not included)
+-         */
+-
+-        add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
+-            "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
+-            "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
+-            "1E589A8595423412134FAA2DBDEC95C8D8675E58",
+-            "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
+-            "1667CB477A1A8EC338F94741669C976316DA6321",
+-            "E95E4A5F737059DC60DF5991D45029409E60FC09",
+-            1, nameSplitPattern);
+-
+-        add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
+-            "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
+-            "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
+-            "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
+-            "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
+-            "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
+-            "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
+-            1, nameSplitPattern);
+-
+-        add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
+-            "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
+-            "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
+-            "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
+-            "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
+-            "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
+-            "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
+-            1, nameSplitPattern);
+-
+-        add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
+-            "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
+-            "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
+-            "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
+-            "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
+-            "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
+-            "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
+-            1, nameSplitPattern);
+-
+-        add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
+-            "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
+-            "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
+-            "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
+-            "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
+-            "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
+-            "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
+-            1, nameSplitPattern);
+-
+-        add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
+-            "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
+-            "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
+-            "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
+-            "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
+-            "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
+-            "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
+-            1, nameSplitPattern);
+-
+-        add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
+-            "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
+-            "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
+-            "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
+-            "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
+-            "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
+-            "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
+-            1, nameSplitPattern);
+-
+         specCollection = Collections.unmodifiableCollection(oidMap.values());
+     }
+ }
+diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
+--- openjdk/test/jdk/sun/security/ec/TestEC.java
+++ openjdk/test/jdk/sun/security/ec/TestEC.java
+@@ -35,8 +35,8 @@
+  * @library ../pkcs11/sslecc
+  * @library ../../../java/security/testlibrary
+  * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
+- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
+ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
+  */
+ 
+ import java.security.NoSuchProviderException;
+diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+--- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java       Thu Jul 27 18:04:48 2017 +0000
+++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java       Fri Oct 06 13:18:47 2017 +0200
+@@ -34,9 +34,9 @@
+  * @library ..
+  * @library ../../../../java/security/testlibrary
+  * @modules jdk.crypto.cryptoki
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+  *      ClientJSSEServerJSSE
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+  *      ClientJSSEServerJSSE sm policy
+  */
--- a/remove-intree-libraries.sh
+++ b/remove-intree-libraries.sh
@ -0,0 +1,129 @@
+#!/bin/sh
+
+ZIP_SRC=src/java.base/share/native/libzip/zlib/
+JPEG_SRC=src/java.desktop/share/native/libjavajpeg/
+GIF_SRC=src/java.desktop/share/native/libsplashscreen/giflib/
+PNG_SRC=src/java.desktop/share/native/libsplashscreen/libpng/
+LCMS_SRC=src/java.desktop/share/native/liblcms/
+
+cd openjdk
+
+echo "Removing built-in libs (they will be linked)"
+
+echo "Removing zlib"
+if [ ! -d ${ZIP_SRC} ]; then
+	echo "${ZIP_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi	
+rm -rvf ${ZIP_SRC}
+
+echo "Removing libjpeg"
+if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that sound definitely exist
+	echo "${JPEG_SRC} does not contain jpeg sources. Refusing to proceed."
+	exit 1
+fi	
+
+rm -vf ${JPEG_SRC}/jcomapi.c
+rm -vf ${JPEG_SRC}/jdapimin.c
+rm -vf ${JPEG_SRC}/jdapistd.c
+rm -vf ${JPEG_SRC}/jdcoefct.c
+rm -vf ${JPEG_SRC}/jdcolor.c
+rm -vf ${JPEG_SRC}/jdct.h
+rm -vf ${JPEG_SRC}/jddctmgr.c
+rm -vf ${JPEG_SRC}/jdhuff.c
+rm -vf ${JPEG_SRC}/jdhuff.h
+rm -vf ${JPEG_SRC}/jdinput.c
+rm -vf ${JPEG_SRC}/jdmainct.c
+rm -vf ${JPEG_SRC}/jdmarker.c
+rm -vf ${JPEG_SRC}/jdmaster.c
+rm -vf ${JPEG_SRC}/jdmerge.c
+rm -vf ${JPEG_SRC}/jdphuff.c
+rm -vf ${JPEG_SRC}/jdpostct.c
+rm -vf ${JPEG_SRC}/jdsample.c
+rm -vf ${JPEG_SRC}/jerror.c
+rm -vf ${JPEG_SRC}/jerror.h
+rm -vf ${JPEG_SRC}/jidctflt.c
+rm -vf ${JPEG_SRC}/jidctfst.c
+rm -vf ${JPEG_SRC}/jidctint.c
+rm -vf ${JPEG_SRC}/jidctred.c
+rm -vf ${JPEG_SRC}/jinclude.h
+rm -vf ${JPEG_SRC}/jmemmgr.c
+rm -vf ${JPEG_SRC}/jmemsys.h
+rm -vf ${JPEG_SRC}/jmemnobs.c
+rm -vf ${JPEG_SRC}/jmorecfg.h
+rm -vf ${JPEG_SRC}/jpegint.h
+rm -vf ${JPEG_SRC}/jpeglib.h
+rm -vf ${JPEG_SRC}/jquant1.c
+rm -vf ${JPEG_SRC}/jquant2.c
+rm -vf ${JPEG_SRC}/jutils.c
+rm -vf ${JPEG_SRC}/jcapimin.c
+rm -vf ${JPEG_SRC}/jcapistd.c
+rm -vf ${JPEG_SRC}/jccoefct.c
+rm -vf ${JPEG_SRC}/jccolor.c
+rm -vf ${JPEG_SRC}/jcdctmgr.c
+rm -vf ${JPEG_SRC}/jchuff.c
+rm -vf ${JPEG_SRC}/jchuff.h
+rm -vf ${JPEG_SRC}/jcinit.c
+rm -vf ${JPEG_SRC}/jconfig.h
+rm -vf ${JPEG_SRC}/jcmainct.c
+rm -vf ${JPEG_SRC}/jcmarker.c
+rm -vf ${JPEG_SRC}/jcmaster.c
+rm -vf ${JPEG_SRC}/jcparam.c
+rm -vf ${JPEG_SRC}/jcphuff.c
+rm -vf ${JPEG_SRC}/jcprepct.c
+rm -vf ${JPEG_SRC}/jcsample.c
+rm -vf ${JPEG_SRC}/jctrans.c
+rm -vf ${JPEG_SRC}/jdtrans.c
+rm -vf ${JPEG_SRC}/jfdctflt.c
+rm -vf ${JPEG_SRC}/jfdctfst.c
+rm -vf ${JPEG_SRC}/jfdctint.c
+rm -vf ${JPEG_SRC}/jversion.h
+rm -vf ${JPEG_SRC}/README
+
+echo "Removing giflib"
+if [ ! -d ${GIF_SRC} ]; then
+	echo "${GIF_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi	
+rm -rvf ${GIF_SRC}
+
+echo "Removing libpng"
+if [ ! -d ${PNG_SRC} ]; then
+	echo "${PNG_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi	
+rm -rvf ${PNG_SRC}
+
+echo "Removing lcms"
+if [ ! -d ${LCMS_SRC} ]; then
+	echo "${LCMS_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi
+rm -vf ${LCMS_SRC}/cmscam02.c
+rm -vf ${LCMS_SRC}/cmscgats.c
+rm -vf ${LCMS_SRC}/cmscnvrt.c
+rm -vf ${LCMS_SRC}/cmserr.c
+rm -vf ${LCMS_SRC}/cmsgamma.c
+rm -vf ${LCMS_SRC}/cmsgmt.c
+rm -vf ${LCMS_SRC}/cmshalf.c
+rm -vf ${LCMS_SRC}/cmsintrp.c
+rm -vf ${LCMS_SRC}/cmsio0.c
+rm -vf ${LCMS_SRC}/cmsio1.c
+rm -vf ${LCMS_SRC}/cmslut.c
+rm -vf ${LCMS_SRC}/cmsmd5.c
+rm -vf ${LCMS_SRC}/cmsmtrx.c
+rm -vf ${LCMS_SRC}/cmsnamed.c
+rm -vf ${LCMS_SRC}/cmsopt.c
+rm -vf ${LCMS_SRC}/cmspack.c
+rm -vf ${LCMS_SRC}/cmspcs.c
+rm -vf ${LCMS_SRC}/cmsplugin.c
+rm -vf ${LCMS_SRC}/cmsps2.c
+rm -vf ${LCMS_SRC}/cmssamp.c
+rm -vf ${LCMS_SRC}/cmssm.c
+rm -vf ${LCMS_SRC}/cmstypes.c
+rm -vf ${LCMS_SRC}/cmsvirt.c
+rm -vf ${LCMS_SRC}/cmswtpnt.c
+rm -vf ${LCMS_SRC}/cmsxform.c
+rm -vf ${LCMS_SRC}/lcms2.h
+rm -vf ${LCMS_SRC}/lcms2_internal.h
+rm -vf ${LCMS_SRC}/lcms2_plugin.h
--- a/sorted-diff.patch
+++ b/sorted-diff.patch
@ -0,0 +1,12 @@
+--- openjdk/make/gensrc/GensrcX11Wrappers.gmk
+++ openjdk/make/gensrc/GensrcX11Wrappers.gmk
+@@ -117,7 +117,8 @@
+ 	$(call LogInfo, Verifying X11 wrapper sizes)
+ 	$(call MakeDir, $(@D))
+ 	$(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
+-	$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
+	$(SORT) $(GENSRC_X11WRAPPERS_TMP)/sizes.$* > $@-orig.tmp
+	$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification-orig.tmp 
+ 	mv $@.tmp $@
+ 
+   GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481
+SHA512 (jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz) = e57810a4208bb12a6b37f5e8313e30c489e6611ec6be8e7a8fb3c0ae9f1842803a3775bc7cc1f597064444fb4fabae5798a4447712fbf547f7021dd0da384613
--- a/update_package.sh
+++ b/update_package.sh
@ -0,0 +1,184 @@
+#!/bin/bash -x
+# Generates the 'source tarball' for JDK 8 projects and update spec infrastructure
+# By default, this script regenerate source as they are currently used. 
+# so if the version of sources change, this file changes and is pushed
+#
+# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
+# PROJECT_NAME=jdk9
+# REPO_NAME=jdk9
+# VERSION=inDevelopment (but keyword tip will still do its job)
+# 
+# If you don't, default are used and so already uploaded tarball regenerated
+# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
+# 
+# For other useful variables see generate_source_tarball.sh
+#
+# the used values are then substituted to spec and sources
+
+if [ ! "x$PR2126" = "x" ] ; then
+  if [ ! -f "$PR2126" ] ; then
+    echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+    exit 1
+  fi
+fi
+
+set -e
+
+if [ "x$PROJECT_NAME" = "x" ] ; then
+    PROJECT_NAME="jdk-updates"
+fi
+if [ "x$REPO_NAME" = "x" ] ; then
+    REPO_NAME="jdk10u"
+fi
+if [ "x$VERSION" = "x" ] ; then
+    VERSION="jdk-10.0.1+10"
+fi
+
+if [ "x$COMPRESSION" = "x" ] ; then
+# rhel 5 needs tar.gz
+    COMPRESSION=xz
+fi
+if [ "x$FILE_NAME_ROOT" = "x" ] ; then
+    FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+fi
+#if [ "x$PKG" = "x" ] ; then
+#    URL=`cat .git/config  | grep url`
+#    PKG=${URL##*/}
+#fi
+if [ "x$SPEC" = "x" ] ; then
+    SPEC=${PKG}.spec
+fi
+if [ "x$RELEASE" = "x" ] ; then
+    RELEASE=1
+fi
+
+FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+
+if [ ! -f ${FILENAME} ] ; then
+echo "Generating ${FILENAME}"
+. ./generate_source_tarball.sh
+else 
+echo "${FILENAME} already exists, using"
+fi
+
+echo "nothing more TBD for 10!!"
+exit 0
+
+echo "Touching spec: $SPEC"
+sed -i "s/^%global\s\+project.*/%global project         ${PROJECT_NAME}/" $SPEC 
+sed -i "s/^%global\s\+repo.*/%global repo            ${REPO_NAME}/" $SPEC 
+sed -i "s/^%global\s\+revision.*/%global revision        ${VERSION}/" $SPEC 
+# updated sources, resetting release
+sed -i "s/^Release:.*/Release: $RELEASE.%{buildver}%{?dist}/" $SPEC
+
+#https://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Levenshtein_distance#Bash
+function levenshtein {
+	if [ "$#" -ne "2" ]; then
+		echo "Usage: $0 word1 word2" >&2
+	elif [ "${#1}" -lt "${#2}" ]; then
+		levenshtein "$2" "$1"
+	else
+		local str1len=$((${#1}))
+		local str2len=$((${#2}))
+		local d i j
+		for i in $(seq 0 $(((str1len+1)*(str2len+1)))); do
+			d[i]=0
+		done
+		for i in $(seq 0 $((str1len)));	do
+			d[$((i+0*str1len))]=$i
+		done
+		for j in $(seq 0 $((str2len)));	do
+			d[$((0+j*(str1len+1)))]=$j
+		done
+
+		for j in $(seq 1 $((str2len))); do
+			for i in $(seq 1 $((str1len))); do
+				[ "${1:i-1:1}" = "${2:j-1:1}" ] && local cost=0 || local cost=1
+				local del=$((d[(i-1)+str1len*j]+1))
+				local ins=$((d[i+str1len*(j-1)]+1))
+				local alt=$((d[(i-1)+str1len*(j-1)]+cost))
+				d[i+str1len*j]=$(echo -e "$del\n$ins\n$alt" | sort -n | head -1)
+			done
+		done
+		echo ${d[str1len+str1len*(str2len)]}
+	fi
+}
+# generate shenandoah hotspot
+# that means supply the underlying script with new values
+# to new filename.
+MAIN_VERSION=$VERSION
+if [ "x$VERSION" = "xtip" ] ; then
+    VERSION="tip"
+else
+	#hardcoding version for anything else except tip
+    VERSION="aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20"
+fi
+MAIN_REPO_NAME=$REPO_NAME
+REPO_NAME=jdk8u-shenandoah
+MAIN_FILE_NAME_ROOT=$FILE_NAME_ROOT
+FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+FILENAME_SH=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+REPOS="hotspot"
+
+if [ ! -f ${FILENAME_SH} ] ; then
+echo "Generating ${FILENAME_SH}"
+. ./generate_source_tarball.sh
+else 
+echo "${FILENAME_SH} already exists, using"
+fi
+
+sed -i "s/^Source1:.*/Source1: ${FILENAME_SH}/" $SPEC
+git --no-pager diff $SPEC
+
+# find the most similar sources name and replace it by newly generated one.
+echo "Old sources"
+cat sources
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
+winner=""
+winnerDistance=999999
+for x in $a_sources ; do
+  distance=`levenshtein $x ${FILENAME}`
+  if [ $distance -lt $winnerDistance ] ; then
+    winner=$x
+    winnerDistance=$distance
+  fi
+done
+sum=`md5sum ${FILENAME}`
+sed -i "s;.*$winner;$sum;" sources
+# now shenandoah hotspot
+winner=""
+winnerDistance=999999
+for x in $a_sources ; do
+  distance=`levenshtein $x ${FILENAME_SH}`
+  if [ $distance -lt $winnerDistance ] ; then
+    winner=$x
+    winnerDistance=$distance
+  fi
+done
+sum=`md5sum ${FILENAME_SH}`
+sed -i "s;.*$winner;$sum;" sources
+
+echo "New sources"
+cat sources
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
+echo "    you can get inspired by following %changelog template:"
+user_name=`whoami`
+user_record=$(getent passwd $user_name)
+user_gecos_field=$(echo "$user_record" | cut -d ':' -f 5)
+user_full_name=$(echo "$user_gecos_field" | cut -d ',' -f 1)
+spec_date=`date +"%a %b %d %Y"`
+# See spec:
+revision_helper=`echo ${MAIN_VERSION%-*}`
+updatever=`echo ${revision_helper##*u}`
+buildver=`echo ${MAIN_VERSION##*-}`
+echo "* $spec_date $user_full_name <$user_name@redhat.com> - 1:1.8.0.$updatever-$RELEASE.$buildver" 
+echo "- updated to $MAIN_VERSION (from $PROJECT_NAME/$MAIN_REPO_NAME)"
+echo "- updated to $VERSION (from $PROJECT_NAME/$REPO_NAME) of hotspot"
+echo "- used $FILENAME as new sources"
+echo "- used $FILENAME_SH as new sources for hotspot"
+
+echo "    execute:"
+echo "fedpkg/rhpkg new-sources "$a_sources
+echo "    to upload sources"
+echo "you can verify by fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
+
Author	SHA1	Message	Date
Severin Gehwolf	357ddc8a88	Rename back to java-openjdk.	2018-06-15 11:09:19 +02:00
Severin Gehwolf	a6505318d6	Rename to java-10-openjdk.	2018-06-14 12:13:20 +02:00
Severin Gehwolf	d8852c26ea	Initial import from f28. Corresponds to revision `9909674fe9`	2018-06-14 12:10:44 +02:00
Severin Gehwolf	c6c7ce7e83	Update README.md	2018-06-14 12:06:34 +02:00