Attachment #188887 for bug #224079

View | Details | Raw Unified | Return to bug 224079
Collapse All | Expand All

Lines 2-8 Link Here

(-)java/openjdk8/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= openjdk	3	PORTNAME= openjdk
4	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}	4	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= java devel	6	CATEGORIES= java devel
7	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \	7	MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
8	https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \	8	https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \




--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2017-12-16 12:55:27.614176000 -0500
+++ jdk/src/solaris/native/java/net/NetworkInterface.c	2017-12-16 12:56:55.301658000 -0500
@@ -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,

Return to bug 224079

Line 0 Link Here

(-)java/openjdk8/files/patch-jdk_src_solaris_native_java_net_NetworkInterface.c (+13 lines)
	1	--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2017-12-16 12:55:27.614176000 -0500
	2	+++ jdk/src/solaris/native/java/net/NetworkInterface.c 2017-12-16 12:56:55.301658000 -0500
	3	@@ -2075,10 +2075,6 @@
	4	if (ifa->ifa_addr == NULL \|\| ifa->ifa_addr->sa_family != AF_INET6)
	5	continue;
	6
	7	- // set scope ID to interface index
	8	- ((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_scope_id =
	9	- getIndex(sock, ifa->ifa_name);
	10	-
	11	// add interface to the list
	12	ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, NULL,
	13	AF_INET6,