mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

. Update to 7u17.

Browse Source
This commit is contained in:
Greg Lewis 2013-03-10 01:41:07 +00:00
parent 435587a24f
commit 3429746801
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=313788
5 changed files with 51789 additions and 659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/openjdk7/Makefile
View File

@ -7,7 +7,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
http://download.java.net/jaxp/1.4.5/:jaxp \
@ -41,8 +40,8 @@ DEBUG_DESC= Enable extra debugging info
POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data
PORT_MINOR_VERSION= 11
PORT_BUILD_NUMBER= 21
PORT_MINOR_VERSION= 17
PORT_BUILD_NUMBER= 02
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 6
JDK_BUILD_NUMBER= 24
@ -96,7 +95,7 @@ MAKE_ENV+= LANG="C" \
ENABLE_FULL_DEBUG_SYMBOLS=0 \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
MILESTONE="fcs" \
JDK_MICRO_VERSION="0_0${PORT_MINOR_VERSION}" \
JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \
BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
.if !defined(DISABLE_MAKE_JOBS)

47
java/openjdk7/files/patch-PlainDatagramSocketImpl.c
View File

@ -1,47 +0,0 @@
# HG changeset patch
# User kurt
# Date 1359762569 18000
# Node ID bfa676f5b5db6a9c1c0e158eb40856c1b7f5f258
# Parent c721254e908da6aea0879f3d0e715003ff675525
- Fix MulticastSocket.setInterface() for BSD. Report and fix from Oliver
Lehmann on bsd-port list.
--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Fri Jan 25 11:40:12 2013 -0500
+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Fri Feb 01 18:49:29 2013 -0500
@@ -1358,7 +1358,7 @@ static void setMulticastInterface(JNIEnv
* value is an InetAddress.
*/
#ifdef AF_INET6
-#if defined(__solaris__) || defined(MACOSX)
+#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
if (ipv6_available()) {
mcast_set_if_by_addr_v6(env, this, fd, value);
} else {
@@ -1381,7 +1381,7 @@ static void setMulticastInterface(JNIEnv
* value is a NetworkInterface.
*/
#ifdef AF_INET6
-#if defined(__solaris__) || defined(MACOSX)
+#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
if (ipv6_available()) {
mcast_set_if_by_if_v6(env, this, fd, value);
} else {
@@ -1464,7 +1464,7 @@ static void setMulticastLoopbackMode(JNI
static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
jint opt, jobject value) {
#ifdef AF_INET6
-#if defined(__solaris__) || defined(MACOSX)
+#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
if (ipv6_available()) {
mcast_set_loop_v6(env, this, fd, value);
} else {
@@ -2038,7 +2038,7 @@ Java_java_net_PlainDatagramSocketImpl_se
}
/* setsockopt to be correct ttl */
#ifdef AF_INET6
-#if defined(__solaris__) || defined(MACOSX)
+#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
if (ipv6_available()) {
setHopLimit(env, fd, ttl);
} else {

85
java/openjdk7/files/patch-bsd_close.c
View File

@ -1,85 +0,0 @@
--- jdk/src/solaris/native/java/net/bsd_close.c Wed Jan 16 16:04:50 2013 -0800
+++ jdk/src/solaris/native/java/net/bsd_close.c Thu Jan 17 22:14:02 2013 -0800
@@ -345,6 +345,76 @@
* signal other than our wakeup signal.
*/
int NET_Timeout(int s, long timeout) {
+/*
+ * On MacOS X, poll(2) is not working correctly, so a select(2) based
+ * implementation is preferred. See
+ *
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7131399
+ *
+ * However, on FreeBSD, the select(2) based implementation can cause
+ * crashes under load and poll(2) is preferred. See
+ *
+ * http://docs.freebsd.org/cgi/getmsg.cgi?fetch=215525+0+current/freebsd-java
+ *
+ * Other *BSD should adjust as appropriate.
+ */
+#ifdef __FreeBSD__
+ long prevtime = 0, newtime;
+ struct timeval t;
+ fdEntry_t *fdEntry = getFdEntry(s);
+
+ /*
+ * Check that fd hasn't been closed.
+ */
+ if (fdEntry == NULL) {
+ errno = EBADF;
+ return -1;
+ }
+
+ /*
+ * Pick up current time as may need to adjust timeout
+ */
+ if (timeout > 0) {
+ gettimeofday(&t, NULL);
+ prevtime = t.tv_sec * 1000 + t.tv_usec / 1000;
+ }
+
+ for(;;) {
+ struct pollfd pfd;
+ int rv;
+ threadEntry_t self;
+
+ /*
+ * Poll the fd. If interrupted by our wakeup signal
+ * errno will be set to EBADF.
+ */
+ pfd.fd = s;
+ pfd.events = POLLIN | POLLERR;
+
+ startOp(fdEntry, &self);
+ rv = poll(&pfd, 1, timeout);
+ endOp(fdEntry, &self);
+
+ /*
+ * If interrupted then adjust timeout. If timeout
+ * has expired return 0 (indicating timeout expired).
+ */
+ if (rv < 0 && errno == EINTR) {
+ if (timeout > 0) {
+ gettimeofday(&t, NULL);
+ newtime = t.tv_sec * 1000 + t.tv_usec / 1000;
+ timeout -= newtime - prevtime;
+ if (timeout <= 0) {
+ return 0;
+ }
+ prevtime = newtime;
+ }
+ } else {
+ return rv;
+ }
+
+ }
+#else
long prevtime = 0, newtime;
struct timeval t, *tp = &t;
fdEntry_t *fdEntry = getFdEntry(s);
@@ -414,4 +484,5 @@
}
}
+#endif
}

52224
java/openjdk7/files/patch-set
View File

File diff suppressed because it is too large Load Diff

85
java/openjdk7/files/patch-zzz-7u11
View File

@ -1,85 +0,0 @@
# HG changeset patch
# User jrose
# Date 1357874549 28800
# Node ID ecc14534318c80dc7612c8b1d328a67849c5b07f
# Parent 88c54f7a8c514b3df459cb086356387cd2c35d8a
8004933: Improve MethodHandle interaction with libraries
8006017: Improve lookup resolutions
Reviewed-by: ahgross
--- jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Dec 04 17:28:38 2012 -0800
+++ jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java Thu Jan 10 19:22:29 2013 -0800
@@ -418,6 +418,21 @@ class MethodHandleNatives {
return defc == sun.misc.Unsafe.class;
case "lookup":
return defc == java.lang.invoke.MethodHandles.class;
+ case "findStatic":
+ case "findVirtual":
+ case "findConstructor":
+ case "findSpecial":
+ case "findGetter":
+ case "findSetter":
+ case "findStaticGetter":
+ case "findStaticSetter":
+ case "bind":
+ case "unreflect":
+ case "unreflectSpecial":
+ case "unreflectConstructor":
+ case "unreflectGetter":
+ case "unreflectSetter":
+ return defc == java.lang.invoke.MethodHandles.Lookup.class;
case "invoke":
return defc == java.lang.reflect.Method.class;
case "get":
--- jdk/src/share/classes/java/lang/invoke/MethodHandles.java Tue Dec 04 17:28:38 2012 -0800
+++ jdk/src/share/classes/java/lang/invoke/MethodHandles.java Thu Jan 10 19:22:29 2013 -0800
@@ -68,6 +68,10 @@ public class MethodHandles {
*/
public static Lookup lookup() {
return new Lookup();
+ }
+ static {
+ // FIXME in MR1: Core Reflection cannot be used to gain a Lookup to perform MH reflection
+ Reflection.registerMethodsToFilter(MethodHandles.class, "lookup");
}
/**
# HG changeset patch
# User jrose
# Date 1357955621 28800
# Node ID d9969a953f693f5760b1d2759f11a2cb222e4f20
# Parent f9567d889266689d5b76f11a23584127848700bc
8006125: Update MethodHandles library interactions
Reviewed-by: mchung, jdn, ahgross
--- jdk/src/share/classes/java/lang/invoke/MethodHandles.java Fri Jan 11 09:00:00 2013 -0800
+++ jdk/src/share/classes/java/lang/invoke/MethodHandles.java Fri Jan 11 17:53:41 2013 -0800
@@ -68,10 +68,6 @@ public class MethodHandles {
*/
public static Lookup lookup() {
return new Lookup();
- }
- static {
- // FIXME in MR1: Core Reflection cannot be used to gain a Lookup to perform MH reflection
- Reflection.registerMethodsToFilter(MethodHandles.class, "lookup");
}
/**
--- jdk/src/share/classes/sun/reflect/misc/MethodUtil.java Fri Jan 11 09:00:00 2013 -0800
+++ jdk/src/share/classes/sun/reflect/misc/MethodUtil.java Fri Jan 11 17:53:41 2013 -0800
@@ -256,6 +256,12 @@ public final class MethodUtil extends Se
public static Object invoke(Method m, Object obj, Object[] params)
throws InvocationTargetException, IllegalAccessException {
if (m.getDeclaringClass().equals(AccessController.class) ||
+ (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.class)
+ && m.getName().equals("lookup")) ||
+ (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.Lookup.class)
+ && (m.getName().startsWith("find") ||
+ m.getName().startsWith("bind") ||
+ m.getName().startsWith("unreflect"))) ||
m.getDeclaringClass().equals(Method.class))
throw new InvocationTargetException(
new UnsupportedOperationException("invocation not supported"));