diff options
author | Eric Hameleers <alien@slackware.com> | 2013-06-19 17:14:38 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-06-19 17:14:38 +0000 |
commit | 2be0ffa8ee5f8531b120cd6c047d7055ec7f4430 (patch) | |
tree | 4fed1ec8aa811ec36783cd9c6117eb0ad04b8f15 /icedtea-web/build/icedtea-web_8004584_jdk.patch | |
parent | b1b8d456146c2c20191e1aced44ebb943ba7f2bf (diff) | |
download | asb-2be0ffa8ee5f8531b120cd6c047d7055ec7f4430.tar.gz asb-2be0ffa8ee5f8531b120cd6c047d7055ec7f4430.tar.xz |
Initial revision
Diffstat (limited to 'icedtea-web/build/icedtea-web_8004584_jdk.patch')
-rw-r--r-- | icedtea-web/build/icedtea-web_8004584_jdk.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/icedtea-web/build/icedtea-web_8004584_jdk.patch b/icedtea-web/build/icedtea-web_8004584_jdk.patch new file mode 100644 index 00000000..36544909 --- /dev/null +++ b/icedtea-web/build/icedtea-web_8004584_jdk.patch @@ -0,0 +1,73 @@ +One of the recent fixes to openjdk - 8004584.patch.jdk - have removed potentionaly dangerous +retriving of application context: + + public AppletSecurity() { + reset(); +- mainAppContext = AppContext.getAppContext(); + } + + +By this itw stopped working. + +I have started with simple patch yesterday morning, Adam continued in his timezone and me back today +... merged result is attached:) + +Thanx! + J. +-------------- next part -------------- +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java +--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 +@@ -35,6 +35,8 @@ + import net.sourceforge.jnlp.cache.UpdatePolicy; + import net.sourceforge.jnlp.security.viewer.CertificateViewer; + import net.sourceforge.jnlp.services.ServiceUtil; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + /** + * This is the main entry point for the JNLP client. The main +@@ -113,6 +115,9 @@ + * Launch the JNLP file specified by the command-line arguments. + */ + public static void main(String[] argsIn) { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + args = argsIn; + + if (null != getOption("-viewer")) { +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java +--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 +@@ -234,7 +234,7 @@ + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { +- // ignore it ++ e.printStackTrace(); + } + + doMainAppContextHacks(); +diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java +--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 +@@ -72,6 +72,8 @@ + import java.net.ProxySelector; + import java.util.Enumeration; + import java.util.Properties; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + import net.sourceforge.jnlp.config.DeploymentConfiguration; + import net.sourceforge.jnlp.runtime.JNLPRuntime; +@@ -94,6 +96,9 @@ + */ + public static void main(String args[]) + throws IOException { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { + System.err.println("Invalid pipe names provided. Refusing to proceed."); + System.exit(1); |