Date: Sat, 8 Dec 2018 19:09:28 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486983 - in head/java/openjdk8: . files Message-ID: <201812081909.wB8J9SV0003570@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sat Dec 8 19:09:28 2018 New Revision: 486983 URL: https://svnweb.freebsd.org/changeset/ports/486983 Log: . Fix SCTP support. PR: 230321 Submitted by: Timo Voelker <timo.voelker@fh-muenster.de> Added: head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c (contents, props changed) Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Sat Dec 8 18:57:23 2018 (r486982) +++ head/java/openjdk8/Makefile Sat Dec 8 19:09:28 2018 (r486983) @@ -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 \ Added: head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c Sat Dec 8 19:09:28 2018 (r486983) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812081909.wB8J9SV0003570>