/hg/icedtea6-hg: 24 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Oct 18 16:15:19 PDT 2010


changeset 94f30c67c2f9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=94f30c67c2f9
author: Andrew Su <asu at redhat.com>
date: Fri Oct 01 11:39:33 2010 -0400

	Set handle when creating panel, and remove the redundant reframe
	called afterwards.


changeset 748a45decac0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=748a45decac0
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 04 11:05:17 2010 -0400

	netx: show the filename when an untrusted program requests opening a
	file

	2010-10-04 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/resources/Messages.properties:
	Add AFileOnTheMachine, change SFileReadAccess and SFileWriteAccess.
	    * netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
	(addComponents): Add the filename to the message.
	    * netx/net/sourceforge/jnlp/services/XExtendedService.java:
	(openFile): Pass along the filename to ServiceUtil.checkAccess.
	    * netx/net/sourceforge/jnlp/util/FileUtils.java:
	(displayablePath): New method. (displayablePath): Likewise.


changeset 145255946142 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=145255946142
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 04 11:13:32 2010 -0400

	plugin: do not shadow specVersion and fileVersion

	2010-10-04 Omair Majid <omajid at redhat.com>

	 * /netx/net/sourceforge/jnlp/PluginBridge.java Do not shadow
	specVersion and fileVersion variables by redeclaring them.
	(PluginBridge): Initialize specVersion and fileVersion.


changeset f41b0a7fbd70 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f41b0a7fbd70
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 04 18:13:02 2010 -0400

	PR554: System.err writes content two times

	2010-10-04 Paul Ebermann <Paul-Ebermann at gmx.de> Omair
	Majid <omajid at redhat.com>

	 Fixes PR554.
	       * plugin/icedteanp/java/sun/applet/PluginMain.java (write):
	Remove method.


changeset 4698e476b886 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4698e476b886
author: Omair Majid <omajid at redhat.com>
date: Fri Oct 08 11:06:14 2010 -0400

	netx: add -Xclearcache to clear the cache

	2010-10-08 Omair Majid <omajid at redhat.com>

	 * NEWS: Updated
	    * net/sourceforge/jnlp/Launcher.java: Add fileLock.
	(launchApplication): Call markNetxRunning and install a shutdown
	hook for markNetxStopped. (markNetxRunning): New method.
	(markNetxStopped): New method.
	    * net/sourceforge/jnlp/cache/CacheUtil.java (R): New method.
	(clearCache): New method. (okToClearCache): New method.
	    * net/sourceforge/jnlp/resources/Messages.properties: Add BXclearcache
	and CCannotClearCache.
	    * net/sourceforge/jnlp/runtime/Boot.java (run): Clear the cache.
	    * net/sourceforge/jnlp/runtime/JNLPRuntime.java: Add
	NETX_RUNNING_FILE.
	    * net/sourceforge/jnlp/util/FileUtils.java (recursiveDelete): New
	method.


changeset a18694f7c8fa in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a18694f7c8fa
author: doko at ubuntu.com
date: Tue Oct 12 13:32:46 2010 +0200

	Makefile.am (stamps/add-netx.stamp): Create target directories.

	This fails otherwise, when BUILD_* and ALT_*_DIST environment vars
	are used as with --with-additional-vms=zero.

	2010-10-12 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (stamps/add-netx.stamp): Create target
	directories.


changeset 0e69fee3cd86 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0e69fee3cd86
author: doko at ubuntu.com
date: Tue Oct 12 22:13:50 2010 +0200

	Fix build failures --with-additional-vms=zero/shark

	 - Revert the last change
	 - Robustify installation of files into directories, which might not
	exist
	 - Work around assumptions made by several icedtea components

	2010-10-12 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (stamps/add-plugin.stamp, stamps/add-plugin-
	debug.stamp, stamps/add-pulseaudio-debug.stamp, stamps/add-
	plugin-ecj.stamp): Robustify. (ADD_ZERO_CONFIGURE_ARGS):
	Adjust to new configure flags. (stamps/add-zero.stamp):
	Explicitly create directories that icedtea components assume
	to be created by the jdk build (not built in zerovm).


changeset d8115f447e6f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d8115f447e6f
author: andrew
date: Tue Oct 05 13:56:11 2010 +0100

	Security updates for 2010/10/12.

	2010-10-05 Andrew John Hughes <ahughes at redhat.com>

	 * patches/security/20100330/hotspot/original/6626217.patch:
	Remove dead security patch.
		* Makefile.am: Add new patches.
		* NEWS: List security updates.
		* patches/security/20101012/6559775.patch,
		* patches/security/20101012/6891766.patch,
		* patches/security/20101012/6914943.patch,
		* patches/security/20101012/6925710.patch,
		* patches/security/20101012/6938813.patch,
		* patches/security/20101012/6957564.patch,
		* patches/security/20101012/6958060.patch,
		* patches/security/20101012/6963023.patch,
		* patches/security/20101012/6963489.patch,
		* patches/security/20101012/6966692.patch: New security
	patches.


changeset 420a4eede08d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=420a4eede08d
author: andrew
date: Mon Oct 11 21:05:13 2010 +0100

	Second batch of security updates.

	2010-10-11 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-timerqueue.patch: Dropped;
	superceded by 6623943.
		* Makefile.am: Add new security patches.
		* NEWS: List new security patches.
		* patches/security/20101012/6622002.patch,
		* patches/security/20101012/6623943.patch,
		* patches/security/20101012/6952017.patch,
		* patches/security/20101012/6952603.patch,
		* patches/security/20101012/6961084.patch,
		* patches/security/20101012/6963285.patch,
		* patches/security/20101012/6981426.patch,
		* patches/security/20101012/6990437.patch: Added.


changeset f4f7b88ae02c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f4f7b88ae02c
author: andrew
date: Mon Oct 11 21:06:13 2010 +0100

	Merge


changeset 2c5c2c6f314a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2c5c2c6f314a
author: andrew
date: Mon Oct 11 22:31:47 2010 +0100

	Add CVE numbers.

	2010-10-11 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Add CVE numbers and list 6925672 which is
	covered by the 6891766 fix.


changeset c66cf32a25db in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c66cf32a25db
author: andrew
date: Wed Oct 13 00:25:56 2010 +0100

	Merge


changeset 01c094e27afd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=01c094e27afd
author: andrew
date: Wed Oct 13 01:31:53 2010 +0100

	Add 1.7.5, 1.8.2 and 1.9.1 releases.

	2010-10-13 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Add 1.7.5, 1.8.2 and 1.9.1 releases.


changeset be9262040bbc in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=be9262040bbc
author: doko at ubuntu.com
date: Thu Oct 14 13:25:44 2010 +0200

	New configure option --with-llvm-config

	2010-10-14 Matthias Klose <doko at ubuntu.com>

	 * configure.ac: New option --with-llvm-config.
	        * INSTALL: Document it.


changeset 519a6f970eba in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=519a6f970eba
author: Omair Majid <omajid at redhat.com>
date: Thu Oct 14 15:59:52 2010 -0400

	plugin: Fix PR565: allow applets to have their own look and feels

	2010-10-14 Omair Majid <omajid at redhat.com>

	 Fixes PR565
	    * NEWS: Update with fix.
	    * netx/net/sourceforge/jnlp/Launcher.java: Make mainGroup package-
	private so NetxPanel can access it. (createThreadGroup): Only
	create a new AppThreadGroup if not a plugin. (run): Update
	comments and make dependence on SunToolkit explicit.
	    * netx/net/sourceforge/jnlp/NetxPanel.java (run): New method.
	Create a new AppContext for the applet. (createAppletThread):
	Create a new AppThreadGroup and start the applet thread in that
	ThreadGroup.
	    * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: Add
	new private variable appContext. (ApplicationInstance):
	Initialize appContext. (getAppContext): New method.
	    * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
	Extend AWTSecurityManager. (JNLPSecurityManager): Save the
	AppContext. (getAppContext): New method. Traverse the stack to
	find the application and return its AppContext.


changeset 12902038b45b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=12902038b45b
author: ptisnovs
date: Fri Oct 15 15:32:50 2010 +0200

	Added patch which fixes bug #6853592


changeset d7e98386c764 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d7e98386c764
author: ptisnovs
date: Mon Oct 18 14:39:08 2010 +0200

	Added patch which fixes bug #6703377, corrected location of patch
	patches/openjdk/6853592-badwindow-warning-fix.patch in Makefile.am


changeset a944742cdfa9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a944742cdfa9
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Oct 18 16:04:02 2010 +0100

	Build NetX normally without setting an empty bootclasspath.

	2010-10-18 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (NETX_SUN_CLASSES): List internal Sun
	class dependencies of NetX. (netx): Build normally
	without setting the bootclasspath empty.


changeset 40cb6a09efea in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=40cb6a09efea
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 18 12:31:46 2010 -0400

	netx: do not prompt user multiple times for the same certificate

	2010-10-18 Omair Majid <omajid at redhat.com>

	 *
	netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
	Add temporarilyUntrusted. (checkServerTrusted): Only prompt user
	if the certificate was not untrusted. (temporarilyUntrust):
	New method. (isTemporarilyUntrusted): New method.


changeset 003328ca1070 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=003328ca1070
author: Omair Majid <omajid at redhat.com>
date: Mon Oct 18 14:10:30 2010 -0400

	add jsse.jar to RUNTIME to allow netx to build


changeset b2629d02d55f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b2629d02d55f
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Oct 18 20:14:50 2010 +0100

	Build plugin without setting bootclasspath to empty. Fix build
	breakage.

	2010-10-18 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (RUNTIME): Revert Omair's change
	which breaks the standard build.
	(PLUGIN_BOOTSTRAP_CLASSES): Add java.net dependencies not
	yet in gcj. (PLUGIN_SUN_CLASSES): Add bad internal class
	dependencies of plugin. (liveconnect): Build without
	setting bootclasspath to empty.


changeset afdd3f284524 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=afdd3f284524
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Oct 18 21:29:09 2010 +0100

	Define RUNTIME conditionally to handle jsse.jar correctly.

	2010-10-18 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (RUNTIME): Define conditionally, so
	that jsse.jar is added when not bootstrapping.


changeset da3370139f63 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=da3370139f63
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Oct 18 21:32:54 2010 +0100

	Merge


changeset 5bc57773f41d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5bc57773f41d
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 19 00:15:10 2010 +0100

	Handle move to hs19 upstream, dropping Shark. Drop TimerQueue patch
	applied upstream.

	2010-10-18 Andrew John Hughes <ahughes at redhat.com>

	 * patches/hotspot/hs19/alpha-fixes.patch,
		* patches/hotspot/hs19/gcc-suffix.patch,
		* patches/hotspot/hs19/params-cast-size_t.patch,
		* patches/hotspot/hs19/print_lsb_release.patch,
		* patches/hotspot/hs19/update-bootclasspath.patch: Move to
	patches. hs19 is now the only option.
		* patches/hotspot/original/alpha-fixes.patch,
		* patches/hotspot/original/gcc-suffix.patch,
		* patches/hotspot/original/params-cast-size_t.patch,
		* patches/hotspot/original/print_lsb_release.patch,
		* patches/hotspot/original/update-bootclasspath.patch:
	Dropped; upstream moved from hs17 to hs19.
		* patches/icedtea-shark-build.patch: Applied upstream by Gary
	Benson.
		* patches/security/20101012/6623943.patch: Applied upstream by
	Omair Majid.
		* shark/hotspot/make/linux/makefiles/shark.make,
		* shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
		* shark/hotspot/src/share/vm/includeDB_shark,
		* shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
		* shark/hotspot/src/share/vm/shark/llvmValue.hpp,
		* shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
		* shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
		* shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
		* shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
		* shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
		* shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
		* shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
		* shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
		* shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
		* shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
		* shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
		* shark/hotspot/src/share/vm/shark/sharkContext.cpp,
		* shark/hotspot/src/share/vm/shark/sharkContext.hpp,
		* shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
		* shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
		* shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
		* shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
		* shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
		* shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
		* shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
		* shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
		* shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
		* shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
		* shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
		* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
		* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
		* shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
		* shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
		* shark/hotspot/src/share/vm/shark/sharkStack.cpp,
		* shark/hotspot/src/share/vm/shark/sharkStack.hpp,
		* shark/hotspot/src/share/vm/shark/sharkState.cpp,
		* shark/hotspot/src/share/vm/shark/sharkState.hpp,
		* shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
		* shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
		* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
		* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
		* shark/hotspot/src/share/vm/shark/sharkType.hpp,
		* shark/hotspot/src/share/vm/shark/sharkValue.cpp,
		* shark/hotspot/src/share/vm/shark/sharkValue.hpp,
		* shark/hotspot/src/share/vm/shark/shark_globals.cpp,
		* shark/hotspot/src/share/vm/shark/shark_globals.hpp: Shark is
	in HotSpot 19.
		* Makefile.am: (ICEDTEA_PATCHES): Remove $(HSBUILD) special
	casing. Remove conditional !WITH_ALT_HSBUILD patches.
	(ports): Drop !WITH_ALT_HSBUILD block. (clean-ports):
	Likewise.
		* hotspot.map: Remove hs19.
		* patches/alpha-fixes.patch,
		* patches/gcc-suffix.patch,
		* patches/params-cast-size_t.patch,
		* patches/print_lsb_release.patch,
		* patches/update-bootclasspath.patch: The hs19 patches moved
	above.
		* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Default to
	original.


diffstat:

116 files changed, 6337 insertions(+), 15408 deletions(-)
ChangeLog                                                        |  316 +
INSTALL                                                          |    1 
Makefile.am                                                      |  176 
NEWS                                                             |  145 
acinclude.m4                                                     |    2 
configure.ac                                                     |   17 
hotspot.map                                                      |    1 
netx/net/sourceforge/jnlp/Launcher.java                          |  100 
netx/net/sourceforge/jnlp/NetxPanel.java                         |   24 
netx/net/sourceforge/jnlp/PluginBridge.java                      |    4 
netx/net/sourceforge/jnlp/cache/CacheUtil.java                   |   71 
netx/net/sourceforge/jnlp/resources/Messages.properties          |    7 
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java       |   21 
netx/net/sourceforge/jnlp/runtime/Boot.java                      |   13 
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java               |   10 
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java       |   39 
netx/net/sourceforge/jnlp/security/AccessWarningPane.java        |   15 
netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java |   38 
netx/net/sourceforge/jnlp/services/XExtendedService.java         |    4 
netx/net/sourceforge/jnlp/util/FileUtils.java                    |   88 
patches/6703377-freetypescaler.patch                             |   11 
patches/alpha-fixes.patch                                        |   21 
patches/gcc-suffix.patch                                         |   31 
patches/hotspot/hs19/alpha-fixes.patch                           |   21 
patches/hotspot/hs19/gcc-suffix.patch                            |   31 
patches/hotspot/hs19/params-cast-size_t.patch                    |  264 -
patches/hotspot/hs19/print_lsb_release.patch                     |   49 
patches/hotspot/hs19/update-bootclasspath.patch                  |   13 
patches/hotspot/original/alpha-fixes.patch                       |   31 
patches/hotspot/original/gcc-suffix.patch                        |   25 
patches/hotspot/original/params-cast-size_t.patch                |  274 -
patches/hotspot/original/print_lsb_release.patch                 |   48 
patches/hotspot/original/update-bootclasspath.patch              |   13 
patches/icedtea-jtreg-jrunscript.patch                           |   12 
patches/icedtea-shark-build.patch                                |   16 
patches/icedtea-timerqueue.patch                                 |   18 
patches/openjdk/4356282-opentype.patch                           |  227 -
patches/openjdk/6438179-systray_check.patch                      |   92 
patches/openjdk/6678385-window_movement_crasher.patch            | 1241 -----
patches/openjdk/6721088-awt_window_size.patch                    |   67 
patches/openjdk/6795060-icu_crash.patch                          |   95 
patches/openjdk/6853592-badwindow-warning-fix.patch              |   16 
patches/openjdk/6951319-sparc_build_fixes.patch                  |   24 
patches/openjdk/6954424-opentype_javadoc.patch                   |   23 
patches/openjdk/6961732-negative_leading.patch                   |   45 
patches/openjdk/6969395-net_bugs.patch                           |  461 --
patches/openjdk/6985992-test_6933784.patch                       |   43 
patches/params-cast-size_t.patch                                 |  264 +
patches/print_lsb_release.patch                                  |   49 
patches/security/20100330/hotspot/original/6626217.patch         |  180 
patches/security/20101012/6559775.patch                          |  317 +
patches/security/20101012/6622002.patch                          |   64 
patches/security/20101012/6891766.patch                          | 1147 +++++
patches/security/20101012/6914943.patch                          | 2129 ++++++++++
patches/security/20101012/6925710.patch                          |  198 
patches/security/20101012/6938813.patch                          |  196 
patches/security/20101012/6952017.patch                          |   50 
patches/security/20101012/6952603.patch                          |   38 
patches/security/20101012/6957564.patch                          |   77 
patches/security/20101012/6958060.patch                          |   15 
patches/security/20101012/6961084.patch                          |  325 +
patches/security/20101012/6963023.patch                          |   95 
patches/security/20101012/6963285.patch                          |   20 
patches/security/20101012/6963489.patch                          |   31 
patches/security/20101012/6966692.patch                          |   91 
patches/security/20101012/6981426.patch                          |   24 
patches/security/20101012/6990437.patch                          |  116 
patches/update-bootclasspath.patch                               |   13 
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java         |    8 
plugin/icedteanp/java/sun/applet/PluginMain.java                 |    8 
shark/hotspot/make/linux/makefiles/shark.make                    |   32 
shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp             |   62 
shark/hotspot/src/share/vm/includeDB_shark                       |  369 -
shark/hotspot/src/share/vm/shark/llvmHeaders.hpp                 |   82 
shark/hotspot/src/share/vm/shark/llvmValue.hpp                   |   62 
shark/hotspot/src/share/vm/shark/sharkBlock.cpp                  | 1260 -----
shark/hotspot/src/share/vm/shark/sharkBlock.hpp                  |  281 -
shark/hotspot/src/share/vm/shark/sharkBuilder.cpp                |  591 --
shark/hotspot/src/share/vm/shark/sharkBuilder.hpp                |  209 
shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp           |  259 -
shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp           |  417 -
shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp             |   87 
shark/hotspot/src/share/vm/shark/sharkCompiler.cpp               |  340 -
shark/hotspot/src/share/vm/shark/sharkCompiler.hpp               |  119 
shark/hotspot/src/share/vm/shark/sharkConstant.cpp               |  128 
shark/hotspot/src/share/vm/shark/sharkConstant.hpp               |   64 
shark/hotspot/src/share/vm/shark/sharkContext.cpp                |  180 
shark/hotspot/src/share/vm/shark/sharkContext.hpp                |  187 
shark/hotspot/src/share/vm/shark/sharkEntry.hpp                  |   58 
shark/hotspot/src/share/vm/shark/sharkFunction.cpp               |  188 
shark/hotspot/src/share/vm/shark/sharkFunction.hpp               |  111 
shark/hotspot/src/share/vm/shark/sharkInliner.cpp                |  749 ---
shark/hotspot/src/share/vm/shark/sharkInliner.hpp                |   32 
shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp             |  277 -
shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp             |   54 
shark/hotspot/src/share/vm/shark/sharkInvariants.cpp             |   37 
shark/hotspot/src/share/vm/shark/sharkInvariants.hpp             |  167 
shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp          |  116 
shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp          |   88 
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp          |  352 -
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp          |  182 
shark/hotspot/src/share/vm/shark/sharkRuntime.cpp                |  251 -
shark/hotspot/src/share/vm/shark/sharkRuntime.hpp                |   83 
shark/hotspot/src/share/vm/shark/sharkStack.cpp                  |  263 -
shark/hotspot/src/share/vm/shark/sharkStack.hpp                  |  290 -
shark/hotspot/src/share/vm/shark/sharkState.cpp                  |  389 -
shark/hotspot/src/share/vm/shark/sharkState.hpp                  |  188 
shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp           |   99 
shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp           |   75 
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp          | 1991 ---------
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp          |  430 --
shark/hotspot/src/share/vm/shark/sharkType.hpp                   |  112 
shark/hotspot/src/share/vm/shark/sharkValue.cpp                  |  260 -
shark/hotspot/src/share/vm/shark/sharkValue.hpp                  |  332 -
shark/hotspot/src/share/vm/shark/shark_globals.cpp               |   29 
shark/hotspot/src/share/vm/shark/shark_globals.hpp               |   54 

diffs (truncated from 22870 to 500 lines):

diff -r 14ed93e7ecc5 -r 5bc57773f41d ChangeLog
--- a/ChangeLog	Thu Sep 30 11:10:01 2010 +0100
+++ b/ChangeLog	Tue Oct 19 00:15:10 2010 +0100
@@ -1,3 +1,268 @@ 2010-09-29  Andrew John Hughes  <ahughes
+2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/hotspot/hs19/alpha-fixes.patch,
+	* patches/hotspot/hs19/gcc-suffix.patch,
+	* patches/hotspot/hs19/params-cast-size_t.patch,
+	* patches/hotspot/hs19/print_lsb_release.patch,
+	* patches/hotspot/hs19/update-bootclasspath.patch:
+	Move to patches.  hs19 is now the only option.
+	* patches/hotspot/original/alpha-fixes.patch,
+	* patches/hotspot/original/gcc-suffix.patch,
+	* patches/hotspot/original/params-cast-size_t.patch,
+	* patches/hotspot/original/print_lsb_release.patch,
+	* patches/hotspot/original/update-bootclasspath.patch:
+	Dropped; upstream moved from hs17 to hs19.
+	* patches/icedtea-shark-build.patch:
+	Applied upstream by Gary Benson.
+	* patches/security/20101012/6623943.patch:
+	Applied upstream by Omair Majid.
+	* shark/hotspot/make/linux/makefiles/shark.make,
+	* shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+	* shark/hotspot/src/share/vm/includeDB_shark,
+	* shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+	* shark/hotspot/src/share/vm/shark/llvmValue.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkContext.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkContext.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkStack.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkStack.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkState.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkState.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkType.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkValue.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkValue.hpp,
+	* shark/hotspot/src/share/vm/shark/shark_globals.cpp,
+	* shark/hotspot/src/share/vm/shark/shark_globals.hpp:
+	Shark is in HotSpot 19.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove $(HSBUILD) special casing.
+	Remove conditional !WITH_ALT_HSBUILD patches.
+	(ports): Drop !WITH_ALT_HSBUILD block.
+	(clean-ports): Likewise.
+	* hotspot.map: Remove hs19.
+	* patches/alpha-fixes.patch,
+	* patches/gcc-suffix.patch,
+	* patches/params-cast-size_t.patch,
+	* patches/print_lsb_release.patch,
+	* patches/update-bootclasspath.patch:
+	The hs19 patches moved above.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HOTSPOT_BUILD): Default to original.
+
+2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(RUNTIME): Define conditionally, so that
+	jsse.jar is added when not bootstrapping.
+
+2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(RUNTIME): Revert Omair's change which breaks
+	the standard build.
+	(PLUGIN_BOOTSTRAP_CLASSES): Add java.net dependencies
+	not yet in gcj.
+	(PLUGIN_SUN_CLASSES): Add bad internal class dependencies
+	of plugin.
+	(liveconnect): Build without setting bootclasspath to empty.
+
+2010-10-18  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (RUNTIME): Add jsse.jar to classpath. It is required
+	for building netx with --disable-bootstrap.
+
+2010-10-18  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
+	Add temporarilyUntrusted.
+	(checkServerTrusted): Only prompt user if the certificate was not
+	untrusted.
+	(temporarilyUntrust): New method.
+	(isTemporarilyUntrusted): New method.
+
+2010-10-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(NETX_SUN_CLASSES): List internal Sun class
+	dependencies of NetX.
+	(netx): Build normally without setting the
+	bootclasspath empty.
+
+2010-10-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	Corrected location of patch
+	patches/openjdk/6853592-badwindow-warning-fix.patch
+	in Makefile.am
+	* patches/6703377-freetypescaler.patch:
+	Added patch which fixes bug #6703377
+
+2010-10-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/openjdk/6853592-badwindow-warning-fix.patch:
+	Added patch which fixes bug #6853592 introduced by another patch
+	6678385-window_movement_crasher.patch
+
+2010-10-14  Omair Majid  <omajid at redhat.com>
+
+	Fixes PR565
+	* NEWS: Update with fix.
+	* netx/net/sourceforge/jnlp/Launcher.java:
+	Make mainGroup package-private so NetxPanel can access it.
+	(createThreadGroup): Only create a new AppThreadGroup if not a plugin.
+	(run): Update comments and make dependence on SunToolkit explicit.
+	* netx/net/sourceforge/jnlp/NetxPanel.java
+	(run): New method. Create a new AppContext for the applet.
+	(createAppletThread): Create a new AppThreadGroup and start the applet
+	thread in that ThreadGroup.
+	* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java:
+	Add new private variable appContext.
+	(ApplicationInstance): Initialize appContext.
+	(getAppContext): New method.
+	* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
+	Extend AWTSecurityManager.
+	(JNLPSecurityManager): Save the AppContext.
+	(getAppContext): New method. Traverse the stack to find the application
+	and return its AppContext.
+
+2010-10-14  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: New option --with-llvm-config.
+	* INSTALL: Document it.
+
+2010-10-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS:
+	Add 1.7.5, 1.8.2 and 1.9.1 releases.
+
+2010-10-12  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/add-plugin.stamp, stamps/add-plugin-debug.stamp,
+	stamps/add-pulseaudio-debug.stamp, stamps/add-plugin-ecj.stamp): Robustify.
+	(ADD_ZERO_CONFIGURE_ARGS): Adjust to new configure flags.
+	(stamps/add-zero.stamp): Explicitly create directories that icedtea
+	components assume to be created by the jdk build (not built in zerovm).
+
+2010-10-11  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Add CVE numbers and list 6925672
+	which is covered by the 6891766 fix.
+
+2010-10-11  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-timerqueue.patch:
+	Dropped; superceded by 6623943.
+	* Makefile.am: Add new security patches.
+	* NEWS: List new security patches.
+	* patches/security/20101012/6622002.patch,
+	* patches/security/20101012/6623943.patch,
+	* patches/security/20101012/6952017.patch,
+	* patches/security/20101012/6952603.patch,
+	* patches/security/20101012/6961084.patch,
+	* patches/security/20101012/6963285.patch,
+	* patches/security/20101012/6981426.patch,
+	* patches/security/20101012/6990437.patch:
+	Added.
+
+2010-10-08  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Updated
+	* net/sourceforge/jnlp/Launcher.java: Add fileLock.
+	(launchApplication): Call markNetxRunning and install a shutdown hook for
+	markNetxStopped.
+	(markNetxRunning): New method.
+	(markNetxStopped): New method.
+	* net/sourceforge/jnlp/cache/CacheUtil.java
+	(R): New method.
+	(clearCache): New method.
+	(okToClearCache): New method.
+	* net/sourceforge/jnlp/resources/Messages.properties: Add BXclearcache and
+	CCannotClearCache.
+	* net/sourceforge/jnlp/runtime/Boot.java
+	(run): Clear the cache.
+	* net/sourceforge/jnlp/runtime/JNLPRuntime.java: Add NETX_RUNNING_FILE.
+	* net/sourceforge/jnlp/util/FileUtils.java
+	(recursiveDelete): New method.
+
+2010-10-05  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/security/20100330/hotspot/original/6626217.patch:
+	Remove dead security patch.
+	* Makefile.am: Add new patches.
+	* NEWS: List security updates.
+	* patches/security/20101012/6559775.patch,
+	* patches/security/20101012/6891766.patch,
+	* patches/security/20101012/6914943.patch,
+	* patches/security/20101012/6925710.patch,
+	* patches/security/20101012/6938813.patch,
+	* patches/security/20101012/6957564.patch,
+	* patches/security/20101012/6958060.patch,
+	* patches/security/20101012/6963023.patch,
+	* patches/security/20101012/6963489.patch,
+	* patches/security/20101012/6966692.patch:
+	New security patches.
+
+2010-10-04  Paul Ebermann  <Paul-Ebermann at gmx.de>
+	        Omair Majid <omajid at redhat.com>
+
+	Fixes PR554.
+	* plugin/icedteanp/java/sun/applet/PluginMain.java
+	(write): Remove method.
+
+2010-10-04  Omair Majid  <omajid at redhat.com>
+
+	* /netx/net/sourceforge/jnlp/PluginBridge.java
+	Do not shadow specVersion and fileVersion variables by redeclaring them.
+	(PluginBridge): Initialize specVersion and fileVersion.
+
+2010-10-04  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/resources/Messages.properties:
+	Add AFileOnTheMachine, change SFileReadAccess and SFileWriteAccess.
+	* netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
+	(addComponents): Add the filename to the message.
+	* netx/net/sourceforge/jnlp/services/XExtendedService.java:
+	(openFile): Pass along the filename to ServiceUtil.checkAccess.
+	* netx/net/sourceforge/jnlp/util/FileUtils.java:
+	(displayablePath): New method.
+	(displayablePath): Likewise.
+
+2010-10-01  Andrew Su  <asu at redhat.com>
+
+	* PluginAppletViewer.java:
+	(createPanel): Changed call to reframe with handle 0 to the handle
+	passed in.
+	(handleMessage): Removed the redundant reframe from initialization.
+
 2010-09-29  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
@@ -69,6 +334,14 @@ 2010-09-23  Andrew John Hughes  <ahughes
 	* Makefile.am: Fix path of above patch.
 	* patches/openjdk/6721088-awt_window_size.patch,
 	...here to reflect upstreaming.
+
+2010-09-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-awt-window-size.patch,
+	* patches/openjdk/6969395-net_bugs.patch,
+	* patches/openjdk/6985992-test_6933784.patch:
+	Dropped; upstreamed.
+	* Makefile.am: Remove above patches.
 
 2010-09-23  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -409,6 +682,15 @@ 2010-09-07  Andrew John Hughes  <ahughes
 	* patches/openjdk/6969395-net_bugs.patch:
 	Fix networking tests.
 
+2010-09-05  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6438179-systray_check.patch:
+	Dropped, applied upstream.
+	* Makefile.am: Drop above patch and those brought
+	back by merge.  Update JAXP tarball.
+	* patches/openjdk/6951319-sparc_build_fixes.patch:
+	Remove upstreamed parts.
+
 2010-09-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Fixed indentation, changes spaces to tab.
@@ -458,7 +740,7 @@ 2010-08-27  Deepak Bhole <dbhole at redhat.
 
 2010-08-26  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
-	* Makefile.am:
+	* Makefile.am: Add patch.
 	* patches/opengl-jni-fix.patch:
 	Fixed missing JNI link to native function
 	OGLContext.getOGLIdString() which causes
@@ -545,6 +827,22 @@ 2010-08-13  Andrew John Hughes  <ahughes
 	an Oracle-based JDK or not.
 	* configure.ac:
 	Remove check for sun.awt.Toolkit.
+
+2010-08-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/4356282-opentype.patch,
+	* patches/openjdk/6795060-icu_crash.patch,
+	* patches/openjdk/6954424-opentype_javadoc.patch:
+	Dropped, applied upstream.
+	* Makefile.am:
+	Remove above patches.
+
+2010-08-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6678385-window_movement_crasher.patch:
+	Dropped, applied upstream.
+	* Makefile.am:
+	Remove above patch.
 
 2010-08-09  Omair Majid  <omajid at redhat.com>
 
@@ -586,7 +884,7 @@ 2010-08-09  Deepak Bhole <dbhole at redhat.
 	* Makefile.am:
 	(icedtea):Add update-bootclasspath.patch.
 	dependencies and copying. Add icedtea-update-bootclasspath.patch.
-	* patches/update-bootclasspath.patch: New patch. Adds netx, 
+	* patches/update-bootclasspath.patch: New patch. Adds netx,
 	rhino and plugin jars to the bootclasspath.
 
 2010-08-09  Andrew John Hughes  <ahughes at redhat.com>
@@ -898,6 +1196,12 @@ 2010-07-28  Matthias Klose  <doko at ubuntu
 2010-07-28  Matthias Klose  <doko at ubuntu.com>
 
 	* NEWS: Add 1.8.1 entry.
+
+2010-07-26  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-jtreg-jrunscript.patch:
+	Regenerate after 50002bfcff96 from dcubed being
+	added to OpenJDK6.
 
 2010-07-26  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -1347,6 +1651,12 @@ 2010-07-08  Andrew John Hughes  <ahughes
 	just delete the stamp.
 	(clean-extract-openjdk): Likewise for clean-patch and
 	clean-patch-fsg.
+
+2010-07-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6961732.patch:
+	Dropped, applied upstream.
+	* Makefile.am: Remove above patch.
 
 2010-07-06  Andrew John Hughes  <ahughes at redhat.com>
 
@@ -9640,7 +9950,7 @@ 2009-04-07  Omair Majid  <omajid at redhat.
 
 2009-04-06  Omair Majid  <omajid at redhat.com>
 
-	* patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces 
+	* patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
 	jrunscriptTest.sh with a java version that isnt picky about int vs double
 	changes.
 	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
diff -r 14ed93e7ecc5 -r 5bc57773f41d INSTALL
--- a/INSTALL	Thu Sep 30 11:10:01 2010 +0100
+++ b/INSTALL	Tue Oct 19 00:15:10 2010 +0100
@@ -151,6 +151,7 @@ to configure:
 * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
 * --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path.
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
+* --with-llvm-config: Specify the location of the llvm-config binary.
 
 Other options may be supplied which enable or disable new features.
 These are documented fully in the relevant section below.
diff -r 14ed93e7ecc5 -r 5bc57773f41d Makefile.am
--- a/Makefile.am	Thu Sep 30 11:10:01 2010 +0100
+++ b/Makefile.am	Tue Oct 19 00:15:10 2010 +0100
@@ -17,9 +17,9 @@ JAF_DROP_URL = https://jax-ws.dev.java.n
 JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
 JAF_DROP_ZIP = jdk6-jaf-b20.zip
 JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/152561
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
@@ -34,7 +34,6 @@ ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/cl
 ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
 BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
-RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
 ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
 ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj
 ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
@@ -86,13 +85,47 @@ NETX_BOOTSTRAP_CLASSES = \
 	$(SHARE)/javax/swing/JTable.java \
 	$(SHARE)/java/security/KeyStore.java
 
+# PR46074 - Missing java.net cookie code required by IcedTea plugin
+PLUGIN_BOOTSTRAP_CLASSES = \
+	$(SHARE)/java/net/CookieManager.java \
+	$(SHARE)/java/net/HttpCookie.java \
+	$(SHARE)/java/net/CookieHandler.java
+
+# IT563 - NetX uses sun.security code
+# IT564 - NetX depends on sun.misc.BASE64Encoder
+# IT570 - NetX depends on sun.applet.AppletViewPanel
+# IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java
+NETX_SUN_CLASSES = \
+	$(SHARE)/sun/security/provider/X509Factory.java \
+	$(SHARE)/sun/security/util/SecurityConstants.java \
+	$(SHARE)/sun/security/util/HostnameChecker.java \
+	$(SHARE)/sun/security/util/DerValue.java \
+	$(SHARE)/sun/security/x509/X500Name.java \
+	$(SHARE)/sun/misc/BASE64Encoder.java \
+	$(SHARE)/sun/applet/AppletViewerPanel.java \
+	$(SHARE)/sun/security/validator/ValidatorException.java \
+	$(SHARE)/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
+
+# IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java
+# IT574 - Plugin depends on sun.misc.Ref
+# IT575 - Plugin depends on com.sun/jndi.toolkit.url.UrlUtil
+# IT576 - Plugin depends on sun.applet.AppletImageRef
+PLUGIN_SUN_CLASSES = \
+	$(SOLARIS)/sun/awt/X11/XEmbeddedFrame.java \
+	$(SHARE)/sun/misc/Ref.java \
+	$(SHARE)/com/sun/jndi/toolkit/url/UrlUtil.java \
+	$(SHARE)/sun/applet/AppletImageRef.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)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java \
-	$(NETX_BOOTSTRAP_CLASSES)
+	$(NETX_BOOTSTRAP_CLASSES) \
+	$(NETX_SUN_CLASSES) \
+	$(PLUGIN_BOOTSTRAP_CLASSES) \
+	$(PLUGIN_SUN_CLASSES)
 
 # Flags
 IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -156,10 +189,12 @@ if BOOTSTRAPPING
   BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
   ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR)
   INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
+  RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
 else
   BOOTSTRAP_DIRECTORY_STAMP =
   ICEDTEA_HOME = $(SYSTEM_JDK_DIR)
   INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
+  RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar
 endif
 
 if CP_SUPPORTS_REFLINK
@@ -197,7 +232,29 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
 
 ICEDTEA_FSG_PATCHES =
 
+BROKEN = 
+
+SECURITY_PATCHES = \
+	patches/security/20101012/6891766.patch \
+	patches/security/20101012/6925710.patch \
+	patches/security/20101012/6938813.patch \
+	patches/security/20101012/6957564.patch \
+	patches/security/20101012/6958060.patch \
+	patches/security/20101012/6963023.patch \
+	patches/security/20101012/6963489.patch \
+	patches/security/20101012/6966692.patch \
+	patches/security/20101012/6914943.patch \
+	patches/security/20101012/6559775.patch \
+	patches/security/20101012/6622002.patch \
+	patches/security/20101012/6952017.patch \
+	patches/security/20101012/6952603.patch \
+	patches/security/20101012/6961084.patch \
+	patches/security/20101012/6963285.patch \
+	patches/security/20101012/6981426.patch \
+	patches/security/20101012/6990437.patch



More information about the distro-pkg-dev mailing list