. Update to 8u40.

This commit is contained in:
Greg Lewis
2015-03-15 21:30:04 +00:00
parent b7346ae0e6
commit 72d2e02134
5 changed files with 344801 additions and 1066 deletions

View File

@@ -2,7 +2,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
PORTREVISION= 2
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 \
@@ -37,17 +36,37 @@ BUILD_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
ONLY_FOR_ARCHS= i386 amd64
WRKSRC= ${WRKDIR}/${PORTNAME}
DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \
jdk/src/bsd/doc/man/java.1 \
DOS2UNIX_FILES= jdk/src/bsd/doc/man/java.1 \
jdk/src/bsd/doc/man/javac.1 \
jdk/src/bsd/doc/man/javadoc.1 \
jdk/src/bsd/doc/man/javap.1 \
jdk/src/bsd/doc/man/jcmd.1 \
jdk/src/bsd/doc/man/jjs.1 \
jdk/src/bsd/doc/man/jstat.1 \
jdk/src/bsd/doc/man/keytool.1 \
jdk/src/bsd/doc/man/policytool.1 \
jdk/src/linux/doc/man/java.1 \
jdk/src/linux/doc/man/javac.1 \
jdk/src/linux/doc/man/javadoc.1 \
jdk/src/linux/doc/man/javap.1 \
jdk/src/linux/doc/man/jcmd.1 \
jdk/src/linux/doc/man/jjs.1 \
jdk/src/linux/doc/man/jstat.1 \
jdk/src/linux/doc/man/keytool.1 \
jdk/src/linux/doc/man/policytool.1 \
jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \
jdk/src/solaris/doc/sun/man/man1/java.1 \
jdk/src/solaris/doc/sun/man/man1/javac.1 \
jdk/src/solaris/doc/sun/man/man1/javadoc.1 \
jdk/src/solaris/doc/sun/man/man1/javap.1 \
nashorn/test/script/jfx.js
jdk/src/solaris/doc/sun/man/man1/jcmd.1 \
jdk/src/solaris/doc/sun/man/man1/jjs.1 \
jdk/src/solaris/doc/sun/man/man1/jstat.1 \
jdk/src/solaris/doc/sun/man/man1/keytool.1 \
jdk/src/solaris/doc/sun/man/man1/policytool.1 \
nashorn/test/script/jfx.js \
nashorn/test/script/jfx/kaleidoscope.js \
nashorn/test/script/jfx/spread.js
SHEBANG_FILES= configure
_MAKE_JOBS= #
@@ -72,8 +91,8 @@ NO_CCACHE= yes
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
JDK_UPDATE_VERSION= 31
JDK_BUILD_NUMBER= 13
JDK_UPDATE_VERSION= 40
JDK_BUILD_NUMBER= 25
DIST_BUILD_NUMBER= 132
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,16 +0,0 @@
--- 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) {