diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2018-12-08 19:09:28 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2018-12-08 19:09:28 +0000 |
| commit | 4f3b06b1979d69d4da4dc13e6fda89d0934a529b (patch) | |
| tree | c7a70266831ff5c73bb4eb1e5617e6a84be52aec /java/openjdk8 | |
| parent | 98f840f0fb652db0333136af9c2b458970a771e3 (diff) | |
Notes
Diffstat (limited to 'java/openjdk8')
| -rw-r--r-- | java/openjdk8/Makefile | 1 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 81f2d7903634..003ece3273b9 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,6 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ diff --git a/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c b/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c new file mode 100644 index 000000000000..226536edfcda --- /dev/null +++ b/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c @@ -0,0 +1,41 @@ +--- jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c.org 2018-07-26 09:56:49.897172000 +0200 ++++ jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c 2018-07-30 16:13:19.116935000 +0200 +@@ -330,11 +330,11 @@ + break; + case SCTP_ADDR_MADE_PRIM : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_MADE_PRIM; +-#ifdef __linux__ /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */ ++#ifndef __solaris__ /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */ + break; + case SCTP_ADDR_CONFIRMED : + event = sun_nio_ch_sctp_PeerAddrChange_SCTP_ADDR_CONFIRMED; +-#endif /* __linux__ */ ++#endif /* __solaris__ */ + } + + addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr); +@@ -445,13 +445,13 @@ + } else if (errno == EINTR) { + return IOS_INTERRUPTED; + +-#ifdef __linux__ ++#ifndef __solaris__ + } else if (errno == ENOTCONN) { + /* ENOTCONN when EOF reached */ + rv = 0; + /* there will be no control data */ + msg->msg_controllen = 0; +-#endif /* __linux__ */ ++#endif /* __solaris__ */ + + } else { + handleSocketError(env, errno); +@@ -568,7 +568,7 @@ + /* Set up the msghdr structure for sending */ + memset(msg, 0, sizeof (*msg)); + memset(cbuf, 0, cbuf_size); +- msg->msg_name = &sa; ++ msg->msg_name = (sa_len == 0 ? NULL : &sa); + msg->msg_namelen = sa_len; + iov->iov_base = addr; + iov->iov_len = length; |