summaryrefslogtreecommitdiff
path: root/java/openjdk7
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-02-11 23:53:16 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-02-11 23:53:16 +0000
commit060e5cd2f0108d18471d7b7bae611d3a24f72e1f (patch)
tree6136aae26badee69b7ade4907cb2294dc21a1ac1 /java/openjdk7
parentAdd a patch to fix MulticastSocket.setInterface(). (diff)
Add a patch to fix MulticastSocket.setInterface().
http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/bfa676f5b5db Submitted by: oliver
Notes
Notes: svn path=/head/; revision=312084
Diffstat (limited to 'java/openjdk7')
-rw-r--r--java/openjdk7/Makefile2
-rw-r--r--java/openjdk7/files/patch-PlainDatagramSocketImpl.c47
2 files changed, 48 insertions, 1 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 1cc39fa5d116..7b2b5d97f876 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION= 1
+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 \
diff --git a/java/openjdk7/files/patch-PlainDatagramSocketImpl.c b/java/openjdk7/files/patch-PlainDatagramSocketImpl.c
new file mode 100644
index 000000000000..d0e74cd80a07
--- /dev/null
+++ b/java/openjdk7/files/patch-PlainDatagramSocketImpl.c
@@ -0,0 +1,47 @@
+
+# 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 {