/hg/release/icedtea6-1.7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 4 13:27:52 PDT 2010
changeset f7bdd9aa57c1 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f7bdd9aa57c1
author: Matthias Klose <doko at ubuntu.com>
date: Mon Apr 12 22:37:35 2010 +0200
Fix PR icedtea/461, plugin working for NSS enabled builds working
together with firefox including a private NSS copy
2010-04-12 Matthias Klose <doko at ubuntu.com>
PR icedtea/461
* plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_ld_library_path):
New, filter out paths in LD_LIBRARY_PATH which start with
MOZILLA_FIVE_HOME. (plugin_filter_environment): New, build
environment to pass to the appletviewer process.
(plugin_test_appletviewer, plugin_start_appletviewer): Start the new
process with the filtered environment.
changeset cf888f068f5f in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cf888f068f5f
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Apr 12 17:20:51 2010 -0400
Removed unncessary debug and trace output
2010-04-12 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed
debug printf statement that didn't belong there.
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
(createPanel): Don't print stack traces on InterruptedException.
(handleMessage): Same.
diffstat:
3 files changed, 109 insertions(+), 8 deletions(-)
ChangeLog | 19 +++
plugin/icedteanp/IcedTeaNPPlugin.cc | 88 +++++++++++++-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10 -
diffs (220 lines):
diff -r c67ef4e93e63 -r cf888f068f5f ChangeLog
--- a/ChangeLog Wed Apr 07 14:49:04 2010 -0400
+++ b/ChangeLog Mon Apr 12 17:20:51 2010 -0400
@@ -1,3 +1,22 @@ 2010-04-07 Deepak Bhole <dbhole at redhat.
+2010-04-12 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc (ITNP_New): Removed debug printf
+ statement that didn't belong there.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (createPanel): Don't print stack traces on InterruptedException.
+ (handleMessage): Same.
+
+2010-04-12 Matthias Klose <doko at ubuntu.com>
+
+ PR icedtea/461
+ * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_filter_ld_library_path):
+ New, filter out paths in LD_LIBRARY_PATH which start with
+ MOZILLA_FIVE_HOME.
+ (plugin_filter_environment): New, build environment to pass to the
+ appletviewer process.
+ (plugin_test_appletviewer, plugin_start_appletviewer): Start the new
+ process with the filtered environment.
+
2010-04-07 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and
diff -r c67ef4e93e63 -r cf888f068f5f plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Apr 07 14:49:04 2010 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 17:20:51 2010 -0400
@@ -269,7 +269,6 @@ ITNP_New (NPMIMEType pluginType, NPP ins
NPVariant member_ptr;
browser_functions.getvalue(instance, NPNVWindowNPObject, &window_ptr);
identifier = browser_functions.getstringidentifier("document");
- printf("Looking for %p %p %p (%s)\n", instance, window_ptr, identifier, "document");
if (!browser_functions.hasproperty(instance, window_ptr, identifier))
{
printf("%s not found!\n", "document");
@@ -1412,6 +1411,78 @@ plugin_out_pipe_callback (GIOChannel* so
return FALSE;
}
+// remove all components from LD_LIBRARY_PATH, which start with
+// MOZILLA_FIVE_HOME; firefox has its own NSS based security provider,
+// which conflicts with the one configured in nss.cfg.
+static gchar*
+plugin_filter_ld_library_path(gchar *path_old)
+{
+ gchar *moz_home = g_strdup (g_getenv ("MOZILLA_FIVE_HOME"));
+ gchar *moz_prefix;
+ gchar *path_new;
+ gchar** components;
+ int i1, i2;
+
+ if (moz_home == NULL || path_old == NULL || strlen (path_old) == 0)
+ return path_old;
+ if (g_str_has_suffix (moz_home, "/"))
+ moz_home[strlen (moz_home - 1)] = '\0';
+ moz_prefix = g_strconcat (moz_home, "/", NULL);
+
+ components = g_strsplit (path_old, ":", -1);
+ for (i1 = 0, i2 = 0; components[i1] != NULL; i1++)
+ {
+ if (g_strcmp0 (components[i1], moz_home) == 0
+ || g_str_has_prefix (components[i1], moz_home))
+ components[i2] = components[i1];
+ else
+ components[i2++] = components[i1];
+ }
+ components[i2] = NULL;
+
+ if (i1 > i2)
+ path_new = g_strjoinv (":", components);
+ g_strfreev (components);
+ g_free (moz_home);
+ g_free (moz_prefix);
+ g_free (path_old);
+
+ if (path_new == NULL || strlen (path_new) == 0)
+ {
+ PLUGIN_DEBUG_0ARG("Unset LD_LIBRARY_PATH\n");
+ return NULL;
+ }
+ else
+ {
+ PLUGIN_DEBUG_1ARG ("Set LD_LIBRARY_PATH: %s\n", path_new);
+ return path_new;
+ }
+}
+
+// build the environment to pass to the external plugin process
+static gchar**
+plugin_filter_environment(void)
+{
+ gchar **var_names = g_listenv();
+ gchar **new_env = (gchar**) malloc(sizeof(gchar*) * g_strv_length (var_names));
+ int i_var, i_env;
+
+ for (i_var = 0, i_env = 0; var_names[i_var] != NULL; i_var++)
+ {
+ gchar *env_value = g_strdup (g_getenv (var_names[i_var]));
+
+ if (g_str_has_prefix (var_names[i_var], "LD_LIBRARY_PATH"))
+ env_value = plugin_filter_ld_library_path (env_value);
+ if (env_value != NULL)
+ {
+ new_env[i_env++] = g_strdup_printf ("%s=%s", var_names[i_var], env_value);
+ g_free (env_value);
+ }
+ }
+ new_env[i_env] = NULL;
+ return new_env;
+}
+
static NPError
plugin_test_appletviewer ()
{
@@ -1419,13 +1490,16 @@ plugin_test_appletviewer ()
NPError error = NPERR_NO_ERROR;
gchar* command_line[3] = { NULL, NULL, NULL };
+ gchar** environment;
command_line[0] = g_strdup (appletviewer_executable);
command_line[1] = g_strdup("-version");
command_line[2] = NULL;
+ environment = plugin_filter_environment();
- if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) 0,
+ if (!g_spawn_async (NULL, command_line, environment,
+ (GSpawnFlags) 0,
NULL, NULL, NULL, &channel_error))
{
if (channel_error)
@@ -1439,6 +1513,8 @@ plugin_test_appletviewer ()
PLUGIN_ERROR ("Failed to spawn applet viewer");
error = NPERR_GENERIC_ERROR;
}
+
+ g_strfreev (environment);
g_free (command_line[0]);
command_line[0] = NULL;
@@ -1458,6 +1534,7 @@ plugin_start_appletviewer (ITNPPluginDat
NPError error = NPERR_NO_ERROR;
gchar** command_line;
+ gchar** environment;
if (plugin_debug)
{
@@ -1480,7 +1557,10 @@ plugin_start_appletviewer (ITNPPluginDat
command_line[4] = NULL;
}
- if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD,
+ environment = plugin_filter_environment();
+
+ if (!g_spawn_async (NULL, command_line, environment,
+ (GSpawnFlags) G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &appletviewer_pid, &channel_error))
{
if (channel_error)
@@ -1494,6 +1574,8 @@ plugin_start_appletviewer (ITNPPluginDat
PLUGIN_ERROR ("Failed to spawn applet viewer");
error = NPERR_GENERIC_ERROR;
}
+
+ g_strfreev (environment);
g_free (command_line[0]);
command_line[0] = NULL;
diff -r c67ef4e93e63 -r cf888f068f5f plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Apr 07 14:49:04 2010 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Apr 12 17:20:51 2010 -0400
@@ -184,7 +184,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Thread.sleep(50);
wait += 50;
} catch (InterruptedException ie) {
- ie.printStackTrace();
+ // just wait
}
}
@@ -196,7 +196,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Thread.sleep(50);
PluginDebug.debug("Waiting for applet to initialize...");
} catch (InterruptedException ie) {
- ie.printStackTrace();
+ // just wait
}
}
@@ -629,7 +629,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Thread.sleep(50);
wait += 50;
} catch (InterruptedException ie) {
- ie.printStackTrace();
+ // just wait
}
}
@@ -674,7 +674,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Thread.sleep(50);
wait += 50;
} catch (InterruptedException ie) {
- ie.printStackTrace();
+ // just wait
}
}
@@ -747,7 +747,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
Thread.sleep(50);
PluginDebug.debug("Waiting for applet to initialize...");
} catch (InterruptedException ie) {
- ie.printStackTrace();
+ // just wait
}
}
More information about the distro-pkg-dev
mailing list