diff options
| -rw-r--r-- | java/openjdk7/Makefile | 1 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c | 16 | ||||
| -rw-r--r-- | java/openjdk8/Makefile | 1 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk-src-solaris-native-java-net-bsd_close.c | 16 |
4 files changed, 34 insertions, 0 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 923c1164bf16..1c5314033e3c 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -3,6 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ diff --git a/java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c b/java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c new file mode 100644 index 000000000000..f097e9e16289 --- /dev/null +++ b/java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c @@ -0,0 +1,16 @@ +--- jdk/src/solaris/native/java/net/bsd_close.c ++++ jdk/src/solaris/native/java/net/bsd_close.c +@@ -316,11 +316,8 @@ + } + + int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { +- socklen_t len = *addrlen; +- int error = accept(s, addr, &len); +- if (error != -1) +- *addrlen = (int)len; +- BLOCKING_IO_RETURN_INT( s, error ); ++ /* See NET_RecvFrom() */ ++ BLOCKING_IO_RETURN_INT( s, accept(s, addr, (socklen_t *)addrlen) ); + } + + int NET_Connect(int s, struct sockaddr *addr, int addrlen) { diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 0e09e4b68f86..b60fc8bab016 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-java-net-bsd_close.c b/java/openjdk8/files/patch-jdk-src-solaris-native-java-net-bsd_close.c new file mode 100644 index 000000000000..f097e9e16289 --- /dev/null +++ b/java/openjdk8/files/patch-jdk-src-solaris-native-java-net-bsd_close.c @@ -0,0 +1,16 @@ +--- jdk/src/solaris/native/java/net/bsd_close.c ++++ jdk/src/solaris/native/java/net/bsd_close.c +@@ -316,11 +316,8 @@ + } + + int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { +- socklen_t len = *addrlen; +- int error = accept(s, addr, &len); +- if (error != -1) +- *addrlen = (int)len; +- BLOCKING_IO_RETURN_INT( s, error ); ++ /* See NET_RecvFrom() */ ++ BLOCKING_IO_RETURN_INT( s, accept(s, addr, (socklen_t *)addrlen) ); + } + + int NET_Connect(int s, struct sockaddr *addr, int addrlen) { |