/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Apr 12 14:28:08 PDT 2010
changeset e525579f0bf2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e525579f0bf2
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Apr 12 22:03:18 2010 +0100
Improve debugging when using NSS provider.
2010-04-12 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add patch below.
* patches/nss-debug.patch: Improve debugging output from NSS
provider. http://mail.openjdk.java.net/pipermail/security-
dev/2010-April/001771.html
changeset 892500737c11 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=892500737c11
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Apr 12 22:26:57 2010 +0100
PR icedtea/373: Don't try to load MToolkit when specified via
environment variable or property.
2010-04-12 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/373
* Makefile.am: Add patch below.
* patches/icedtea-nomotif-mtoolkit.patch: Backported change
from OpenJDK (pre-b24).
changeset e26a587c0236 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e26a587c0236
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Apr 12 22:27:59 2010 +0100
Merge
diffstat:
6 files changed, 350 insertions(+), 9 deletions(-)
ChangeLog | 33 ++
Makefile.am | 4
patches/icedtea-nomotif-mtoolkit.patch | 168 ++++++++++++++
patches/nss-debug.patch | 56 ++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 88 +++++++
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10
diffs (487 lines):
diff -r 221817e944c5 -r e26a587c0236 ChangeLog
--- a/ChangeLog Mon Apr 12 15:06:09 2010 +0200
+++ b/ChangeLog Mon Apr 12 22:27:59 2010 +0100
@@ -1,3 +1,36 @@ 2010-04-12 Xerxes RÃ¥nby <xerxes at zafen
+2010-04-12 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/373
+ * Makefile.am: Add patch below.
+ * patches/icedtea-nomotif-mtoolkit.patch:
+ Backported change from OpenJDK (pre-b24).
+
+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 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add patch below.
+ * patches/nss-debug.patch:
+ Improve debugging output from NSS provider.
+ http://mail.openjdk.java.net/pipermail/security-dev/2010-April/001771.html
+
+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-12 Xerxes RÃ¥nby <xerxes at zafena.se>
PR icedtea/459:
diff -r 221817e944c5 -r e26a587c0236 Makefile.am
--- a/Makefile.am Mon Apr 12 15:06:09 2010 +0200
+++ b/Makefile.am Mon Apr 12 22:27:59 2010 +0100
@@ -264,6 +264,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-shark-build-hotspot.patch \
patches/icedtea-nomotif-6706121.patch \
patches/icedtea-nomotif.patch \
+ patches/icedtea-nomotif-mtoolkit.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
patches/icedtea-jdk-use-ssize_t.patch \
@@ -337,7 +338,8 @@ ICEDTEA_PATCHES = \
patches/security/20100330/6914823.patch \
patches/security/20100330/6914866.patch \
patches/security/20100330/6932480.patch \
- patches/icedtea-nss-6763530.patch
+ patches/icedtea-nss-6763530.patch \
+ patches/nss-debug.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 221817e944c5 -r e26a587c0236 patches/icedtea-nomotif-mtoolkit.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-nomotif-mtoolkit.patch Mon Apr 12 22:27:59 2010 +0100
@@ -0,0 +1,168 @@
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2009-11-23 13:06:29.271625283 +0000
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-01-15 15:31:25.577635803 +0000
+@@ -81,7 +81,6 @@
+ int32_t len;
+ char *p;
+ JNI_OnLoad_type *JNI_OnLoad_ptr;
+- int32_t motifVersion = 2;
+ struct utsname name;
+ JNIEnv *env = (JNIEnv *)JNU_GetEnv(vm, JNI_VERSION_1_2);
+ void *v;
+@@ -106,7 +105,7 @@
+
+ /*
+ * The code below is responsible for:
+- * 1. Loading appropriate awt library, i.e. motif/libmawt, xawt/libmawt or headless/libwawt
++ * 1. Loading appropriate awt library, i.e. xawt/libmawt or headless/libwawt
+ * 2. Setting "awt.toolkit" system property to use the appropriate Java toolkit class,
+ * (if user has specified the toolkit in env varialble)
+ */
+@@ -115,10 +114,7 @@
+ /* Check if toolkit is specified in env variable */
+ envvar = getenv("AWT_TOOLKIT");
+ if (envvar) {
+- if (strstr(envvar, "MToolkit")) {
+- toolkit = (*env)->NewStringUTF(env, "sun.awt.motif.MToolkit");
+- }
+- else if (strstr(envvar, "XToolkit")) {
++ if (strstr(envvar, "XToolkit")) {
+ toolkit = (*env)->NewStringUTF(env, "sun.awt.X11.XToolkit");
+ }
+ /* If user specified toolkit then set java system property */
+@@ -136,128 +132,15 @@
+ if (AWTIsHeadless()) {
+ strcpy(p, "/headless/libmawt");
+ } else {
+- /* Try java system property */
+- if (!toolkit && propname) {
+- toolkit = JNU_CallStaticMethodByName (env,
+- NULL,
+- "java/lang/System",
+- "getProperty",
+- "(Ljava/lang/String;)Ljava/lang/String;",
+- propname).l;
+- }
+-
+- /* Calculate kind of toolkit */
+- if (toolkit) {
+- const char* toolkit_name = (*env)->GetStringUTFChars(env, toolkit, 0);
+- if (strstr(toolkit_name,"MToolkit")) {
+- XAWT = 0;
+- } else {
+- XAWT = 1;
+- }
+- if (toolkit_name) {
+- (*env)->ReleaseStringUTFChars(env, toolkit, toolkit_name);
+- }
+- } else {
+- /* Default AWT Toolkit on Linux and Solaris is XAWT. */
+- XAWT = 1;
+- }
+-
+- /* Find loaded Motif version and if Xt is loaded */
+- if (!XAWT) {
+- /* Has a Motif library been loaded already, e.g. by an application
+- * embedding java? Netscape plugin?
+- */
+-
+- v = dlsym(RTLD_DEFAULT, "vendorShellWidgetClass");
+- if (v != NULL && dladdr(v, &dlinfo)) {
+-
+- /*
+- * If we are picking up the vendorShellWigetClass from libXt
+- * instead of libXm (it exists in both), then we are very stuck.
+- * Abort.
+- */
+- if (strstr(dlinfo.dli_fname, "libXt.so") != NULL) {
+- xt_before_xm = 1;
+- }
+-
+- if (strstr(dlinfo.dli_fname, "libXm.so.3") != NULL) {
+-#ifdef VERBOSE_AWT_DEBUG
+- fprintf(stderr, "Motif 1.2 detected, using that.\n");
+-#endif
+- motifVersion = 1;
+- }
+- else if (strstr(dlinfo.dli_fname, "libXm.so.4") != NULL) {
+-#ifdef VERBOSE_AWT_DEBUG
+- fprintf(stderr, "Motif 2.1 detected, using that.\n");
+-#endif
+- motifVersion = 2;
+- }
+- }
+-
+- /* Determine desired Motif Version, and set appropriate properties
+- * to load the correct version of libmawt.so
+- */
+- else {
+- uname(&name);
+-
+- if ((strcmp(name.release, "5.5.1") == 0) ||
+- (strcmp(name.release, "5.6") == 0)) {
+-#ifdef VERBOSE_AWT_DEBUG
+- fprintf(stderr, "default to Motif 1.2, os is: %s\n",name.release);
+-#endif
+- motifVersion = 1;
+- } else {
+-#ifdef VERBOSE_AWT_DEBUG
+- fprintf(stderr, "default to Motif 2.1, os is: %s\n",name.release);
+-#endif
+- motifVersion = 2;
+- }
+- if (getenv("_JAVA_AWT_USE_MOTIF_1_2")) {
+-#ifdef VERBOSE_AWT_DEBUG
+- fprintf(stderr,"_JAVA_AWT_USE_MOTIF_1_2 is set, using Motif 1.2\n");
+-#endif
+- motifVersion = 1;
+- } else if (getenv("_JAVA_AWT_USE_MOTIF_2_1")) {
+-#ifdef VERBOSE_AWT_DEBUG
+- fprintf(stderr,"_JAVA_AWT_USE_MOTIF_2_1 is set, using Motif 2.1\n");
+-#endif
+- motifVersion = 2;
+- }
+- }
+- }
+-
+- /* Update library name */
+- if (toolkit) {
+- const char* toolkit_name = (*env)->GetStringUTFChars(env, toolkit, 0);
+- if (strstr(toolkit_name,"MToolkit")) {
+- strcpy(p, (motifVersion != 1) ? "/motif21/libmawt" : "/motif12/libmawt");
+- }
+- else {
+- strcpy(p, "/xawt/libmawt");
+- }
+- if (toolkit_name) {
+- (*env)->ReleaseStringUTFChars(env, toolkit, toolkit_name);
+- }
+- }
+- else {
+- /* Default AWT Toolkit on Linux and Solaris is XAWT. */
+- strcpy(p, "/xawt/libmawt");
+- }
++ /* Default AWT Toolkit on Linux and Solaris is XAWT. */
++ strcpy(p, "/xawt/libmawt");
++ }
+
+- if (toolkit) {
+- (*env)->DeleteLocalRef(env, toolkit);
+- }
+- if (propname) {
+- (*env)->DeleteLocalRef(env, propname);
+- }
+- if (xt_before_xm && !XAWT) {
+- fprintf(stderr, "\nRuntime link error - it appears that "
+- "libXt got loaded before libXm,\n"
+- "which is not allowed.\n");
+- JNU_ThrowByName(env, "java/lang/InternalError",
+- "libXt loaded before libXm");
+- return JNI_VERSION_1_2;
+- }
++ if (toolkit) {
++ (*env)->DeleteLocalRef(env, toolkit);
++ }
++ if (propname) {
++ (*env)->DeleteLocalRef(env, propname);
+ }
+
+ strcat(p, ".so");
diff -r 221817e944c5 -r e26a587c0236 patches/nss-debug.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nss-debug.patch Mon Apr 12 22:27:59 2010 +0100
@@ -0,0 +1,56 @@
+diff -r 5b407bce9940 src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Fri Apr 09 01:08:35 2010 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Mon Apr 12 20:55:39 2010 +0100
+@@ -148,6 +148,7 @@
+ 0x00000115,
+ 0x00000120,
+ 0x00000121,
++ 0x00000130,
+ 0x00000150,
+ 0x00000160,
+ 0x00000170,
+@@ -156,6 +157,7 @@
+ 0x00000191,
+ 0x000001A0,
+ 0x000001A1,
++ 0x00000200,
+ 0x80000000,
+ };
+ String[] errorMessages = new String[] {
+@@ -234,6 +236,7 @@
+ "CKR_WRAPPING_KEY_TYPE_INCONSISTENT",
+ "CKR_RANDOM_SEED_NOT_SUPPORTED",
+ "CKR_RANDOM_NO_RNG",
++ "CKR_DOMAIN_PARAMS_INVALID",
+ "CKR_BUFFER_TOO_SMALL",
+ "CKR_SAVED_STATE_INVALID",
+ "CKR_INFORMATION_SENSITIVE",
+@@ -242,6 +245,7 @@
+ "CKR_CRYPTOKI_ALREADY_INITIALIZED",
+ "CKR_MUTEX_BAD",
+ "CKR_MUTEX_NOT_LOCKED",
++ "CKR_FUNCTION_REJECTED",
+ "CKR_VENDOR_DEFINED",
+ };
+ errorMap = new HashMap<Long,String>();
+diff -r 5b407bce9940 src/share/classes/sun/security/x509/X509Key.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/x509/X509Key.java Fri Apr 09 01:08:35 2010 +0100
++++ openjdk/jdk/src/share/classes/sun/security/x509/X509Key.java Mon Apr 12 20:55:39 2010 +0100
+@@ -171,7 +171,7 @@
+ in.data.getUnalignedBitString());
+
+ } catch (InvalidKeyException e) {
+- throw new IOException("subject key, " + e.getMessage());
++ throw new IOException("subject key, " + e.getMessage(), e);
+ }
+
+ if (in.data.available() != 0)
+@@ -224,7 +224,7 @@
+ } catch (NoSuchAlgorithmException e) {
+ // Return generic X509Key with opaque key data (see below)
+ } catch (InvalidKeySpecException e) {
+- throw new InvalidKeyException(e.getMessage());
++ throw new InvalidKeyException(e.getMessage(), e);
+ }
+
+ /*
diff -r 221817e944c5 -r e26a587c0236 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 15:06:09 2010 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Apr 12 22:27:59 2010 +0100
@@ -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 221817e944c5 -r e26a587c0236 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Apr 12 15:06:09 2010 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Apr 12 22:27:59 2010 +0100
@@ -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