aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2017-12-25 14:25:53 +0800
committerglewis <glewis@FreeBSD.org>2017-12-25 14:25:53 +0800
commit182a8c2e5fc72a21335db6179c31f80b1d46446f (patch)
tree72f4a49a0fc090bb0b561d20f51021dd77b8b6dc /java
parenta171024dc9f9590c8f3ad6072caf2fdbf0dbc629 (diff)
downloadfreebsd-ports-gnome-182a8c2e5fc72a21335db6179c31f80b1d46446f.tar.gz
freebsd-ports-gnome-182a8c2e5fc72a21335db6179c31f80b1d46446f.tar.zst
freebsd-ports-gnome-182a8c2e5fc72a21335db6179c31f80b1d46446f.zip
. Don't incorrectly set the scopeId of an IPv6 interface on BSD.
This fixes binding sockets for applications running on IPv6. PR: 224079 Submitted by: John W. O'Brien <john@saltant.com>
Diffstat (limited to 'java')
-rw-r--r--java/openjdk8/Makefile2
-rw-r--r--java/openjdk8/files/patch-jdk-src-solaris-classes-native-java-net-NetworkInterface.c13
2 files changed, 14 insertions, 1 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 12a1b0e8a96a..ef8f73c67fb2 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,7 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION= 1
+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 \
diff --git a/java/openjdk8/files/patch-jdk-src-solaris-classes-native-java-net-NetworkInterface.c b/java/openjdk8/files/patch-jdk-src-solaris-classes-native-java-net-NetworkInterface.c
new file mode 100644
index 000000000000..bc94b2404300
--- /dev/null
+++ b/java/openjdk8/files/patch-jdk-src-solaris-classes-native-java-net-NetworkInterface.c
@@ -0,0 +1,13 @@
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2017-12-24 22:01:27.592305000 -0800
++++ jdk/src/solaris/native/java/net/NetworkInterface.c 2017-12-24 22:06:51.899725000 -0800
+@@ -2075,10 +2075,6 @@
+ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6)
+ continue;
+
+- // set scope ID to interface index
+- ((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_scope_id =
+- getIndex(sock, ifa->ifa_name);
+-
+ // add interface to the list
+ ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, NULL,
+ AF_INET6,