/hg/icedtea: 16 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 4 14:38:27 PDT 2010
changeset b9d1edf5ac2c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b9d1edf5ac2c
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Mar 22 15:34:55 2010 -0400
Changed FIFO file location from /tmp/$user-... to
/tmp/icedteaplugin-$user/$pid-...
2010-03-22 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
(start_jvm_if_needed): Change pipe file name format.
(NP_Initialize): Put FIFO pipe in a separate per-user directory.
changeset fbb21c9f53fe in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fbb21c9f53fe
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 04 18:54:00 2010 +0100
Use ICEDTEA_RT in place of system rt.jar. Add additional bootstrap
classes.
2010-03-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (NETX_BOOTSTRAP_CLASSES): Classes
required to bootstrap NetX (only partial so far).
(ICEDTEA_BOOTSTRAP_CLASSES): Include NETX_BOOTSTRAP_CLASSES.
(extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath.
Drop use of SOURCEPATH_DIRS. (pulse-java-class.stamp): Use
ICEDTEA_RT on bootclasspath.
changeset c5f446ebb083 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c5f446ebb083
author: Matthias Klose <doko at ubuntu.com>
date: Wed Mar 31 01:46:55 2010 +0200
acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS
2010-03-31 Matthias Klose <doko at ubuntu.com>
* acinclude.m4 (ENABLE_ZERO_BUILD): Depend on
IT_SET_ARCH_SETTINGS.
changeset 4b10f1a4dd35 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4b10f1a4dd35
author: Matthias Klose <doko at ubuntu.com>
date: Wed Mar 31 10:30:18 2010 +0200
Fix typo in IcedTeaNPPlugin.cc.
2010-03-31 Matthias Klose <doko at ubuntu.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
(plugin_start_appletviewer): Fix typo.
changeset 2e07af30973e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2e07af30973e
author: Matthias Klose <doko at ubuntu.com>
date: Fri Jun 04 19:45:32 2010 +0100
Check for shared LLVM library.
llvm-2.7 offers the option to build a shared LLVM library,
unfortunately llvm-config --libs still returns the list of the
static libraries. The function to check for is randomly choosen.
Maybe there are better candidates, or check for functions for the
required components.
2010-04-04 Matthias Klose <doko at ubuntu.com>
* configure.ac: Check for shared LLVM library.
changeset 5f9796fc1044 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5f9796fc1044
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Apr 06 14:17:02 2010 -0400
Profiled memory usage and implemented proper cleanup for C++ side.
2010-04-06 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
(newMessageOnBus): Update to used string pointer vector (form
strSplit) instead of a string vector. Correctly free memory.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Initialize
message_queue to be a string pointer vector vector instead of a
string vector vector. (newMessageOnBus): Update to
used string pointer vector (form strSplit) instead of a
string vector. Correctly free memory. (sendWindow): Deal
with string pointers instead of strings for message parts.
(eval): Same. (call): Same. (sendString): Same.
(setMember): Same. (sendMember): Same. (finalize):
Same. (queue_processor): Same. Also, free message part
memory after processing.
* plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Change method
signatures to deal with string pointer vectors instead of string
vectors.
* plugin/icedteanp/IcedTeaPluginUtils.cc (stringToJSID): Added
another signature that receives a string pointer.
(strSplit): Return string pointer vector instead of string vector.
(getUTF8String): Change signature to receive string pointer vector
instead of string vector. Update function accordingly.
(getUTF16LEString): Same. (subscribe): Make subscription
atomic. (unSubscribe): Make unsubscription atomic, bound to
same lock as subscribe(). (post): Make list
iteration and processing atomic, bound to same lock as
subscribe and unSubscribe.
* plugin/icedteanp/IcedTeaPluginUtils.h: Added new signature for
stringToJSID and updated signatures for strSplit, getUTF8String and
getUTF16LEString.
* plugin/icedteanp/IcedTeaScriptablePluginObject.cc
(IcedTeaScriptableJavaPackageObject::deAllocate): Implemented
method. (IcedTeaScriptableJavaPackageObject::invalidate):
Same. (IcedTeaScriptableJavaObject::deAllocate): Same.
(IcedTeaScriptableJavaObject::invalidate): Same.
changeset 1a1eb2d55ea9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1a1eb2d55ea9
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Apr 07 14:50:34 2010 +0200
Updated check for shared LLVM library to include svn.
2010-04-07 Xerxes R?nby <xerxes at zafena.se>
* configure.ac: Updated check for shared LLVM library to
include svn.
changeset 69c8a2f36bb0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=69c8a2f36bb0
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Apr 07 14:49:04 2010 -0400
Update debug output string and function/structure names to change
'GCJ' references to ITNP/IcedTea NP Plugin
Remove unnecessary trace print from proxy related code on Java side
2010-04-07 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with
"ITNP", and change other strings to remove reference to GCJ.
* plugin/icedteanp/IcedTeaNPPlugin.h : Renamed GCJPluginData to
ITNPPluginData.
* plugin/icedteanp/IcedTeaPluginUtils.h: Changed debug output to be
prefixed with "ICEDTEA NP PLUGIN" instead of "GCJ PLUGIN".
* plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Don't
print ArrayIndexOutOfBounds traces. Continue to print any others.
changeset ae060fedf818 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ae060fedf818
author: Matthias Klose <doko at ubuntu.com>
date: Fri Jun 04 20:39:48 2010 +0100
Always install nss.cfg, just disable the provider when not
requested.
2010-04-08 Matthias Klose <doko at ubuntu.com>
* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-
debug.stamp): Always install nss.cfg.
* configure.ac: Always make nss.cfg a config file, always
substitute NSS_LIBDIR.
changeset 3977ba007dc7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3977ba007dc7
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Apr 09 01:26:42 2010 +0100
Always attempt pkgconfig detection of NSS, only resulting to the
system library directory hack when necessary.
2010-04-08 Andrew John Hughes <ahughes at redhat.com>
* configure.ac: Move NSS detection to macros in
acinclude.m4.
* acinclude.m4: (IT_OBTAIN_DEFAULT_LIBDIR): Attempts to
discover the system library directory (e.g /usr/lib64)
(IT_LOCATE_NSS): Always try and detect NSS and only resort
to using the system library directory detection if NSS is
not detected.
changeset 20309a51d2dd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=20309a51d2dd
author: Matthias Klose <doko at ubuntu.com>
date: Fri Jun 04 21:09:06 2010 +0100
Be verbose whether the NSS-based security provider is enabled or
disabled by default.
2010-04-10 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ICEDTEA_PATCHES): Always apply icedtea-
nss-6763530.patch. Apply icedtea-nss-not-enabled-config.patch
if the NSS-based security provider is disabled by default.
* Makefile.am: Be verbose wether the NSS-based security provider
is enabled or disabled by default.
* patches/icedtea-nss-not-enabled-config.patch: New.
changeset ad0c8b4a1952 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ad0c8b4a1952
author: Matthias Klose <doko at ubuntu.com>
date: Sat Apr 10 18:00:32 2010 +0200
Fix last ChangeLog entry
changeset 9eae341d6515 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9eae341d6515
author: Matthias Klose <doko at ubuntu.com>
date: Mon Apr 12 13:40:58 2010 +0200
Clarify result message of the NSS check.
2010-04-12 Matthias Klose <doko at ubuntu.com>
* configure.ac: Clarify result message of the NSS check.
changeset 9756dc1e2307 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9756dc1e2307
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 04 21:16:46 2010 +0100
Use NETX_SRCDIR in EXTRA_DIST.
2010-04-12 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Use NETX_SRCDIR in EXTRA_DIST.
changeset 23684054d4dc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=23684054d4dc
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 108556963776 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=108556963776
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:
15 files changed, 637 insertions(+), 302 deletions(-)
ChangeLog | 141 ++++
Makefile.am | 28
acinclude.m4 | 41 +
configure.ac | 39 -
patches/icedtea-nss-not-enabled-config.patch | 13
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 97 +-
plugin/icedteanp/IcedTeaNPPlugin.cc | 326 ++++++----
plugin/icedteanp/IcedTeaNPPlugin.h | 4
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 135 +---
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 16
plugin/icedteanp/IcedTeaPluginUtils.cc | 61 +
plugin/icedteanp/IcedTeaPluginUtils.h | 19
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 7
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 10
plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 2
diffs (truncated from 2105 to 500 lines):
diff -r 788424aa74ed -r 108556963776 ChangeLog
--- a/ChangeLog Fri Mar 19 15:50:36 2010 +0000
+++ b/ChangeLog Mon Apr 12 17:20:51 2010 -0400
@@ -1,3 +1,144 @@ 2010-03-19 Gary Benson <gbenson 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-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Use NETX_SRCDIR in EXTRA_DIST.
+
+2010-04-12 Matthias Klose <doko at ubuntu.com>
+
+ * configure.ac: Clarify result message of the NSS check.
+
+2010-04-10 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Always apply
+ icedtea-nss-6763530.patch. Apply icedtea-nss-not-enabled-config.patch
+ if the NSS-based security provider is disabled by default.
+ * configure.ac: Be verbose whether the NSS-based security provider
+ is enabled or disabled by default.
+ * patches/icedtea-nss-not-enabled-config.patch: New.
+
+2010-04-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * configure.ac: Move NSS detection to macros
+ in acinclude.m4.
+ * acinclude.m4:
+ (IT_OBTAIN_DEFAULT_LIBDIR): Attempts to discover the
+ system library directory (e.g /usr/lib64)
+ (IT_LOCATE_NSS): Always try and detect NSS
+ and only resort to using the system library directory
+ detection if NSS is not detected.
+
+2010-04-08 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
+ Always install nss.cfg.
+ * configure.ac: Always make nss.cfg a config file, always
+ substitute NSS_LIBDIR.
+
+2010-04-07 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: ReplaceAll "GCJ" with "ITNP", and
+ change other strings to remove reference to GCJ.
+ * plugin/icedteanp/IcedTeaNPPlugin.h : Renamed GCJPluginData to
+ ITNPPluginData.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Changed debug output to be
+ prefixed with "ICEDTEA NP PLUGIN" instead of "GCJ PLUGIN".
+ * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java: Don't
+ print ArrayIndexOutOfBounds traces. Continue to print any others.
+
+2010-04-07 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * configure.ac: Updated check for shared LLVM library to include svn.
+
+2010-04-06 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (newMessageOnBus): Update to used string pointer vector (form strSplit)
+ instead of a string vector. Correctly free memory.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Initialize
+ message_queue to be a string pointer vector vector instead of a string
+ vector vector.
+ (newMessageOnBus): Update to used string pointer vector (form strSplit)
+ instead of a string vector. Correctly free memory.
+ (sendWindow): Deal with string pointers instead of strings for message
+ parts.
+ (eval): Same.
+ (call): Same.
+ (sendString): Same.
+ (setMember): Same.
+ (sendMember): Same.
+ (finalize): Same.
+ (queue_processor): Same. Also, free message part memory after processing.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Change method
+ signatures to deal with string pointer vectors instead of string vectors.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc
+ (stringToJSID): Added another signature that receives a string pointer.
+ (strSplit): Return string pointer vector instead of string vector.
+ (getUTF8String): Change signature to receive string pointer vector instead
+ of string vector. Update function accordingly.
+ (getUTF16LEString): Same.
+ (subscribe): Make subscription atomic.
+ (unSubscribe): Make unsubscription atomic, bound to same lock as
+ subscribe().
+ (post): Make list iteration and processing atomic, bound to same lock as
+ subscribe and unSubscribe.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Added new signature for
+ stringToJSID and updated signatures for strSplit, getUTF8String and
+ getUTF16LEString.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc
+ (IcedTeaScriptableJavaPackageObject::deAllocate): Implemented method.
+ (IcedTeaScriptableJavaPackageObject::invalidate): Same.
+ (IcedTeaScriptableJavaObject::deAllocate): Same.
+ (IcedTeaScriptableJavaObject::invalidate): Same.
+
+2010-04-04 Matthias Klose <doko at ubuntu.com>
+
+ * configure.ac: Check for shared LLVM library.
+
+2010-03-31 Matthias Klose <doko at ubuntu.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer):
+ Fix typo.
+
+2010-03-31 Matthias Klose <doko at ubuntu.com>
+
+ * acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS.
+
+2010-03-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (NETX_BOOTSTRAP_CLASSES): Classes required to
+ bootstrap NetX (only partial so far).
+ (ICEDTEA_BOOTSTRAP_CLASSES): Include
+ NETX_BOOTSTRAP_CLASSES.
+ (extra-class-files.stamp): Use ICEDTEA_RT as bootclasspath.
+ Drop use of SOURCEPATH_DIRS.
+ (pulse-java-class.stamp): Use ICEDTEA_RT on bootclasspath.
+
+2010-03-22 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (start_jvm_if_needed): Change pipe file name format.
+ (NP_Initialize): Put FIFO pipe in a separate per-user directory.
+
2010-03-19 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
diff -r 788424aa74ed -r 108556963776 Makefile.am
--- a/Makefile.am Fri Mar 19 15:50:36 2010 +0000
+++ b/Makefile.am Mon Apr 12 17:20:51 2010 -0400
@@ -136,11 +136,20 @@ ICEDTEA_BOOTSTRAP_RESOURCES = \
ICEDTEA_BOOTSTRAP_RESOURCES = \
$(LANGTOOLS)/com/sun/tools/javac/resources
+# PR43578 - java.security.CodeSource.getCodeSigners() missing
+# PR43582 - Missing javax.swing.JTable.setFillsViewportHeight
+# PR43585 - java.security.KeyStore.TrustedCertificateEntry class missing
+NETX_BOOTSTRAP_CLASSES = \
+ $(SHARE)/java/security/CodeSource.java \
+ $(SHARE)/javax/swing/JTable.java \
+ $(SHARE)/java/security/KeyStore.java
+
# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
# PR43389 - javax.management.StandardMBean
ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
- $(SHARE)/javax/management/StandardMBean.java
+ $(SHARE)/javax/management/StandardMBean.java \
+ $(NETX_BOOTSTRAP_CLASSES)
endif
@@ -371,6 +380,8 @@ endif
if ENABLE_NSS
ICEDTEA_PATCHES += patches/icedtea-nss-config.patch
+else
+ICEDTEA_PATCHES += patches/icedtea-nss-not-enabled-config.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -721,7 +732,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr
jconsole.desktop policytool.desktop \
$(JTREG_SRCS) \
HACKING $(PULSEAUDIO_SRCS) fsg.sh \
- $(abs_top_srcdir)/plugin $(top_srcdir)/netx \
+ $(abs_top_srcdir)/plugin $(NETX_SRCDIR) \
hotspot.map autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
@@ -1838,10 +1849,8 @@ if ENABLE_SYSTEMTAP
cp $(abs_top_builddir)/tapset/jstack.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
-if ENABLE_NSS
cp $(abs_top_builddir)/nss.cfg \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-endif
if WITH_TZDATA_DIR
cp $(abs_top_builddir)/tz.properties \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
@@ -1912,10 +1921,8 @@ if ENABLE_SYSTEMTAP
cp $(abs_top_builddir)/tapset/jstack.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
-if ENABLE_NSS
cp $(abs_top_builddir)/nss.cfg \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-endif
if WITH_TZDATA_DIR
cp $(abs_top_builddir)/tz.properties \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
@@ -2135,10 +2142,8 @@ stamps/extra-class-files.stamp: extra-so
stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
mkdir -p extra-lib
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
- -classpath $(ICEDTEA_RT):$(NETX_CLASSES) \
- -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
- -bootclasspath \'\' \
- @extra-source-files.txt
+ -sourcepath $(abs_top_srcdir)/extra \
+ -bootclasspath $(ICEDTEA_RT) @extra-source-files.txt
cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about
find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \
-o -type d -exec chmod 750 '{}' ';'
@@ -2165,8 +2170,7 @@ stamps/pulse-java-class.stamp: $(INITIAL
mkdir -p $(PULSE_JAVA_CLASS_DIR)
(cd $(PULSE_JAVA_JAVA_SRCDIR); \
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
- org/classpath/icedtea/pulseaudio/*.java\
+ -bootclasspath $(ICEDTEA_RT) org/classpath/icedtea/pulseaudio/*.java \
)
cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
diff -r 788424aa74ed -r 108556963776 acinclude.m4
--- a/acinclude.m4 Fri Mar 19 15:50:36 2010 +0000
+++ b/acinclude.m4 Mon Apr 12 17:20:51 2010 -0400
@@ -712,6 +712,7 @@ AC_DEFUN([FIND_TOOL],
AC_DEFUN([ENABLE_ZERO_BUILD],
[
+ AC_REQUIRE([IT_SET_ARCH_SETTINGS])
AC_MSG_CHECKING([whether to use the zero-assembler port])
use_zero=no
AC_ARG_ENABLE([zero],
@@ -1804,6 +1805,46 @@ fi
fi
])
+AC_DEFUN_ONCE([IT_OBTAIN_DEFAULT_LIBDIR],
+[
+dnl find the system library directory
+AC_CACHE_CHECK([for system library directory], [it_cv_default_libdir],
+[
+if test "x$LDD" = x; then
+ it_cv_default_libdir=/usr/lib
+else
+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
+ $CC conftest.c
+ syslibdir=`$LDD a.out | sed -n '/libc\.so./s,.*=> */\(@<:@^/@:>@*\)/.*,\1,p'`
+ rm -f a.out
+ case x${syslibdir} in
+ xlib|xlib64|xlib32|xlibn32) NSS_LIBDIR=/usr/${syslibdir};;
+ *) it_cv_default_libdir=/usr/lib
+ esac
+fi
+])
+AC_SUBST([DEFAULT_LIBDIR], $it_cv_default_libdir)
+])
+
+AC_DEFUN_ONCE([IT_LOCATE_NSS],
+[
+AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR])
+PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no])
+if test "x${NSS_FOUND}" = xno
+then
+ if test "x${ENABLE_NSS}" = "xyes"
+ then
+ AC_MSG_ERROR([Could not find NSS. Either install it or configure using --disable-nss.])
+ else
+ AC_MSG_WARN([Could not find NSS; using $DEFAULT_LIBDIR as its location.])
+ NSS_LIBDIR=$DEFAULT_LIBDIR
+ fi
+else
+ NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss`
+fi
+AC_SUBST(NSS_LIBDIR)
+AC_CONFIG_FILES([nss.cfg])
+])
AC_DEFUN([IT_DIAMOND_CHECK],[
AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [
CLASS=Test.java
diff -r 788424aa74ed -r 108556963776 configure.ac
--- a/configure.ac Fri Mar 19 15:50:36 2010 +0000
+++ b/configure.ac Mon Apr 12 17:20:51 2010 -0400
@@ -36,6 +36,7 @@ if test "x$FASTJAR" = x; then
AC_MSG_ERROR([Can't find fastjar or jar])
fi
AC_SUBST([FASTJAR])
+AC_CHECK_TOOL([LDD], [ldd])
dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
dnl check for it explicitly rather than using AC_PROG_AWK.
FIND_TOOL([GAWK], [gawk])
@@ -124,13 +125,20 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test
AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
-AC_MSG_CHECKING([whether to include elliptic curve cryptography support via NSS])
+IT_LOCATE_NSS
+
+AC_MSG_CHECKING([whether to include the NSS-based security provider])
AC_ARG_ENABLE([nss],
[AS_HELP_STRING([--enable-nss],
[Enable inclusion of NSS security provider])],
[ENABLE_NSS="${enableval}"], [ENABLE_NSS='no'])
AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
-AC_MSG_RESULT(${ENABLE_NSS})
+if test "x${ENABLE_NSS}" = "xyes"
+then
+ AC_MSG_RESULT([enabled by default (edit java.security to disable)])
+else
+ AC_MSG_RESULT([disabled by default (edit java.security to enable)])
+fi
IT_GET_PKGVERSION
IT_GET_LSB_DATA
@@ -414,18 +422,6 @@ then
AC_SUBST(LIBPULSE_LIBS)
fi
-if test "x${ENABLE_NSS}" = "xyes"
-then
- PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no])
- if test "x${NSS_FOUND}" = xno
- then
- AC_MSG_ERROR([Could not find NSS. Either install it or configure using --disable-nss.])
- fi
- NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss`
- AC_SUBST(NSS_LIBDIR)
- AC_CONFIG_FILES([nss.cfg])
-fi
-
if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then
dnl Check for libffi headers and libraries.
PKG_CHECK_MODULES(LIBFFI, libffi,[LIBFFI_FOUND=yes],[LIBFFI_FOUND=no])
@@ -446,7 +442,8 @@ AC_SUBST(LIBFFI_LIBS)
if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
FIND_TOOL([LLVM_CONFIG], [llvm-config])
- llvm_components="engine nativecodegen"
+ llvm_components="jit engine nativecodegen"
+ LLVM_VERSION="`$LLVM_CONFIG --version`"
dnl LLVM_CFLAGS
LLVM_CFLAGS=
for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
@@ -459,6 +456,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
fi
fi
done
+ LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//;s/svn.*//'`"
dnl LLVM_LDFLAGS
LLVM_LDFLAGS=
for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
@@ -470,8 +468,17 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
fi
done
dnl LLVM_LIBS
+ LIBS_SAVED=$LIBS
+ LDFLAGS_SAVED=$LDFLAGS
+ LDFLAGS=$LLVM_LDFLAGS
+ AC_CHECK_LIB(LLVM-$LLVM_VERSION, LLVMGetNextInstruction,LLVM_SHARED_LIB=" -lLLVM-$LLVM_VERSION")
+ LIBS=$LIBS_SAVED
+ LDFLAGS=$LDFLAGS_SAVED
LLVM_LIBS=
for flag in $($LLVM_CONFIG --libs $llvm_components); do
+ if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then
+ continue
+ fi
if echo "$flag" | grep -q '^-l'; then
if test "x$LLVM_LIBS" != "x"; then
LLVM_LIBS="$LLVM_LIBS "
@@ -479,7 +486,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
LLVM_LIBS="$LLVM_LIBS$flag"
fi
done
- LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
+ LLVM_LIBS="$LLVM_LIBS$LLVM_SHARED_LIB"
fi
AC_SUBST(LLVM_CFLAGS)
AC_SUBST(LLVM_LDFLAGS)
diff -r 788424aa74ed -r 108556963776 patches/icedtea-nss-not-enabled-config.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-nss-not-enabled-config.patch Mon Apr 12 17:20:51 2010 -0400
@@ -0,0 +1,13 @@
+--- openjdk.orig/jdk/src/share/lib/security/java.security 2009-08-25 11:43:59.000000000 +0100
++++ openjdk/jdk/src/share/lib/security/java.security 2009-08-27 14:23:54.000000000 +0100
+@@ -51,6 +51,10 @@
+ security.provider.6=com.sun.security.sasl.Provider
+ security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+ security.provider.8=sun.security.smartcardio.SunPCSC
++# the NSS security provider was not enabled for this build; it can be enabled
++# if NSS (libnss3) is available on the machine. The nss.cfg file may need
++# editing to reflect the location of the NSS installation.
++#security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+
+ #
+ # Select the source of seed data for SecureRandom. By default an
diff -r 788424aa74ed -r 108556963776 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Mar 19 15:50:36 2010 +0000
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Mon Apr 12 17:20:51 2010 -0400
@@ -60,21 +60,21 @@ JavaRequestProcessor::newMessageOnBus(co
{
// Anything we are waiting for _MUST_ have and instance id and reference #
- std::vector<std::string>* message_parts = IcedTeaPluginUtilities::strSplit(message, " ");
+ std::vector<std::string*>* message_parts = IcedTeaPluginUtilities::strSplit(message, " ");
- IcedTeaPluginUtilities::printStringVector("JavaRequest::newMessageOnBus:", message_parts);
+ IcedTeaPluginUtilities::printStringPtrVector("JavaRequest::newMessageOnBus:", message_parts);
- if (message_parts->at(0) == "context" && message_parts->at(2) == "reference")
- if (atoi(message_parts->at(1).c_str()) == this->instance && atoi(message_parts->at(3).c_str()) == this->reference)
+ if (*(message_parts->at(0)) == "context" && *(message_parts->at(2)) == "reference")
+ if (atoi(message_parts->at(1)->c_str()) == this->instance && atoi(message_parts->at(3)->c_str()) == this->reference)
{
// Gather the results
// Let's get errors out of the way first
- if (message_parts->at(4).find("Error") == 0)
+ if (!message_parts->at(4)->find("Error"))
{
for (int i=5; i < message_parts->size(); i++)
{
- result->error_msg->append(message_parts->at(i));
+ result->error_msg->append(*(message_parts->at(i)));
result->error_msg->append(" ");
}
@@ -83,78 +83,78 @@ JavaRequestProcessor::newMessageOnBus(co
result->error_occurred = true;
result_ready = true;
}
- else if (message_parts->at(4) == "GetStringUTFChars" ||
- message_parts->at(4) == "GetToStringValue")
+ else if (!message_parts->at(4)->find("GetStringUTFChars") ||
+ !message_parts->at(4)->find("GetToStringValue"))
{
// first item is length, and it is radix 10
- int length = strtol(message_parts->at(5).c_str(), NULL, 10);
+ int length = strtol(message_parts->at(5)->c_str(), NULL, 10);
IcedTeaPluginUtilities::getUTF8String(length, 6 /* start at */, message_parts, result->return_string);
result_ready = true;
}
- else if (message_parts->at(4) == "GetStringChars") // GetStringChars (UTF-16LE/UCS-2)
+ else if (!message_parts->at(4)->find("GetStringChars")) // GetStringChars (UTF-16LE/UCS-2)
{
// first item is length, and it is radix 10
- int length = strtol(message_parts->at(5).c_str(), NULL, 10);
+ int length = strtol(message_parts->at(5)->c_str(), NULL, 10);
IcedTeaPluginUtilities::getUTF16LEString(length, 6 /* start at */, message_parts, result->return_wstring);
result_ready = true;
- } else if ((message_parts->at(4) == "FindClass") ||
- (message_parts->at(4) == "GetClassName") ||
- (message_parts->at(4) == "GetClassID") ||
- (message_parts->at(4) == "GetMethodID") ||
- (message_parts->at(4) == "GetStaticMethodID") ||
- (message_parts->at(4) == "GetObjectClass") ||
- (message_parts->at(4) == "NewObject") ||
- (message_parts->at(4) == "NewStringUTF") ||
- (message_parts->at(4) == "HasPackage") ||
- (message_parts->at(4) == "HasMethod") ||
- (message_parts->at(4) == "HasField") ||
- (message_parts->at(4) == "GetStaticFieldID") ||
- (message_parts->at(4) == "GetFieldID") ||
- (message_parts->at(4) == "GetJavaObject") ||
- (message_parts->at(4) == "IsInstanceOf") ||
- (message_parts->at(4) == "NewArray"))
+ } else if (!message_parts->at(4)->find("FindClass") ||
+ !message_parts->at(4)->find("GetClassName") ||
+ !message_parts->at(4)->find("GetClassID") ||
+ !message_parts->at(4)->find("GetMethodID") ||
+ !message_parts->at(4)->find("GetStaticMethodID") ||
+ !message_parts->at(4)->find("GetObjectClass") ||
+ !message_parts->at(4)->find("NewObject") ||
+ !message_parts->at(4)->find("NewStringUTF") ||
+ !message_parts->at(4)->find("HasPackage") ||
+ !message_parts->at(4)->find("HasMethod") ||
+ !message_parts->at(4)->find("HasField") ||
+ !message_parts->at(4)->find("GetStaticFieldID") ||
+ !message_parts->at(4)->find("GetFieldID") ||
+ !message_parts->at(4)->find("GetJavaObject") ||
+ !message_parts->at(4)->find("IsInstanceOf") ||
+ !message_parts->at(4)->find("NewArray"))
{
- result->return_identifier = atoi(message_parts->at(5).c_str());
- result->return_string->append(message_parts->at(5)); // store it as a string as well, for easy access
More information about the distro-pkg-dev
mailing list