Update to 1.7.55

Changelog: From release notes for Oracle JDK 7u55
   JavaFX Release Notes
   JavaFX is now part of JDK. JDK 7u55 release includes JavaFX version 2.2.55.

   New Features and Changes
   The frequency of some security dialogs has been reduced on systems that run the same RIA multiple times.
   See 8029649.

   Using "*" in Caller-Allowable-Codebase Attribute.

   If a stand-alone asterisk (*), or asterisk as part of a top level domain such as (*.org), is specified as the value for the Caller-Allowable-Codebase attribute, then calls from JavaScript code to the RIA will show a security warning. An option to remember the choice is also provided, and if the user selects the option to remember the choice to run the RIA, no further warning messages are shown for the same RIA, when run with JavaScript from the same source.

   For more information, see JAR File Manifest Attributes for Security documentation.

   See 8033707.

   Disabling Sponsor Offers in the Java Installer

   During the installation of Java, users may be presented with the option of downloading and installing sponsor offers, such as browser add-ons, or security software. With 7u55 and later releases of Java, sponsor offers can be bypassed entirely by using "SPONSORS=0" as an option, when installing Java via the command line:

       Manually download the 32bit online installer for 7u55 to your local machine.
       Click the Windows Start Button/Menu. From the available Menu choices, select the 'Search box' and enter the text "command" in it.
       A list of matches will appear. Select  'Command Prompt' from the available Programs list.
       Navigate to the folder containing the downloaded installer, e.g.:
       cd c:\Users\<username>\Downloads
       To start the installation, in the Command Prompt window type:
       jre-7u55-windows-i586-iftw.exe SPONSORS=0

   The option to disable sponsors will persist across all future updates and re-installs of Java.

   Note that sponsor offers, and therefore this functionality, is only applicable to online 32bit JRE installers and Auto Update mechanisms for the Windows operating system.

   Bug Fixes
   Bug Id  	Category 	Sub-Category 	Description
   JDK-7190349 	client-libs 	2d 	[macosx] Text (Label) is incorrectly drawn with a rotated g2d
   JDK-8013569 	client-libs 	2d 	[macosx] JLabel preferred size incorrect on retina displays with non-default font size
   JDK-6571600 	client-libs 	java.awt 	JNI use results in UnsatisfiedLinkError looking for libmawt.so
   JDK-8025588 	client-libs 	java.awt 	[macosx] Frozen AppKit thread in 7u40
   JDK-5049299 	core-libs 	java.lang 	(process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
   JDK-8020191 	core-libs 	java.lang 	System.getProperty( " os.name " ) returns " Windows NT (unknown) " on Windows 8.1
   JDK-8030822 	core-libs 	java.time 	(tz) Support tzdata2013i
   JDK-8019853 	core-libs 	java.util.logging 	Break logging and AWT circular dependency
   JDK-8026474 	deploy 	deployment_toolkit 	deployJava.js versioncheck doesn't work in IE11
   JDK-8028691 	deploy 	plugin 	loading browser proxy via config script should not trigger JAR download
   JDK-8029649 	deploy 	plugin 	Reduce dialog frequency when app is run multiple times
   JDK-8033705 	deploy 	plugin 	Array out of bounds exception in PluginMain.performSSVValidation
   JDK-8033779 	deploy 	plugin 	JRE 7u51 Plugin Failing to Run Older JRE Version < 1.6.0
   JDK-8029922 	deploy 	webstart 	32-bit only Java Web Start apps fail to run on 32- and 64-bit JRE configs
   JDK-8031579 	deploy 	webstart 	Spurious Missing Manifest Permissions Attribute Warning When Launching versioned Java Web Start app
   JDK-8024830 	hotspot 	compiler 	SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
   JDK-8035618 	other-libs 	corba:rmi-iiop 	Four api/org_omg/CORBA TCK tests fail under plugin only

Revision 1.6 / (download) - annotate - [select for diffs], Wed Apr 30 23:12:48 2014 UTC (35 hours, 33 minutes ago) by ryoon
Branch: MAIN
CVS Tags: HEAD
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

Update to 7.0.55

Changelog:
JavaFX Release Notes
JavaFX is now part of JDK. JDK 7u55 release includes JavaFX version 2.2.55.

New Features and Changes
The frequency of some security dialogs has been reduced on systems that run the same RIA multiple times.
See 8029649.

Using "*" in Caller-Allowable-Codebase Attribute.

If a stand-alone asterisk (*), or asterisk as part of a top level domain such as (*.org), is specified as the value for the Caller-Allowable-Codebase attribute, then calls from JavaScript code to the RIA will show a security warning. An option to remember the choice is also provided, and if the user selects the option to remember the choice to run the RIA, no further warning messages are shown for the same RIA, when run with JavaScript from the same source.

For more information, see JAR File Manifest Attributes for Security documentation.

See 8033707.

Disabling Sponsor Offers in the Java Installer

During the installation of Java, users may be presented with the option of downloading and installing sponsor offers, such as browser add-ons, or security software. With 7u55 and later releases of Java, sponsor offers can be bypassed entirely by using "SPONSORS=0" as an option, when installing Java via the command line:

    Manually download the 32bit online installer for 7u55 to your local machine.
    Click the Windows Start Button/Menu. From the available Menu choices, select the 'Search box' and enter the text "command" in it.
    A list of matches will appear. Select  'Command Prompt' from the available Programs list.
    Navigate to the folder containing the downloaded installer, e.g.:
    cd c:\Users\<username>\Downloads
    To start the installation, in the Command Prompt window type:
    jre-7u55-windows-i586-iftw.exe SPONSORS=0

The option to disable sponsors will persist across all future updates and re-installs of Java.

Note that sponsor offers, and therefore this functionality, is only applicable to online 32bit JRE installers and Auto Update mechanisms for the Windows operating system.

Bug Fixes
Bug Id  	Category 	Sub-Category 	Description
JDK-7190349 	client-libs 	2d 	[macosx] Text (Label) is incorrectly drawn with a rotated g2d
JDK-8013569 	client-libs 	2d 	[macosx] JLabel preferred size incorrect on retina displays with non-default font size
JDK-6571600 	client-libs 	java.awt 	JNI use results in UnsatisfiedLinkError looking for libmawt.so
JDK-8025588 	client-libs 	java.awt 	[macosx] Frozen AppKit thread in 7u40
JDK-5049299 	core-libs 	java.lang 	(process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
JDK-8020191 	core-libs 	java.lang 	System.getProperty( " os.name " ) returns " Windows NT (unknown) " on Windows 8.1
JDK-8030822 	core-libs 	java.time 	(tz) Support tzdata2013i
JDK-8019853 	core-libs 	java.util.logging 	Break logging and AWT circular dependency
JDK-8026474 	deploy 	deployment_toolkit 	deployJava.js versioncheck doesn't work in IE11
JDK-8028691 	deploy 	plugin 	loading browser proxy via config script should not trigger JAR download
JDK-8029649 	deploy 	plugin 	Reduce dialog frequency when app is run multiple times
JDK-8033705 	deploy 	plugin 	Array out of bounds exception in PluginMain.performSSVValidation
JDK-8033779 	deploy 	plugin 	JRE 7u51 Plugin Failing to Run Older JRE Version < 1.6.0
JDK-8029922 	deploy 	webstart 	32-bit only Java Web Start apps fail to run on 32- and 64-bit JRE configs
JDK-8031579 	deploy 	webstart 	Spurious Missing Manifest Permissions Attribute Warning When Launching versioned Java Web Start app
JDK-8024830 	hotspot 	compiler 	SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
JDK-8035618 	other-libs 	corba:rmi-iiop 	Four api/org_omg/CORBA TCK tests fail under plugin only

6 files changed, 30 insertions, 70 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index aa7cc2e7e39..e6a4b7620a5 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2014/03/06 18:57:56 abs Exp $
+# $NetBSD: Makefile,v 1.65 2014/05/02 10:48:13 ryoon Exp $
 
-DISTNAME=	openjdk-1.7.51-20140125
-PKGNAME=	openjdk7-1.7.51
-PKGREVISION=	2
+DISTNAME=	openjdk-1.7.55-20140501
+PKGNAME=	openjdk7-1.7.55
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index 058bc49fc1e..6faa4ecb58c 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2014/01/25 13:53:22 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2014/05/02 10:48:13 ryoon Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -361,6 +361,7 @@ ${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
 java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so
 java/openjdk7/jre/lib/${ARCH}/jexec
 java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
+java/openjdk7/jre/lib/${ARCH}/jspawnhelper
 java/openjdk7/jre/lib/${ARCH}/jvm.cfg
 java/openjdk7/jre/lib/${ARCH}/libattach.diz
 java/openjdk7/jre/lib/${ARCH}/libattach.so
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 4d275fcff33..0e5e3634c0f 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,44 +1,14 @@
-$NetBSD: distinfo,v 1.43 2014/03/06 18:57:56 abs Exp $
+$NetBSD: distinfo,v 1.44 2014/05/02 10:48:13 ryoon Exp $
 
-SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
-RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
-Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
 SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922
 RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346
 Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
 SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
 RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
 Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4
-RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe
-Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 08d0003078162c038ed67bb3d59cd2e4073cf4dd
-RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 4ea4bd473635d99d9740c10bb815e019f7ad09d5
-Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 3422188 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461
-RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce
-Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = e9153bab724d415b30b42e320a878aeceb71ed64
-RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 8d9742b9288ed5eb965bc7fd50fe709f047665af
-Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 3486566 bytes
 SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 60ff45ed4c027209fc855919227bb175c60ede08
 RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = e98c534a6804ecd794d1ffd8975e0c705cf8938c
 Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 4082640 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = baa7e0b2010c1cf918a88654b36db39935e532a4
-RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 791f8db986905f2477adcb1784fea957cd9501d2
-Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = e18704c72646ef4f66e37ea7a2feb8dad9008079
-RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = b661b7a434d7d3c27614a2527b0fb2ed065d1f05
-Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = d7994e2a485c3e4eca44e81f4215bb4c35b54d04
-RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = bb9ba4fc83ec276c5e8decd53a6523eca1f6b819
-Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = b9445fa4cc4674ba8b9330e45ae65c597f5fca10
-RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = aa2443fa202f3ed8694b6d0e4031622b5da52283
-Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = aa44be237fac1b7c9b4044ea32cab9a0c2fb3ab2
-RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 5422564d6a5ba590b0906fdbb9de20091d7dabf2
-Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 21676584 bytes
 SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
@@ -57,9 +27,9 @@ Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
 SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
 RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
 Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
-SHA1 (openjdk7/openjdk-1.7.51-20140125.tar.bz2) = 83b3653bda27397431ed12c034a19d523d221f57
-RMD160 (openjdk7/openjdk-1.7.51-20140125.tar.bz2) = c22952181c72ff8d6afeab2199731bc60baeaf80
-Size (openjdk7/openjdk-1.7.51-20140125.tar.bz2) = 51852944 bytes
+SHA1 (openjdk7/openjdk-1.7.55-20140501.tar.bz2) = de0327fa8ee64178f17bb8e856aed467ee744185
+RMD160 (openjdk7/openjdk-1.7.55-20140501.tar.bz2) = b54ef0dc82bc543edfc84725eaa8d757942c393b
+Size (openjdk7/openjdk-1.7.55-20140501.tar.bz2) = 51867898 bytes
 SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
@@ -116,7 +86,6 @@ SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c4
 SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
-SHA1 (patch-hotspot_src_share_vm_code_relocInfo.hpp) = c02b2bb64129113b5812feb02033e12969bafe04
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
@@ -155,10 +124,10 @@ SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da30
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb
 SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4
 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716
-SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = d25056be8339b0afde8b1e83c5ff32a0466c16d7
-SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 86ce16bd53c85bc3830ef3f21d52f9a8107b5350
+SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 265d9f401eff6a39d607c8c8a14ecb56c089ed44
+SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 02e51e702868e1cea4a2628eccbcaa81f231efce
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
-SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = d509a6ed567493024e3ce5de8986912da99f4a9d
+SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc695a14cab51fa7089eb2a0a04b
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
 SHA1 (patch-jdk_test_Makefile) = 62618854251a5fe139310fc443af3f2f0103f63c
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java
index c2340f036c6..0659d7f92c9 100644
--- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java
@@ -1,23 +1,13 @@
-$NetBSD: patch-jdk_src_solaris_classes_sun_net_PortConfig.java,v 1.1 2014/01/25 13:53:22 ryoon Exp $
+$NetBSD: patch-jdk_src_solaris_classes_sun_net_PortConfig.java,v 1.2 2014/05/02 10:48:13 ryoon Exp $
 
---- jdk/src/solaris/classes/sun/net/PortConfig.java.orig	2014-01-25 07:34:09.000000000 +0000
+--- jdk/src/solaris/classes/sun/net/PortConfig.java.orig	2014-05-01 13:11:40.000000000 +0000
 +++ jdk/src/solaris/classes/sun/net/PortConfig.java
-@@ -55,6 +55,18 @@ public final class PortConfig {
-                     } else if (os.contains("OS X")) {
+@@ -52,7 +52,7 @@ public final class PortConfig {
+                     } else if (os.startsWith("SunOS")) {
+                         defaultLower = 32768;
+                         defaultUpper = 65535;
+-                    } else if (os.contains("OS X") || os.endsWith("BSD")) {
++                    } else if (os.contains("OS X") || os.endsWith("BSD") || os.contains("DragonFly")) {
                          defaultLower = 49152;
                          defaultUpper = 65535;
-+                    } else if (os.startsWith("DragonFly")) {
-+                        defaultLower = 32768;
-+                        defaultUpper = 65535;
-+                    } else if (os.startsWith("FreeBSD")) {
-+                        defaultLower = 32768;
-+                        defaultUpper = 65535;
-+                    } else if (os.startsWith("NetBSD")) {
-+                        defaultLower = 32768;
-+                        defaultUpper = 65535;
-+                    } else if (os.startsWith("OpenBSD")) {
-+                        defaultLower = 32768;
-+                        defaultUpper = 65535;
                      } else {
-                         throw new InternalError(
-                             "sun.net.PortConfig: unknown OS");
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java
index 02a0e58f9f9..b91b402018b 100644
--- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java
@@ -1,16 +1,16 @@
-$NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java,v 1.1 2013/12/30 07:02:28 ryoon Exp $
+$NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java,v 1.2 2014/05/02 10:48:13 ryoon Exp $
 
 * Fix apache-tomcat7's error, "java.lang.InternalError: platform not recognized"
   patch is from http://www.freebsd.org/cgi/query-pr.cgi?pr=183389
 
---- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig	2013-06-25 14:32:43.000000000 +0000
+--- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig	2014-05-01 13:11:40.000000000 +0000
 +++ jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
 @@ -50,7 +50,7 @@ public class DefaultAsynchronousChannelP
              return new SolarisAsynchronousChannelProvider();
          if (osname.equals("Linux"))
              return new LinuxAsynchronousChannelProvider();
--        if (osname.contains("OS X"))
-+        if (osname.contains("OS X") || osname.contains("DragonFly") || osname.contains("FreeBSD") || osname.contains("NetBSD") || osname.contains("OpenBSD"))
+-        if (osname.contains("OS X") || osname.endsWith("BSD"))
++        if (osname.contains("OS X") || osname.endsWith("BSD") || osname.contains("DragonFly"))
              return new BsdAsynchronousChannelProvider();
          throw new InternalError("platform not recognized");
      }
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
index 64060006f94..90ab7abc45d 100644
--- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.2 2014/01/02 01:16:35 ryoon Exp $
+$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.3 2014/05/02 10:48:13 ryoon Exp $
 
 Zones support.
 
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2014-01-01 05:53:43.000000000 +0000
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2014-05-01 13:11:40.000000000 +0000
 +++ jdk/src/solaris/native/java/net/NetworkInterface.c
 @@ -43,6 +43,7 @@
  #include <fcntl.h>
@@ -12,7 +12,7 @@ Zones support.
  #endif
  
  #ifdef __linux__
-@@ -60,13 +61,11 @@
+@@ -60,14 +61,12 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
  #include <sys/sockio.h>
@@ -23,12 +23,13 @@ Zones support.
 -#elif defined(__OpenBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__)
  #include <netinet/if_ether.h>
+ #include <netinet6/in6_var.h>
 -#elif defined(__NetBSD__)
 -#include <net/if_ether.h>
  #endif
  #include <net/if_dl.h>
  #include <netinet/in_var.h>
-@@ -1528,7 +1527,8 @@ static short getSubnet(JNIEnv *env, int 
+@@ -1529,7 +1528,8 @@ static short getSubnet(JNIEnv *env, int 
  
  
  
@@ -38,7 +39,7 @@ Zones support.
  
  /**
   * Solaris specific DLPI code to get hardware address from a device.
-@@ -1545,11 +1545,18 @@ static int getMacFromDevice(JNIEnv *env,
+@@ -1546,11 +1546,18 @@ static int getMacFromDevice(JNIEnv *env,
      int flags = 0;
  
     /**