/hg/icedtea: Use a proper target for building the Java plugin so...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Nov 10 21:09:46 PST 2009
changeset a2c6e1cbc3cf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a2c6e1cbc3cf
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 11 05:14:10 2009 +0000
Use a proper target for building the Java plugin source, rather than
copying files.
2009-11-10 Andrew John Hughes <ahughes at redhat.com>
* plugin/icedtea/netscape/javascript/JSException.java,
* plugin/icedtea/netscape/javascript/JSObject.java,
* plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java,
* plugin/icedtea/netscape/javascript/JSProxy.java,
* plugin/icedtea/netscape/javascript/JSRunnable.java,
* plugin/icedtea/netscape/javascript/JSUtil.java,
* plugin/icedtea/sun/applet/AppletSecurityContextManager.java,
* plugin/icedtea/sun/applet/GetMemberPluginCallRequest.java,
* plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java,
* plugin/icedtea/sun/applet/JavaConsole.java,
* plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java,
* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
* plugin/icedtea/sun/applet/PluginAppletViewer.java,
* plugin/icedtea/sun/applet/PluginCallRequest.java,
* plugin/icedtea/sun/applet/PluginCallRequestFactory.java,
* plugin/icedtea/sun/applet/PluginClassLoader.java,
* plugin/icedtea/sun/applet/PluginCookieInfoRequest.java,
* plugin/icedtea/sun/applet/PluginCookieManager.java,
* plugin/icedtea/sun/applet/PluginDebug.java,
* plugin/icedtea/sun/applet/PluginException.java,
* plugin/icedtea/sun/applet/PluginMain.java,
* plugin/icedtea/sun/applet/PluginMessageConsumer.java,
* plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java,
* plugin/icedtea/sun/applet/PluginObjectStore.java,
* plugin/icedtea/sun/applet/PluginProxyInfoRequest.java,
* plugin/icedtea/sun/applet/PluginProxySelector.java,
* plugin/icedtea/sun/applet/PluginStreamHandler.java,
* plugin/icedtea/sun/applet/RequestQueue.java,
* plugin/icedtea/sun/applet/TestEnv.java,
* plugin/icedtea/sun/applet/VoidPluginCallRequest.java: Moved
to java subdirectory.
* Makefile.am: Add javax/swing/plaf/basic to list of copy dirs
to work around PR42003. Set LIVECONNECT_DIR to just
the directories, not jar syntax. Rename NPPLUGIN_DIR to
PLUGIN_DIR and add for both plugins. Add new sources patch.
Set ALT_LIVECONNECT_DIST to new liveconnect build directory.
(clean-local): No need to remove rt/netscape, now part of
clean-liveconnect.stamp (patch.stamp): Drop plugin source
file copying. (clean-patch): Remove plugin copy deletion.
(icedtea.stamp): Depend on liveconnect-dist.stamp, not
liveconnect.stamp. (icedtea-debug.stamp): Likewise.
(icedtea-boot.stamp): Likewise. (liveconnect-source-
files.txt): New target to find liveconnect source files.
(liveconnect.stamp): Now builds the liveconnect source code.
(liveconnect-dist.stamp): Like netx-dist.stamp, creates
classes.jar and src.zip for importing Liveconnect binaries
and source into the OpenJDK build.
* NEWS: Add list of security updates.
* patches/icedtea-liveconnect-dist.patch: Include sun/applet
and import sources too.
* plugin/icedtea/java/netscape/javascript/JSException.java,
* plugin/icedtea/java/netscape/javascript/JSObject.java,
* plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.jav
a,
* plugin/icedtea/java/netscape/javascript/JSProxy.java,
* plugin/icedtea/java/netscape/javascript/JSRunnable.java,
* plugin/icedtea/java/netscape/javascript/JSUtil.java,
* plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java,
* plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java,
* plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java,
* plugin/icedtea/java/sun/applet/JavaConsole.java,
* plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java,
* plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java,
* plugin/icedtea/java/sun/applet/PluginAppletViewer.java,
* plugin/icedtea/java/sun/applet/PluginCallRequest.java,
* plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java,
* plugin/icedtea/java/sun/applet/PluginClassLoader.java,
* plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java,
* plugin/icedtea/java/sun/applet/PluginCookieManager.java,
* plugin/icedtea/java/sun/applet/PluginDebug.java,
* plugin/icedtea/java/sun/applet/PluginException.java,
* plugin/icedtea/java/sun/applet/PluginMain.java,
* plugin/icedtea/java/sun/applet/PluginMessageConsumer.java,
* plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java,
* plugin/icedtea/java/sun/applet/PluginObjectStore.java,
* plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java,
* plugin/icedtea/java/sun/applet/PluginProxySelector.java,
* plugin/icedtea/java/sun/applet/PluginStreamHandler.java,
* plugin/icedtea/java/sun/applet/RequestQueue.java,
* plugin/icedtea/java/sun/applet/TestEnv.java,
* plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java:
Moved from plugin/icedtea.
diffstat:
65 files changed, 7223 insertions(+), 7078 deletions(-)
ChangeLog | 90
Makefile.am | 85
NEWS | 16
patches/icedtea-liveconnect-dist.patch | 27
patches/icedtea-sources.patch | 17
plugin/icedtea/java/netscape/javascript/JSException.java | 140
plugin/icedtea/java/netscape/javascript/JSObject.java | 290 +
plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java | 47
plugin/icedtea/java/netscape/javascript/JSProxy.java | 58
plugin/icedtea/java/netscape/javascript/JSRunnable.java | 72
plugin/icedtea/java/netscape/javascript/JSUtil.java | 59
plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java | 71
plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java | 76
plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java | 75
plugin/icedtea/java/sun/applet/JavaConsole.java | 365 +
plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java | 241 +
plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java | 1311 ++++++
plugin/icedtea/java/sun/applet/PluginAppletViewer.java | 1990 ++++++++++
plugin/icedtea/java/sun/applet/PluginCallRequest.java | 85
plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java | 62
plugin/icedtea/java/sun/applet/PluginClassLoader.java | 51
plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java | 82
plugin/icedtea/java/sun/applet/PluginCookieManager.java | 88
plugin/icedtea/java/sun/applet/PluginDebug.java | 51
plugin/icedtea/java/sun/applet/PluginException.java | 53
plugin/icedtea/java/sun/applet/PluginMain.java | 319 +
plugin/icedtea/java/sun/applet/PluginMessageConsumer.java | 119
plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java | 121
plugin/icedtea/java/sun/applet/PluginObjectStore.java | 132
plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java | 85
plugin/icedtea/java/sun/applet/PluginProxySelector.java | 195
plugin/icedtea/java/sun/applet/PluginStreamHandler.java | 479 ++
plugin/icedtea/java/sun/applet/RequestQueue.java | 77
plugin/icedtea/java/sun/applet/TestEnv.java | 172
plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java | 67
plugin/icedtea/netscape/javascript/JSException.java | 140
plugin/icedtea/netscape/javascript/JSObject.java | 290 -
plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java | 47
plugin/icedtea/netscape/javascript/JSProxy.java | 58
plugin/icedtea/netscape/javascript/JSRunnable.java | 72
plugin/icedtea/netscape/javascript/JSUtil.java | 59
plugin/icedtea/sun/applet/AppletSecurityContextManager.java | 71
plugin/icedtea/sun/applet/GetMemberPluginCallRequest.java | 76
plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java | 75
plugin/icedtea/sun/applet/JavaConsole.java | 365 -
plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java | 241 -
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java | 1311 ------
plugin/icedtea/sun/applet/PluginAppletViewer.java | 1990 ----------
plugin/icedtea/sun/applet/PluginCallRequest.java | 85
plugin/icedtea/sun/applet/PluginCallRequestFactory.java | 62
plugin/icedtea/sun/applet/PluginClassLoader.java | 51
plugin/icedtea/sun/applet/PluginCookieInfoRequest.java | 82
plugin/icedtea/sun/applet/PluginCookieManager.java | 88
plugin/icedtea/sun/applet/PluginDebug.java | 51
plugin/icedtea/sun/applet/PluginException.java | 53
plugin/icedtea/sun/applet/PluginMain.java | 319 -
plugin/icedtea/sun/applet/PluginMessageConsumer.java | 119
plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java | 121
plugin/icedtea/sun/applet/PluginObjectStore.java | 132
plugin/icedtea/sun/applet/PluginProxyInfoRequest.java | 85
plugin/icedtea/sun/applet/PluginProxySelector.java | 195
plugin/icedtea/sun/applet/PluginStreamHandler.java | 479 --
plugin/icedtea/sun/applet/RequestQueue.java | 77
plugin/icedtea/sun/applet/TestEnv.java | 172
plugin/icedtea/sun/applet/VoidPluginCallRequest.java | 67
diffs (truncated from 14724 to 500 lines):
diff -r 9eb43c172d5b -r a2c6e1cbc3cf ChangeLog
--- a/ChangeLog Wed Nov 04 22:07:39 2009 +0000
+++ b/ChangeLog Wed Nov 11 05:14:10 2009 +0000
@@ -1,3 +1,93 @@ 2009-11-04 Andrew John Hughes <ahughes
+2009-11-10 Andrew John Hughes <ahughes at redhat.com>
+
+ * plugin/icedtea/netscape/javascript/JSException.java,
+ * plugin/icedtea/netscape/javascript/JSObject.java,
+ * plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java,
+ * plugin/icedtea/netscape/javascript/JSProxy.java,
+ * plugin/icedtea/netscape/javascript/JSRunnable.java,
+ * plugin/icedtea/netscape/javascript/JSUtil.java,
+ * plugin/icedtea/sun/applet/AppletSecurityContextManager.java,
+ * plugin/icedtea/sun/applet/GetMemberPluginCallRequest.java,
+ * plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java,
+ * plugin/icedtea/sun/applet/JavaConsole.java,
+ * plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java,
+ * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
+ * plugin/icedtea/sun/applet/PluginAppletViewer.java,
+ * plugin/icedtea/sun/applet/PluginCallRequest.java,
+ * plugin/icedtea/sun/applet/PluginCallRequestFactory.java,
+ * plugin/icedtea/sun/applet/PluginClassLoader.java,
+ * plugin/icedtea/sun/applet/PluginCookieInfoRequest.java,
+ * plugin/icedtea/sun/applet/PluginCookieManager.java,
+ * plugin/icedtea/sun/applet/PluginDebug.java,
+ * plugin/icedtea/sun/applet/PluginException.java,
+ * plugin/icedtea/sun/applet/PluginMain.java,
+ * plugin/icedtea/sun/applet/PluginMessageConsumer.java,
+ * plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java,
+ * plugin/icedtea/sun/applet/PluginObjectStore.java,
+ * plugin/icedtea/sun/applet/PluginProxyInfoRequest.java,
+ * plugin/icedtea/sun/applet/PluginProxySelector.java,
+ * plugin/icedtea/sun/applet/PluginStreamHandler.java,
+ * plugin/icedtea/sun/applet/RequestQueue.java,
+ * plugin/icedtea/sun/applet/TestEnv.java,
+ * plugin/icedtea/sun/applet/VoidPluginCallRequest.java:
+ Moved to java subdirectory.
+ * Makefile.am:
+ Add javax/swing/plaf/basic to list of copy dirs to
+ work around PR42003.
+ Set LIVECONNECT_DIR to just the directories, not
+ jar syntax. Rename NPPLUGIN_DIR to PLUGIN_DIR
+ and add for both plugins. Add new sources patch.
+ Set ALT_LIVECONNECT_DIST to new liveconnect build
+ directory.
+ (clean-local): No need to remove rt/netscape, now
+ part of clean-liveconnect.stamp
+ (patch.stamp): Drop plugin source file copying.
+ (clean-patch): Remove plugin copy deletion.
+ (icedtea.stamp): Depend on liveconnect-dist.stamp,
+ not liveconnect.stamp.
+ (icedtea-debug.stamp): Likewise.
+ (icedtea-boot.stamp): Likewise.
+ (liveconnect-source-files.txt): New target to find
+ liveconnect source files.
+ (liveconnect.stamp): Now builds the liveconnect source code.
+ (liveconnect-dist.stamp): Like netx-dist.stamp, creates
+ classes.jar and src.zip for importing Liveconnect binaries
+ and source into the OpenJDK build.
+ * NEWS: Add list of security updates.
+ * patches/icedtea-liveconnect-dist.patch:
+ Include sun/applet and import sources too.
+ * plugin/icedtea/java/netscape/javascript/JSException.java,
+ * plugin/icedtea/java/netscape/javascript/JSObject.java,
+ * plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java,
+ * plugin/icedtea/java/netscape/javascript/JSProxy.java,
+ * plugin/icedtea/java/netscape/javascript/JSRunnable.java,
+ * plugin/icedtea/java/netscape/javascript/JSUtil.java,
+ * plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java,
+ * plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java,
+ * plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java,
+ * plugin/icedtea/java/sun/applet/JavaConsole.java,
+ * plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java,
+ * plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java,
+ * plugin/icedtea/java/sun/applet/PluginAppletViewer.java,
+ * plugin/icedtea/java/sun/applet/PluginCallRequest.java,
+ * plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java,
+ * plugin/icedtea/java/sun/applet/PluginClassLoader.java,
+ * plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java,
+ * plugin/icedtea/java/sun/applet/PluginCookieManager.java,
+ * plugin/icedtea/java/sun/applet/PluginDebug.java,
+ * plugin/icedtea/java/sun/applet/PluginException.java,
+ * plugin/icedtea/java/sun/applet/PluginMain.java,
+ * plugin/icedtea/java/sun/applet/PluginMessageConsumer.java,
+ * plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java,
+ * plugin/icedtea/java/sun/applet/PluginObjectStore.java,
+ * plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java,
+ * plugin/icedtea/java/sun/applet/PluginProxySelector.java,
+ * plugin/icedtea/java/sun/applet/PluginStreamHandler.java,
+ * plugin/icedtea/java/sun/applet/RequestQueue.java,
+ * plugin/icedtea/java/sun/applet/TestEnv.java,
+ * plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java:
+ Moved from plugin/icedtea.
+
2009-11-04 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 9eb43c172d5b -r a2c6e1cbc3cf Makefile.am
--- a/Makefile.am Wed Nov 04 22:07:39 2009 +0000
+++ b/Makefile.am Wed Nov 11 05:14:10 2009 +0000
@@ -86,6 +86,7 @@ ICEDTEA_BOOTSTRAP_DIRS = \
$(JDK_SHARE)/javax/script \
$(JDK_SHARE)/javax/security/auth/kerberos \
$(JDK_SHARE)/javax/security/sasl \
+ $(JDK_SHARE)/javax/swing/plaf/basic \
$(JDK_SHARE)/sun/awt/ \
$(JDK_SHARE)/sun/rmi/rmic \
$(JDK_SHARE)/sun/tools/java \
@@ -185,16 +186,17 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlu
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
-NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
+LIVECONNECT_DIR = sun/applet netscape
+PLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
JNLP_ABOUT_TARGET = extra-lib/about.jar
else
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
-JNLP_ABOUT_TARGET = extra-lib/about.jar
+LIVECONNECT_DIR = sun/applet netscape
+PLUGIN_DIR=$(abs_top_srcdir)/plugin/icedtea
+JNLP_ABOUT_TARGET = extra-lib/about.jar
else
ICEDTEAPLUGIN_CLEAN =
ICEDTEAPLUGIN_TARGET =
@@ -321,7 +323,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-xml-encodinginfo.patch \
patches/icedtea-cc-interp-backedge.patch \
patches/icedtea-netx.patch \
- patches/icedtea-disable-intree-ec.patch
+ patches/icedtea-disable-intree-ec.patch \
+ patches/icedtea-sources.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -480,7 +483,7 @@ ICEDTEA_ENV = \
DISTRIBUTION_ID="$(DIST_ID)" \
ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
- ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
+ ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
DISABLE_INTREE_EC="true" \
@@ -707,7 +710,6 @@ clean-local: clean-jtreg clean-jtreg-rep
if [ -e lib ]; then \
rmdir lib ; \
fi
- rm -rf rt/netscape
rm -f jni-common.o
if ADD_ZERO_BUILD
rm -rf zerovm
@@ -1423,19 +1425,6 @@ stamps/patch.stamp: stamps/patch-fsg.sta
fi ; \
mv stamps/patch.stamp.tmp stamps/patch.stamp
-if ENABLE_NPPLUGIN
- cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
- mkdir -p rt
- cp -a $(abs_top_srcdir)/plugin/icedteanp/java/netscape rt/
-else
-if ENABLE_PLUGIN
- cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
- mkdir -p rt
- cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
- chmod -R ug+w rt
-endif
-endif
-
clean-patch:
if [ -e stamps/patch.stamp ] ; then \
all_patches_ok=yes; \
@@ -1468,11 +1457,6 @@ clean-patch:
fi ; \
rm -f stamps/patch.stamp ; \
fi
- rm -rf rt/netscape
- for file in plugin/icedtea/sun/applet/*java ; \
- do \
- rm -f openjdk/jdk/src/share/classes/sun/applet/`basename $file` ; \
- done ;
stamps/versioning.stamp: stamps/patch.stamp
cp openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
@@ -1694,7 +1678,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp stamps/overlay.stamp \
stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp stamps/liveconnect.stamp stamps/pulse-java.stamp
+ stamps/netx-dist.stamp stamps/liveconnect-dist.stamp stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1704,9 +1688,9 @@ stamps/icedtea.stamp: stamps/bootstrap-d
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
if ENABLE_NPPLUGIN
- cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaNPPlugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaNPPlugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
if ENABLE_PLUGIN
@@ -1769,7 +1753,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp stamps/overlay.stamp \
stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp stamps/liveconnect.stamp stamps/pulse-java.stamp
+ stamps/netx-dist.stamp stamps/liveconnect-dist.stamp stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1870,7 +1854,7 @@ clean-icedtea-debug-stage2:
stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
stamps/download.stamp stamps/extract.stamp stamps/overlay.stamp \
- stamps/plugs.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+ stamps/plugs.stamp stamps/netx-dist.stamp stamps/liveconnect-dist.stamp \
stamps/patch-boot.stamp stamps/cacao.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_BOOT) \
@@ -1926,7 +1910,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
IcedTeaPluginUtils.o
IcedTeaNPPlugin_objects:
- cd $(NPPLUGIN_DIR); \
+ cd $(PLUGIN_DIR); \
if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
fi ; \
@@ -1943,7 +1927,7 @@ IcedTeaNPPlugin_objects:
cd ../
IcedTeaNPPlugin.so: IcedTeaNPPlugin_objects
- cd $(NPPLUGIN_DIR); \
+ cd $(PLUGIN_DIR); \
$(CXX) $(CXXFLAGS) \
$(NPPLUGIN_OBJECTS) \
$(GLIB_LIBS) \
@@ -1953,7 +1937,7 @@ IcedTeaNPPlugin.so: IcedTeaNPPlugin_obje
cd ../
clean-IcedTeaNPPlugin:
- cd $(NPPLUGIN_DIR); \
+ cd $(PLUGIN_DIR); \
rm -f *.o; \
rm -f IcedTeaNPPlugin.so; \
cd ../
@@ -1995,15 +1979,42 @@ stamps/plugin.stamp: $(ICEDTEAPLUGIN_TAR
clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
-stamps/liveconnect.stamp: stamps/rt-class-files.stamp
+liveconnect-source-files.txt:
if test "x${LIVECONNECT_DIR}" != x; then \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
+ find $(PLUGIN_DIR)/java -name '*.java' | sort > $@ ; \
+ fi
+ touch $@
+
+stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
+ if test "x${LIVECONNECT_DIR}" != x; then \
+ mkdir -p $(abs_top_builddir)/liveconnect ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
+ -d $(abs_top_builddir)/liveconnect \
+ -classpath $(abs_top_builddir)/lib/rt:$(abs_top_builddir)/netx.build \
+ -sourcepath $(SOURCEPATH_DIRS) \
+ -bootclasspath \'\' \
+ @liveconnect-source-files.txt ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp
+ if test "x${LIVECONNECT_DIR}" != x; then \
+ (cd $(abs_top_builddir)/liveconnect ; \
+ mkdir -p lib ; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar ${LIVECONNECT_DIR} ; \
+ cp -a $(PLUGIN_DIR)/java src; \
+ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
+ cd src ; \
+ $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip ${LIVECONNECT_DIR} ) ; \
fi
mkdir -p stamps
touch $@
clean-liveconnect:
- rm -f lib/classes.jar
+ rm -rf $(abs_top_builddir)/liveconnect
+ rm -f stamps/liveconnect-dist.stamp
+ rm -f liveconnect-source-files.txt
rm -f stamps/liveconnect.stamp
# NetX
@@ -2571,6 +2582,8 @@ jtreg: stamps/jtreg.stamp
liveconnect: stamps/liveconnect.stamp
+liveconnect-dist: stamps/liveconnect-dist.stamp
+
native-ecj: stamps/native-ecj.stamp
nbplatform: stamps/nbplatform.stamp
diff -r 9eb43c172d5b -r a2c6e1cbc3cf NEWS
--- a/NEWS Wed Nov 04 22:07:39 2009 +0000
+++ b/NEWS Wed Nov 11 05:14:10 2009 +0000
@@ -15,6 +15,22 @@ New in release 1.12 (2009-XX-XX)
- The Zero assembler port
- JIBX is no longer required to build Nimbus.
- Many bug fixes
+- Latest security updates:
+ - (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
+ - (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
+ - (CVE-2009-3881) resurrected classloaders can still have children (6636650)
+ - (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
+ - (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
+ - (CVE-2009-3880) UI logging information leakage (6664512)
+ - (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
+ - (CVE-2009-3884) zoneinfo file existence information leak (6824265)
+ - (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
+ - (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
+ - (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
+ - (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
+ - (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
+ - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
+ - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
- The NSS crypto. provider may be turned on with --enable-nss if
the NSS libraries and headers are available via pkg-config.
- Makefile reorganisation:
diff -r 9eb43c172d5b -r a2c6e1cbc3cf patches/icedtea-liveconnect-dist.patch
--- a/patches/icedtea-liveconnect-dist.patch Wed Nov 04 22:07:39 2009 +0000
+++ b/patches/icedtea-liveconnect-dist.patch Wed Nov 11 05:14:10 2009 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/common/i
diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk
--- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-05-29 16:49:35.000000000 +0100
-@@ -0,0 +1,27 @@
++++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000
+@@ -0,0 +1,28 @@
+#
+# Copyright 2009 Red Hat, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,13 +25,14 @@ diff -Nru openjdk.orig/jdk/make/common/i
+
+# The specific packages that come from or go to rt.jar and tools.jar
+IMPORT_RT_PACKAGES += \
-+ netscape/javascript
++ netscape/javascript \
++ sun/applet
+
+IMPORT_TOOLS_PACKAGES +=
+
diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk
---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 16:48:26.000000000 +0100
-+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 16:50:02.000000000 +0100
+--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000
++++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000
@@ -49,6 +49,9 @@
ifndef NETX_DIST
include $(BUILDDIR)/common/internal/Defs-netx.gmk
@@ -42,7 +43,15 @@ diff -Nru openjdk.orig/jdk/make/common/i
# Clean up these lists so empty lists are empty
IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
-@@ -162,6 +165,7 @@
+@@ -123,6 +126,7 @@
+ $(call import-one-sources,JAXP_DIST,$1)
+ $(call import-one-sources,JAXWS_DIST,$1)
+ $(call import-one-sources,NETX_DIST,$1)
++$(call import-one-sources,LIVECONNECT_DIST,$1)
+ endef
+
+ # Import all component docs into directory $1 (optional)
+@@ -162,6 +166,7 @@
$(call import-one-classes,JAXP_DIST,$1)
$(call import-one-classes,JAXWS_DIST,$1)
$(call import-one-classes,NETX_DIST,$1)
@@ -51,9 +60,9 @@ diff -Nru openjdk.orig/jdk/make/common/i
# Clean up import files
diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 16:48:26.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 16:49:35.000000000 +0100
-@@ -349,6 +349,11 @@
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000
++++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000
+@@ -365,6 +365,11 @@
else
NETX_DIST =
endif
diff -r 9eb43c172d5b -r a2c6e1cbc3cf patches/icedtea-sources.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sources.patch Wed Nov 11 05:14:10 2009 +0000
@@ -0,0 +1,17 @@
+diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
+--- openjdk.orig/jdk/make/common/Release.gmk 2009-11-11 03:12:50.000000000 +0000
++++ openjdk/jdk/make/common/Release.gmk 2009-11-11 03:16:17.000000000 +0000
+@@ -313,7 +313,12 @@
+ org/omg \
+ org/w3c/dom \
+ org/xml/sax \
+- sunw
++ sunw \
++ sun/applet \
++ netscape \
++ net \
++ javax/jnlp
++
+ #
+ # Directories where sources may be found. If a file with the same path
+ # name exists in more than one of these places, the one found last on this
diff -r 9eb43c172d5b -r a2c6e1cbc3cf plugin/icedtea/java/netscape/javascript/JSException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedtea/java/netscape/javascript/JSException.java Wed Nov 11 05:14:10 2009 +0000
@@ -0,0 +1,140 @@
+/* -*- Mode: Java; tab-width: 8; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package netscape.javascript;
+
+/**
+ * JSException is an exception which is thrown when JavaScript code
+ * returns an error.
+ */
+
+public
+class JSException extends RuntimeException {
+ public static final int EXCEPTION_TYPE_EMPTY = -1;
+ public static final int EXCEPTION_TYPE_VOID = 0;
+ public static final int EXCEPTION_TYPE_OBJECT = 1;
+ public static final int EXCEPTION_TYPE_FUNCTION = 2;
+ public static final int EXCEPTION_TYPE_STRING = 3;
+ public static final int EXCEPTION_TYPE_NUMBER = 4;
+ public static final int EXCEPTION_TYPE_BOOLEAN = 5;
+ public static final int EXCEPTION_TYPE_ERROR = 6;
+
+ public String filename;
+ public int lineno;
+ public String source;
+ public int tokenIndex;
+ public int wrappedExceptionType;
+ public Object wrappedException;
+
+ /**
+ * Constructs a JSException without a detail message.
+ * A detail message is a String that describes this particular exception.
+ *
+ * @deprecated Not for public use in future versions.
+ */
+ public JSException() {
+ super();
+ filename = "unknown";
+ lineno = 0;
+ source = "";
+ tokenIndex = 0;
+ wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+ }
More information about the distro-pkg-dev
mailing list