6 files changed, 5 insertions, 56 deletions

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index c8fe087efbb6..353e178870b0 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -55,9 +54,9 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	6
+JDK_PATCH_VERSION=	7
 JDK_BUILD_NUMBER=	10
-BSD_JDK_VERSION=	1
+BSD_JDK_VERSION=	2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=${CC} \
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index bba94e2db128..bbdbddacac9a 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579201903
-SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.6+10-1_GH0.tar.gz) = 062450974b7df3ec7128b0361bab1c470f9b7cc4542a77304f4c5eb3b4752a6f
-SIZE (battleblow-openjdk-jdk11u-jdk-11.0.6+10-1_GH0.tar.gz) = 117035292
+TIMESTAMP = 1586991400
+SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.7+10-2_GH0.tar.gz) = 998baaa75c793f333ed561fe18359cc781dee9aedd0e31ddab970e1cf14d4fc7
+SIZE (battleblow-openjdk-jdk11u-jdk-11.0.7+10-2_GH0.tar.gz) = 117654998
diff --git a/java/openjdk11/files/patch-src_hotspot_share_runtime_arguments.cpp b/java/openjdk11/files/patch-src_hotspot_share_runtime_arguments.cpp
deleted file mode 100644
index 911e81c13552..000000000000
--- a/java/openjdk11/files/patch-src_hotspot_share_runtime_arguments.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hotspot/share/runtime/arguments.cpp.orig	2020-01-15 18:29:57 UTC
-+++ src/hotspot/share/runtime/arguments.cpp
-@@ -1458,7 +1458,7 @@ bool Arguments::add_property(const char* prop, Propert
-       // save it in _java_vendor_url_bug, so JVM fatal error handler can access
-       // its value without going through the property list or making a Java call.
-       _java_vendor_url_bug = os::strdup_check_oom(value, mtArguments);
--      if (old_java_vendor_url_bug != DEFAULT_VENDOR_URL_BUG) {
-+      if (strcmp(old_java_vendor_url_bug, DEFAULT_VENDOR_URL_BUG) != 0) {
-         assert(old_java_vendor_url_bug != NULL, "_java_vendor_url_bug is NULL");
-         os::free((void *)old_java_vendor_url_bug);
-       }
diff --git a/java/openjdk11/files/patch-src_hotspot_share_runtime_sharedRuntime.cpp b/java/openjdk11/files/patch-src_hotspot_share_runtime_sharedRuntime.cpp
deleted file mode 100644
index 08caf44ad7c5..000000000000
--- a/java/openjdk11/files/patch-src_hotspot_share_runtime_sharedRuntime.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hotspot/share/runtime/sharedRuntime.cpp.orig	2020-01-15 18:29:57 UTC
-+++ src/hotspot/share/runtime/sharedRuntime.cpp
-@@ -2806,7 +2806,7 @@ void AdapterHandlerLibrary::create_native_wrapper(cons
-     if (buf != NULL) {
-       CodeBuffer buffer(buf);
-       double locs_buf[20];
--      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
-+      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, (sizeof(locs_buf)) / (sizeof(relocInfo)));
-       MacroAssembler _masm(&buffer);
- 
-       // Fill in the signature array, for the calling-convention call.
diff --git a/java/openjdk11/files/patch-src_java.base_share_native_libfdlibm_e__asin.c b/java/openjdk11/files/patch-src_java.base_share_native_libfdlibm_e__asin.c
deleted file mode 100644
index 6ce203879bc2..000000000000
--- a/java/openjdk11/files/patch-src_java.base_share_native_libfdlibm_e__asin.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/java.base/share/native/libfdlibm/e_asin.c.orig	2020-01-15 18:29:57 UTC
-+++ src/java.base/share/native/libfdlibm/e_asin.c
-@@ -97,12 +97,13 @@ qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB1
-         } else if (ix<0x3fe00000) {     /* |x|<0.5 */
-             if(ix<0x3e400000) {         /* if |x| < 2**-27 */
-                 if(huge+x>one) return x;/* return x with inexact if x!=0*/
--            } else
-+            } else {
-                 t = x*x;
-                 p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
-                 q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
-                 w = p/q;
-                 return x+x*w;
-+            }
-         }
-         /* 1> |x|>= 0.5 */
-         w = one-fabs(x);
diff --git a/java/openjdk11/files/patch-src_java.base_unix_native_libnio_ch_FileDispatcherImpl.c b/java/openjdk11/files/patch-src_java.base_unix_native_libnio_ch_FileDispatcherImpl.c
deleted file mode 100644
index 49b642a29db2..000000000000
--- a/java/openjdk11/files/patch-src_java.base_unix_native_libnio_ch_FileDispatcherImpl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
-+++ src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
-@@ -291,7 +291,7 @@ Java_sun_nio_ch_FileDispatcherImpl_release0(JNIEnv *env, jobject this,
- static void closeFileDescriptor(JNIEnv *env, int fd) {
-     if (fd != -1) {
-         int result = close(fd);
--        if (result < 0)
-+        if (result < 0 && errno != ECONNRESET)
-             JNU_ThrowIOExceptionWithLastError(env, "Close failed");
-     }
- }