summaryrefslogtreecommitdiff
path: root/lang/openjdk7/patches
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2014-05-02 10:48:13 +0000
committerryoon <ryoon@pkgsrc.org>2014-05-02 10:48:13 +0000
commit7062f832fa291d11ad4f5c0970048dea939cdefe (patch)
treea349b6a5814d8a968682c261b0180aceafc3056c /lang/openjdk7/patches
parentc97c1482229d18c1812bfbdff1ee6018dc50d651 (diff)
downloadpkgsrc-7062f832fa291d11ad4f5c0970048dea939cdefe.tar.gz
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
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r--lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java26
-rw-r--r--lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java8
-rw-r--r--lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c11
3 files changed, 18 insertions, 27 deletions
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;
/**