svn commit: r379126 - in head/java: openjdk7 openjdk7/files openjdk8 openjdk8/files

[Jung-uk Kim]

Author: jkim
Date: Mon Feb 16 23:58:16 2015
New Revision: 379126
URL: https://svnweb.freebsd.org/changeset/ports/379126
QAT: https://qat.redports.org/buildarchive/r379126/

Log:
  Properly use BLOCKING_IO_RETURN_INT() macro for NET_Accept().

Added:
  head/java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c   (contents, props changed)
  head/java/openjdk8/files/patch-jdk-src-solaris-native-java-net-bsd_close.c   (contents, props changed)
Modified:
  head/java/openjdk7/Makefile
  head/java/openjdk8/Makefile

Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile	Mon Feb 16 23:54:21 2015	(r379125)
+++ head/java/openjdk7/Makefile	Mon Feb 16 23:58:16 2015	(r379126)
@@ -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}/ \

Added: head/java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-src-solaris-native-java-net-bsd_close.c	Mon Feb 16 23:58:16 2015	(r379126)
@@ -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) {

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Mon Feb 16 23:54:21 2015	(r379125)
+++ head/java/openjdk8/Makefile	Mon Feb 16 23:58:16 2015	(r379126)
@@ -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-java-net-bsd_close.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk8/files/patch-jdk-src-solaris-native-java-net-bsd_close.c	Mon Feb 16 23:58:16 2015	(r379126)
@@ -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) {