pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/openjdk8
Module Name: pkgsrc
Committed By: ryoon
Date: Thu Oct 27 13:06:42 UTC 2016
Modified Files:
pkgsrc/lang/openjdk8: Makefile distinfo
pkgsrc/lang/openjdk8/patches:
patch-common_autoconf_generated-configure.sh
patch-jdk_src_solaris_native_java_net_NetworkInterface.c
Removed Files:
pkgsrc/lang/openjdk8/patches:
patch-hotspot_test_compiler_native_TestDirtyInt.sh
Log Message:
Update to 1.8.112
* Include a patch from PR pkg/51221
Changelog:
security-libs/java.security
SunPKCS11 Provider no longer offering SecureRandom by default
SecureRandom.PKCS11 from the SunPKCS11 Provider is disabled by default on Solaris because the native PKCS11 implementation has poor performance and is not recommended. If your application requires
SecureRandom.PKCS11, you can re-enable it by removing "SecureRandom" from the disabledMechanisms list in conf/security/sunpkcs11-solaris.cfg
Performance improvements have also been made in the java.security.SecureRandom class. Improvements in the JDK implementation have allowed for synchronization to be removed from the
java.security.SecureRandom.nextBytes(byte[] bytes) method.
See JDK-8098581
Fix following security bugs:
CVE-2016-5556
CVE-2016-5582
CVE-2016-5573
CVE-2016-5597
CVE-2016-5554
CVE-2016-5542
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
cvs rdiff -u -r1.1 -r0 \
pkgsrc/lang/openjdk8/patches/patch-hotspot_test_compiler_native_TestDirtyInt.sh
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.41 pkgsrc/lang/openjdk8/Makefile:1.42
--- pkgsrc/lang/openjdk8/Makefile:1.41 Tue Sep 20 11:12:23 2016
+++ pkgsrc/lang/openjdk8/Makefile Thu Oct 27 13:06:42 2016
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2016/09/20 11:12:23 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2016/10/27 13:06:42 ryoon Exp $
-DISTNAME= openjdk-1.8.102-20160811
-PKGNAME= openjdk8-1.8.102
-PKGREVISION= 1
+DISTNAME= openjdk-1.8.112-20161027
+PKGNAME= openjdk8-1.8.112
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.40 pkgsrc/lang/openjdk8/distinfo:1.41
--- pkgsrc/lang/openjdk8/distinfo:1.40 Mon Aug 15 19:09:38 2016
+++ pkgsrc/lang/openjdk8/distinfo Thu Oct 27 13:06:42 2016
@@ -1,53 +1,13 @@
-$NetBSD: distinfo,v 1.40 2016/08/15 19:09:38 ryoon Exp $
+$NetBSD: distinfo,v 1.41 2016/10/27 13:06:42 ryoon Exp $
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) =
6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
-Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) =
10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) =
80b6585edd8be9e2b384a99532290c0054de7022760a8be8756b0555ea8d88c80709bb0162d48593d76b338be04d246008a14f780051fb460f59f85d76b314ab
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 4ef9bc133ce3fb328f1a6334561806759f6a840d
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 04c158993165acf63015ca931cf3d37a47513d74
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 94a4901ce78cff5439495f80ccd0eb0c2a53358dac8d614c7cf6ec46b452ca3d0b956f45490aef7fcd21b558fe1981a1c7611e801bc1506ff48e1b26b1e00de9
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 26972860 bytes
SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e56a0334417146a4db8c23938a0c19ada3e3847d
RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e9a88901ed05bec37c63f235cc7c4b09aaaf1ba3
SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) =
664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb
Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 629f8d98530067dc78ba6521f37195ab819dc0d7
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 95fca1e15af0f48b529b525262f84b7a3c4f76fd
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) =
6514db6e244214169b85d37ea0a41655822a8db11922574e287802aef684cd753237521a5bffa6be1cd1e26e23c19851a5ea89fea54dbc935485903d524dd152
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 8c809f505435672f478036ddab436acdae032a2eed17698d36d74960fb17bde6f98b460c5904ac4737259e5e59d1a5447973a40085c633687d4b76ac3feda53c
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) =
5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
-SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) =
15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a
-Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
-SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) =
1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
-Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-SHA1 (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 6cf8885353739884775418c596cc769a61ec9e33
-RMD160 (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 09eab23e53f21050653fe67b44af6fa2dfaee368
-SHA512 (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 3f2906154fdbd7ed21de2ce2589c8eca077fae05d8f058afae915da86a4005f7ea6d76f61d9a215a8f0c8a394fed284ac4f10fa79f257d0b33ffb36a8aa5e615
-Size (openjdk7/openjdk-1.8.102-20160811.tar.xz) = 55231136 bytes
+SHA1 (openjdk7/openjdk-1.8.112-20161027.tar.xz) = a1ffe7e3530a4076d2bb2f89b4ed7e964658e851
+RMD160 (openjdk7/openjdk-1.8.112-20161027.tar.xz) = 1dd7f5f586f256b133c802fb30df8d9ecbc6452f
+SHA512 (openjdk7/openjdk-1.8.112-20161027.tar.xz) = 301c1fdc803f227cd4cd2bd5c70a7c895097643ad9f089412bfa5b9b329a2bdef26b1c9e24f4dfd1617ed3a24efb59d05ff876687998ca781ed5922d6f5e01da
+Size (openjdk7/openjdk-1.8.112-20161027.tar.xz) = 55348620 bytes
SHA1 (patch-aa) = fd07ea984cb0127b56a9b591c21c8d4f236fd9fc
SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@@ -59,7 +19,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df1
SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
-SHA1 (patch-common_autoconf_generated-configure.sh) = 16da232d94af0c4f5d9babd694321511636985dc
+SHA1 (patch-common_autoconf_generated-configure.sh) = 065821e257ec2a371cb7f377a42f1fdbd2496524
SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2d350a9b47883b3101e97cafa987104e2c4c54c4
@@ -98,7 +58,6 @@ SHA1 (patch-hotspot_src_share_vm_opto_no
SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
-SHA1 (patch-hotspot_test_compiler_native_TestDirtyInt.sh) = a24016e3594b49db232388974d40e8f4d411edcd
SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92
SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
@@ -119,7 +78,7 @@ SHA1 (patch-jdk_src_solaris_classes_sun_
SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
-SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 3409e21ec151e407053fd510760c8b082f1beda5
+SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 4e4cd6b8aef0011edf176505624ef4f518eb6c7e
SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
Index: pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
diff -u pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.10 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.11
--- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.10 Tue Jul 19 12:32:15 2016
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Thu Oct 27 13:06:42 2016
@@ -1,6 +1,8 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.10 2016/07/19 12:32:15 jperkin Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.11 2016/10/27 13:06:42 ryoon Exp $
---- common/autoconf/generated-configure.sh.orig 2016-05-06 12:11:21.000000000 +0000
+BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
+
+--- common/autoconf/generated-configure.sh.orig 2016-10-26 22:56:42.000000000 +0000
+++ common/autoconf/generated-configure.sh
@@ -8454,9 +8454,9 @@ done
# We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
@@ -15,6 +17,15 @@ $NetBSD: patch-common_autoconf_generated
MAKE_CANDIDATE=""$MAKE""
DESCRIPTION="user supplied MAKE=$MAKE"
+@@ -11755,7 +11755,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+ BOOT_JDK_FOUND=no
+ else
+ # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
+- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
+
+ # Extra M4 quote needed to protect [] in grep expression.
+ FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
@@ -12539,7 +12539,7 @@ fi
# Resolve file symlinks
while test $COUNTER -lt 20; do
@@ -24,7 +35,7 @@ $NetBSD: patch-common_autoconf_generated
# This is not a symbolic link! We are done!
break
fi
-@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
+@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
# Maximum amount of heap memory.
# Maximum stack size.
if test "x$BOOT_JDK_BITS" = x32; then
@@ -154,7 +165,7 @@ $NetBSD: patch-common_autoconf_generated
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -31555,7 +31571,11 @@ $as_echo "$as_me: WARNING: freetype not
+@@ -31555,7 +31571,11 @@ $as_echo "$as_me: WARNING: freetype not
# Allow --with-freetype-lib and --with-freetype-include to override
if test "x$with_freetype_include" != x; then
Index: pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
diff -u pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c:1.2 pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c:1.3
--- pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c:1.2 Wed Jun 10 11:38:51 2015
+++ pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c Thu Oct 27 13:06:42 2016
@@ -1,18 +1,18 @@
-$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.2 2015/06/10 11:38:51 tnn Exp $
+$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.3 2016/10/27 13:06:42 ryoon Exp $
Zones support.
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2015-06-09 13:56:55.000000000 +0000
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2016-10-26 22:56:37.000000000 +0000
+++ jdk/src/solaris/native/java/net/NetworkInterface.c
-@@ -43,6 +43,7 @@
+@@ -42,6 +42,7 @@
#include <fcntl.h>
#include <stropts.h>
#include <sys/sockio.h>
+#include <zone.h>
#endif
- #ifdef __linux__
-@@ -67,14 +68,12 @@
+ #if defined(__linux__)
+@@ -62,14 +63,12 @@
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/sockio.h>
@@ -29,27 +29,27 @@ Zones support.
#endif
#include <net/if_dl.h>
#include <netinet/in_var.h>
-@@ -1749,7 +1748,8 @@ static short getSubnet(JNIEnv *env, int
-
+@@ -1710,7 +1709,8 @@ static short getSubnet(JNIEnv *env, int
+ }
-#define DEV_PREFIX "/dev/"
-+#define NET_DEV_PREFIX "/dev/"
-+#define ZONE_NET_DEV_PREFIX "/dev/net/"
++#define NET_DEV_PREFIX "/dev/"
++#define ZONE_NET_DEV_PREFIX "/dev/net/"
- /**
+ /*
* Solaris specific DLPI code to get hardware address from a device.
-@@ -1766,11 +1766,18 @@ static int getMacFromDevice(JNIEnv *env,
+@@ -1728,9 +1728,18 @@ static int getMacFromDevice
+ char buf[128];
int flags = 0;
- /**
-- * Device is in /dev
+- // Device is in /dev. e.g.: /dev/bge0
+- strcpy(style1dev, DEV_PREFIX);
++ /*
+ * Device is in /dev in global zone / standalone
- * e.g.: /dev/bge0
+ * Device is in /dev/net in a zone
+ * e.g.: /dev/net/net0
- */
-- strcpy(style1dev, DEV_PREFIX);
++ */
+ if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) {
+ strcpy(style1dev, NET_DEV_PREFIX);
+ } else {
@@ -58,5 +58,5 @@ Zones support.
strcat(style1dev, ifname);
+
if ((fd = open(style1dev, O_RDWR)) < 0) {
- /*
- * Can't open it. We probably are missing the privilege.
+ // Can't open it. We probably are missing the privilege.
+ // We'll have to try something else
Home |
Main Index |
Thread Index |
Old Index