Update to 11.0.3+7:

https://www.oracle.com/technetwork/java/javase/11-0-3-oracle-relnotes-5290048.html

okay sthen@, pvk@ solene@
This commit is contained in:
kurt 2019-04-18 18:06:17 +00:00
parent 4f1e94c99c
commit 4362760bb0
4 changed files with 44 additions and 31 deletions

View File

@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.2 2019/04/05 14:41:47 pvk Exp $
# $OpenBSD: Makefile,v 1.3 2019/04/18 18:06:17 kurt Exp $
ONLY_FOR_ARCHS= i386 amd64
USE_WXNEEDED= Yes
DPB_PROPERTIES= parallel
COMMENT= OpenJDK Software Development Kit v${VERSION_STR}
BASE_VER= 11.0.2
PATCH_VER= 9
BSD_PORT_REL= 3
BASE_VER= 11.0.3
PATCH_VER= 7
BSD_PORT_REL= 1
VERSION_STR= ${BASE_VER}+${PATCH_VER}-${BSD_PORT_REL}
PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${PACKAGE_VER}
PKGSTEM= jdk-11
EPOCH= 0
REVISION= 0
DIST_SUBDIR= jdk
DISTNAME= jdk-${VERSION_STR}

View File

@ -1,6 +1,6 @@
SHA256 (jdk/jdk-11.0.2+9-3.tar.gz) = A2W9PwxpGQgKj0uFUjrCyz3ZkqJuAYyr6IBOo+zziHs=
SHA256 (jdk/jdk-11.0.3+7-1.tar.gz) = GnX0U8XoGcI5nYAqly+epsKWII2P4LgQ2tiQZ+Y3QZw=
SHA256 (jdk/openjdk-jdk11u-bootjdk-amd64-20190325.tar.gz) = uADjYEnch2TUXtDpWe9rAfgLXR7NvqOKsOrdpKH4qNY=
SHA256 (jdk/openjdk-jdk11u-bootjdk-i386-20190325.tar.gz) = nI7/p0nVpFbiD01gpCl5QSfjtOeI/41PumOKfK/HeOA=
SIZE (jdk/jdk-11.0.2+9-3.tar.gz) = 116742678
SIZE (jdk/jdk-11.0.3+7-1.tar.gz) = 116791459
SIZE (jdk/openjdk-jdk11u-bootjdk-amd64-20190325.tar.gz) = 113818989
SIZE (jdk/openjdk-jdk11u-bootjdk-i386-20190325.tar.gz) = 101841640

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_jdk_management_unix_native_libmanagement_ext_OperatingSystemImpl_c,v 1.1 2019/04/05 14:41:47 pvk Exp $
Index: src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
--- src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c.orig
+++ src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
@@ -541,3 +541,18 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
}
return (jlong) rlp.rlim_cur;
}
+
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getSystemCpuLoad0
+ (JNIEnv *env, jobject dummy)
+{
+ return (jdouble) -1;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_sun_management_internal_OperatingSystemImpl_getProcessCpuLoad0
+ (JNIEnv *env, jobject dummy)
+{
+ return (jdouble) -1;
+}

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-src_jdk_net_bsd_native_libextnet_BsdSocketOptions_c,v 1.1 2019/04/18 18:06:17 kurt Exp $
Index: src/jdk.net/bsd/native/libextnet/BsdSocketOptions.c
--- src/jdk.net/bsd/native/libextnet/BsdSocketOptions.c.orig
+++ src/jdk.net/bsd/native/libextnet/BsdSocketOptions.c
@@ -68,7 +68,7 @@ static void handleError(JNIEnv *env, jint rv, const ch
JNIEXPORT jboolean JNICALL Java_jdk_net_BsdSocketOptions_keepAliveOptionsSupported0
(JNIEnv *env, jobject unused) {
#ifdef __OpenBSD__
- return false;
+ return JNI_FALSE;
#else
return socketOptionSupported(TCP_KEEPIDLE) && socketOptionSupported(TCP_KEEPCNT)
&& socketOptionSupported(TCP_KEEPINTVL);
@@ -133,6 +133,7 @@ JNIEXPORT jint JNICALL Java_jdk_net_BsdSocketOptions_g
#ifdef __OpenBSD__
JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
"unsupported socket option");
+ return -1;
#else
jint optval, rv;
socklen_t sz = sizeof (optval);
@@ -152,6 +153,7 @@ JNIEXPORT jint JNICALL Java_jdk_net_BsdSocketOptions_g
#ifdef __OpenBSD__
JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
"unsupported socket option");
+ return -1;
#else
jint optval, rv;
socklen_t sz = sizeof (optval);
@@ -171,6 +173,7 @@ JNIEXPORT jint JNICALL Java_jdk_net_BsdSocketOptions_g
#ifdef __OpenBSD__
JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
"unsupported socket option");
+ return -1;
#else
jint optval, rv;
socklen_t sz = sizeof (optval);