svn commit: r312083 - in head/java: openjdk6 openjdk6-jre openjdk6/files

[Jung-uk Kim]

Author: jkim
Date: Mon Feb 11 23:45:25 2013
New Revision: 312083
URL: http://svnweb.freebsd.org/changeset/ports/312083

Log:
  Add a patch to fix MulticastSocket.setInterface().
  
  http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/bfa676f5b5db
  
  Submitted by:	oliver

Modified:
  head/java/openjdk6-jre/Makefile
  head/java/openjdk6/Makefile
  head/java/openjdk6/files/patch-set

Modified: head/java/openjdk6-jre/Makefile
==============================================================================
--- head/java/openjdk6-jre/Makefile	Mon Feb 11 21:56:42 2013	(r312082)
+++ head/java/openjdk6-jre/Makefile	Mon Feb 11 23:45:25 2013	(r312083)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 PKGNAMESUFFIX=	-jre
 

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Mon Feb 11 21:56:42 2013	(r312082)
+++ head/java/openjdk6/Makefile	Mon Feb 11 23:45:25 2013	(r312083)
@@ -3,6 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b27
+PORTREVISION?=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		http://download.java.net/jaxp/openjdk/jdk6/:jaxp \

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Mon Feb 11 21:56:42 2013	(r312082)
+++ head/java/openjdk6/files/patch-set	Mon Feb 11 23:45:25 2013	(r312083)
@@ -18127,6 +18127,42 @@
          int ttl = 1;
          setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *)&ttl,
                     sizeof(ttl));
+@@ -1317,7 +1338,7 @@
+         /*
+          * value is an InetAddress.
+          */
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+         if (ipv6_available()) {
+             mcast_set_if_by_addr_v6(env, this, fd, value);
+         } else {
+@@ -1336,7 +1357,7 @@
+         /*
+          * value is a NetworkInterface.
+          */
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+         if (ipv6_available()) {
+             mcast_set_if_by_if_v6(env, this, fd, value);
+         } else {
+@@ -1413,7 +1434,7 @@
+  */
+ static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
+                                   jint opt, jobject value) {
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+     if (ipv6_available()) {
+         mcast_set_loop_v6(env, this, fd, value);
+     } else {
+@@ -1981,7 +2002,7 @@
+         fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
+     }
+     /* setsockopt to be correct ttl */
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+     if (ipv6_available()) {
+         setHopLimit(env, fd, ttl);
+     } else {
 @@ -2374,18 +2395,30 @@
              mname6.ipv6mr_interface = idx;
          }