/hg/icedtea6-hg: 31 new changesets

Mon Sep 10 09:49:35 PDT 2012

changeset 7f4c7b5567f3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7f4c7b5567f3
author: Omair Majid <omajid at redhat.com>
date: Wed Jun 27 16:19:49 2012 -0400

	Fix JRE arch dir for x86 in tapset test script

	2012-06-26 Omair Majid <omajid at redhat.com>

	 * test/tapset/jstaptest.pl (get_arch_dir): Fix dir for x86.


changeset f8a29d2a4ca4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f8a29d2a4ca4
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 28 13:27:42 2012 -0400

	PR1050: Stream objects not garbage collected

	2012-06-28 Omair Majid <omajid at redhat.com>

	 * NEWS: Update with fix.
	 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
	 Add new member variable contextPointer.
	 * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
	 (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
	 Save j_context as contextPointer.
	 (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1unref):
	 Delete the global ref and dellocate the java context.
	 (cork_callback): Don't check userdata. It is NULL.
	 (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1cork):
	 Dont allocate and pass a java_context to pa_stream_cork. It is not needed.
	 * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
	 (testOpenCloseLotsOfTimes): New method.


changeset 054fb28a4e6f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=054fb28a4e6f
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 28 20:04:54 2012 -0400

	Synchronize access to shared variable

	The variable writeInterrupted is accessed everywhere while holding a lock on
	'this' object, except in one location. Fix that.

	2012-06-28 Omair Majid <omajid at redhat.com>

	 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
	 (write): Synchronize access to writeInterrupted flag.


changeset e77ff9c25f68 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e77ff9c25f68
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 28 20:14:46 2012 -0400

	R902: PulseAudioClip getMicrosecondsLength() returns length in milliseconds, not microseconds

	Define a (correct) constant for converting from seconds to microsecond and use
	it everywhere.

	2012-06-28 Omair Majid <omajid at redhat.com>

	 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
	 (getMicrosecondLength, getMicrosecondPosition)
	 (setMicrosecondPosition): Use correct factor to convert seconds to
	 microseconds.
	 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
	 (getMicrosecondPosition): Likewise.
	 * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java:
	 Define SECONDS_TO_MICROSECONDS.


changeset ef9ac7b86cd8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ef9ac7b86cd8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 08 20:36:12 2012 +0100

	6414899: Support cloning on P11Digest so the TestDigest ucrypto test passes on NSS.

	2012-08-08 Andrew John Hughes <ahughes at redhat.com>

		* Makefile.am: Add new patch.
		* patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch:
		Backport of OpenJDK patch to make
		com.oracle.security.ucrypto.TestDigest test
		work on NSS.


changeset 934d192c3757 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=934d192c3757
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 09 20:54:36 2012 +0100

	Apply NSS changes to java.security after build.

	2012-08-09 Andrew John Hughes <ahughes at redhat.com>

		Apply NSS changes to java.security after
		build.
		* Makefile.am:
		(ICEDTEA_PATCHES): Don't add NSS config patches.
		(NSS_PATCHES): Add here instead.
		(add-nss): Apply NSS_PATCHES.
		(clean-add-nss): Revert java.security.
		(add-nss-debug): Apply NSS_PATCHES to debug build.
		(clean-add-nss-debug): Revert java.security for debug build.
		(add-nss-ecj): Apply NSS_PATCHES to bootstrap build.
		(clean-add-nss-ecj): Revert java.security for bootstrap build.


changeset b20e2e867dd8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b20e2e867dd8
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Thu Aug 09 14:01:53 2012 +0200

	copy entire CACAO directory, including .hg

	CACAO can make use of the repository in determining its Mercurial revision
	since <http://mips.complang.tuwien.ac.at/hg/cacao/rev/75b2b23e443c>.


changeset 0ad57a8403af in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0ad57a8403af
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 09 21:08:15 2012 +0100

	Merge


changeset ea7e1305805c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ea7e1305805c
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Fri Aug 10 10:38:57 2012 +0200

	Fix CACAO URL


changeset 3698dcbffc3f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3698dcbffc3f
author: Yasumasa Suenaga <suenaga.yasumasa at lab.ntt.co.jp>
date: Sun Aug 05 22:16:29 2012 +0200

	Support CompressedOops for jstack.stp.

	 * tapset/jstack.stp.in (NarrowOopStruct): New global.
	 (hotspot.vm_init_end): Initialize NarrowOopStruct.
	 (hotspot.vm_shutdown): Delete NarrowOopStruct for pid.
	 (jstack_call): Use NarrowOopStruct to calculate methodOopKlass.


changeset 3f817235ba8d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3f817235ba8d
author: Mark Wielaard 
date: Sun Aug 05 22:32:14 2012 +0200

	Add UseCompressedOops tests to jstaptest.pl.

	 * Makefile.am (check-tapset-probes): New target.
	 (check-tapset-jstack): Likewise.
	 (check-tapset): Depend on check-tapset-probes check-tapset-jstack.
	 * test/tapset/jstaptest.pl (process_args): Add -p [$run_test_probes]
	 and -j [$run_test_jstack].
	 (test_jstack): Takes argument to pass to java process.
	 Pass -XX:+UseCompressedOops and/or -Xmx5G.


changeset 3c980c916ff7 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3c980c916ff7
author: Mark Wielaard 
date: Mon Aug 06 17:12:29 2012 +0200

	test/tapset/jstaptest.pl: Expect non-zero value for NewObjectA.return.


changeset 5cdc730ba01e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5cdc730ba01e
author: Mark Wielaard 
date: Fri Aug 10 16:39:56 2012 +0200

	merge


changeset b8d3d110abfe in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b8d3d110abfe
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Aug 13 16:26:21 2012 +0200

	JamVM: Updated to 2012-07-25 revision.

	2012-08-13 Xerxes Ranby <xerxes at zafena.se>

		JamVM
		- ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
		- PPC: Don't use lwsync if it isn't supported
		- X86: Generate machine-dependent stubs for i386
		- When suspending, ignore detached threads that have died, this prevents
		a user caused deadlock when an external thread has been attached to the
		VM via JNI and it has exited without detaching
		- Add missing REF_TO_OBJs for references passed from JNI,
		this enable JamVM to run Qt-Jambi
		* NEWS: Updated.
		* Makefile.am
		(JAMVM_VERSION): Updated JamVM to 2012-07-25 revision.
		(JAMVM_SHA256SUM): Updated.


changeset d1c1c1e9fa40 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d1c1c1e9fa40
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 15 11:43:19 2012 +0100

	Guard reversion of java.security so the mv command is not run by non-NSS builds.

	2012-08-14 Andrew John Hughes <ahughes at redhat.com>

		* Makefile.am:
		(clean-add-nss): Only move java.security.old
		if it exists.
		(clean-add-nss-debug): Likewise.
		(clean-add-nss-ecj): Likewise.


changeset a5758742058d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a5758742058d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 15 12:17:03 2012 +0100

	PR1113: Add tapset tests to distribution.

	2012-08-14 Andrew John Hughes <ahughes at redhat.com>

		PR1113: Include tapset tests in distribution.
		* Makefile.am:
		(TAPSET_TEST_SRCS): Like tapset test sources.
		(EXTRA_DIST): Add TAPSET_TEST_SRCS.
		* NEWS: Updated.


changeset 8182b4c86fed in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8182b4c86fed
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 15 23:07:12 2012 +0100

	PR1117: IcedTea6 prebuilds far too many classes on bootstrap

	2012-08-15 Andrew John Hughes <ahughes at redhat.com>

		PR1117: IcedTea6 prebuilds far too many classes on bootstrap
		* patches/ecj/hotspot.patch:
		Removed; replaced by hotspot-jdk-dependency
		We don't need to add rt.jar on the classpath
		as well as the bootclasspath.
		* Makefile.am:
		(ICEDTEA_BOOTSTRAP_DIRS): Removed.
		(ICEDTEA_BOOTSTRAP_CLASSES): Extend with new
		cases found through building without
		ICEDTEA_BOOTSTRAP_DIRS.
		(ICEDTEA_ECJ_PATCHES): Add new patches, remove
		hotspot.patch.
		(rt-source-files.txt): Remove use of
		ICEDTEA_BOOTSTRAP_CLASSES.
		* NEWS: Updated.
		* patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch:
		Backport from OpenJDK7. Allows the serviceability
		agent to be compiled with 1.5. Added to bootstrap
		only to reduce potential issues with the API change.
		* patches/ecj/corba-dependencies.patch:
		Point the CORBA build at the JDK sources as it
		requires sun.tools.java.
		* patches/ecj/hotspot-jdk-dependency.patch:
		Point the HotSpot build at the JDK sources as it
		requires com.sun.jdi for the serviceability agent.
		Building com.sun.jdi requires 1.5+ source code and
		thus 7010849 is necessary.
		* patches/ecj/icedtea.patch:
		Extend CORBA Defs-java changes so that it uses the
		just-built langtools instead of the boot jdk's
		tools.jar.
		* patches/ecj/jaxws-jdk-dependency.patch:
		Point the JAXWS build at the JDK sources as it
		depends on com.sun.net.httpserver.
		* patches/ecj/jaxws-langtools-dependency.patch:
		Point the JAXWS build at the full langtools
		distribution, rather than just javac/javah/javadoc
		as it requires com.sun.mirror.


changeset b41a73ca64e6 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b41a73ca64e6
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 16 01:51:50 2012 +0100

	PR1119: Old installs still suffer from GCC PR41686

	2012-08-16 Andrew John Hughes <ahughes at redhat.com>

		PR1121: Old installs still suffer from GCC PR41686
		* Makefile.am:
		(ICEDTEA_BOOTSTRAP_CLASSES):
		Add javax.security.auth.kerberos.KerberosTicket
		* NEWS: Updated.


changeset c7c1cdb3bb3d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c7c1cdb3bb3d
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Aug 17 11:55:53 2012 +0200

	Make the patch file patches/ecj/hotspot.patch compatible with patch tool 2.5.4


changeset 3f73297b2b13 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3f73297b2b13
author: Mark Wielaard 
date: Thu Aug 16 22:02:19 2012 +0200

	add-nss.stamp: Only try patching the security files if they actually exist.


changeset ce869b71eca1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ce869b71eca1
author: Mark Wielaard 
date: Thu Aug 16 22:13:13 2012 +0200

	Setup drops directory by symlinking when building zerovm.

	We are not actually using the drops inside the zerovm build environment,
	but they are checked. Which would lead to extra downloading.

	 * Makefile.am (add-zero.stamp): Setup drops directory by symlinking.
	 (add-zero-debug.stamp): Likewise.


changeset 34390e3aa8c5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=34390e3aa8c5
author: Mark Wielaard 
date: Fri Aug 17 16:32:32 2012 +0200

	merge


changeset f44000374b09 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f44000374b09
author: Mark Wielaard 
date: Wed Aug 15 16:16:33 2012 +0200

	Split up systemtap.patch in separate sdt-*patches and add testcase.

	Individual patches, plus testcase as proposed and discussed on hotspot-dev:
	http://mail.openjdk.java.net/pipermail/hotspot-dev/2012-May/005739.html
	http://mail.openjdk.java.net/pipermail/hotspot-dev/2012-July/006196.html

	 * Makefile.am (ICEDTEA_PATCHES): Remove systemtap.patch, add
	 individual sdt-*.patches.
	 * patches/systemtap.patch: Removed.
	 * patches/sdt-arguments.patch: Added.
	 * patches/sdt-dtrace-hpp.patch: Added.
	 * patches/sdt-jni.patch: Added.
	 * patches/sdt-make.patch: Added.
	 * overlays/openjdk/hotspot/test/serviceability/SDTProbesGNULinuxTest.sh:
	 New testcase.


changeset fb1137cef484 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fb1137cef484
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Aug 20 18:10:54 2012 +0200

	JamVM: Sync with IcedTea7; Updated JamVM to 2012-08-15 revision.

	2012-08-20 Xerxes Ranby <xerxes at zafena.se>
		 Robert Lougher <rob at jamvm.org.uk>

		JamVM: Sync with IcedTea7
		* Makefile.am
		(JAMVM_VERSION): Updated JamVM to 2012-08-15 revision.
		(JAMVM_SHA256SUM): Updated.
		(stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk6


changeset 1479af449489 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1479af449489
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 31 15:06:23 2012 +0100

	Add security fixes from 2012/08/30.

	2012-08-31 Andrew John Hughes <ahughes at redhat.com>

		* Makefile.am:
		(SECURITY_PATCHES): Add 7162476, 7163201 & 7182135.
		(ICEDTEA_PATCHES): Add 7185678.
		* patches/merge_fix.patch: Patch to fix merge issues
		between new security fixes and previous backports.
		* patches/gcc-suffix.patch,
		* patches/libraries.patch,
		* patches/version-hotspot.patch:
		Regenerate to remove fuzz.
		* patches/nomotif-6706121.patch,
		* patches/openjdk/6633275-shaped_translucent_windows.patch,
		* patches/openjdk/6693253-security_warning.patch,
		* patches/openjdk/6797195-hw_lw_mixing.patch:
		Regenerated post-security patches.
		* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
		* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
		* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
		New patches from 6u35/7u7 security release.
		* patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch:
		Regression fix for 7162476.


changeset 0e0ec12a88e3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0e0ec12a88e3
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 31 15:21:42 2012 +0100

	Add missing file.


changeset 5c199bcdebc8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5c199bcdebc8
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Aug 31 15:26:08 2012 +0100

	Add more meaningful names for hugepages patches, based on upstream summary.

	2012-08-31 Andrew John Hughes <ahughes at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Rename patches.
		* patches/openjdk/7034464-hugepage.patch:
		Renamed to...
		* patches/openjdk/7034464-transparent_huge_pages.patch:
		this.
		* patches/openjdk/7037939-hugepage.patch:
		Renamed to...
		* patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch
		this.


changeset db084058f69b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=db084058f69b
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 03 14:30:48 2012 +0100

	Add 1.10.9 & 1.11.4 to NEWS.

	2012-09-03 Andrew John Hughes <ahughes at redhat.com>

		* NEWS: Add 1.10.9 & 1.11.4.


changeset 004393c6afb9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=004393c6afb9
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 10 17:48:15 2012 +0100

	Merge


changeset 7fe15479d719 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7fe15479d719
author: Mark Wielaard 
date: Mon Sep 03 20:06:53 2012 +0200

	Makefile.am (ICEDTEA_PATCHES): Add missing backslash.

	There was backslash missing after 7034464-transparent_huge_pages.patch
	which caused all patches after that one to be note included in the list.


changeset 7f9b1d08b2c5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7f9b1d08b2c5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 10 17:48:48 2012 +0100

	Merge


diffstat:

 ChangeLog | 307 +
 Makefile.am | 279 +-
 NEWS | 36 +
 README | 2 +-
 overlays/openjdk/hotspot/test/serviceability/SDTProbesGNULinuxTest.sh | 68 +
 patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch | 394 +
 patches/ecj/corba-dependencies.patch | 17 +
 patches/ecj/hotspot-jdk-dependency.patch | 25 +
 patches/ecj/hotspot.patch | 14 -
 patches/ecj/icedtea.patch | 7 +-
 patches/ecj/jaxws-jdk-dependency.patch | 47 +
 patches/ecj/jaxws-langtools-dependency.patch | 48 +
 patches/ecj/override.patch | 93 +-
 patches/gcc-suffix.patch | 116 +-
 patches/libraries.patch | 2589 +++---
 patches/merge_fix.patch | 26 +
 patches/nomotif-6706121.patch | 659 +-
 patches/nss-config.patch | 4 +-
 patches/nss-not-enabled-config.patch | 4 +-
 patches/openjdk/6610244-modal-fatal-error-windows.patch | 125 -
 patches/openjdk/6633275-shaped_translucent_windows.patch | 201 +-
 patches/openjdk/6693253-security_warning.patch | 331 +-
 patches/openjdk/6797195-hw_lw_mixing.patch | 131 +-
 patches/openjdk/7034464-hugepage.patch | 458 -
 patches/openjdk/7034464-transparent_huge_pages.patch | 458 +
 patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch | 71 +
 patches/openjdk/7037939-hugepage.patch | 71 -
 patches/openjdk/7103224-glibc_name_collision.patch | 236 -
 patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 12 -
 patches/openjdk/7185678-xmenuitem_peer_npe.patch | 21 +
 patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch | 1511 ++++
 patches/openjdk/remove-mimpure-option-to-gcc.patch | 162 -
 patches/sdt-arguments.patch | 24 +
 patches/sdt-dtrace-hpp.patch | 103 +
 patches/sdt-jni.patch | 37 +
 patches/sdt-make.patch | 51 +
 patches/security/20120612/7079902.patch | 508 -
 patches/security/20120612/7110720.patch | 129 -
 patches/security/20120612/7143606.patch | 644 -
 patches/security/20120612/7143614.patch | 165 -
 patches/security/20120612/7143617.patch | 72 -
 patches/security/20120612/7143851.patch | 74 -
 patches/security/20120612/7143872.patch | 400 -
 patches/security/20120612/7145239.patch | 68 -
 patches/security/20120612/7152811.patch | 107 -
 patches/security/20120612/7157609.patch | 56 -
 patches/security/20120612/7160677.patch | 19 -
 patches/security/20120612/7160757.patch | 26 -
 patches/security/20120830/7162476-xmldecoder_via_classfinder.patch | 2522 ++++++
 patches/security/20120830/7163201-simplify_toolkit_internal_references.patch | 3713 ++++++++++
 patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch | 519 +
 patches/support_linux_3.patch | 19 -
 patches/systemtap.patch | 162 -
 patches/version-hotspot.patch | 24 +-
 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 6 +-
 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 2 +
 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 8 +-
 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 3 +
 pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 21 +-
 pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 13 +
 tapset/jstack.stp.in | 34 +-
 test/tapset/jstaptest.pl | 62 +-
 62 files changed, 12187 insertions(+), 5927 deletions(-)

diffs (truncated from 21406 to 500 lines):

diff -r 9aff0fc60733 -r 7f9b1d08b2c5 ChangeLog

--- a/ChangeLog	Wed Jun 13 15:54:52 2012 +0100
+++ b/ChangeLog	Mon Sep 10 17:48:48 2012 +0100
@@ -1,3 +1,286 @@
+2012-09-03  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add missing backslash after
+	patches/openjdk/7034464-transparent_huge_pages.patch.
+
+2012-09-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Add 1.10.9 & 1.11.4.
+
+2012-08-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(JAXP_DROP_ZIP): Update to security fixed version.
+	(JAXP_DROP_SHA256SUM): Likewise.
+	(SECURITY_PATCHES): Drop; upstream.
+	(ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
+	* patches/ecj/override.patch: Regenerate
+	against Oracle version of security patches.
+
+	(ICEDTEA_PATCHES): Rename patches.
+	* patches/openjdk/7034464-hugepage.patch:
+	Renamed to...
+	* patches/openjdk/7034464-transparent_huge_pages.patch:
+	this.
+	* patches/openjdk/7037939-hugepage.patch:
+	Renamed to...
+	* patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch
+	this.
+
+2012-08-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(SECURITY_PATCHES): Add 7162476, 7163201 & 7182135.
+	(ICEDTEA_PATCHES): Add 7185678.
+	* patches/merge_fix.patch: Patch to fix merge issues
+	between new security fixes and previous backports.
+	* patches/gcc-suffix.patch,
+	* patches/libraries.patch,
+	* patches/version-hotspot.patch:
+	Regenerate to remove fuzz.
+	* patches/nomotif-6706121.patch,
+	* patches/openjdk/6633275-shaped_translucent_windows.patch,
+	* patches/openjdk/6693253-security_warning.patch,
+	* patches/openjdk/6797195-hw_lw_mixing.patch:
+	Regenerated post-security patches.
+	* patches/openjdk/7185678-xmenuitem_peer_npe.patch,
+	* patches/security/20120830/7162476-xmldecoder_via_classfinder.patch,
+	* patches/security/20120830/7163201-simplify_toolkit_internal_references.patch:
+	New patches from 6u35/7u7 security release.
+	* patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch:
+	Regression fix for 7162476.
+
+2012-08-20  Xerxes RÃ¥nby  <xerxes at zafena.se>
+	    Robert Lougher  <rob at jamvm.org.uk>
+
+	JamVM: Sync with IcedTea7
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2012-08-15 revision.
+	(JAMVM_SHA256SUM): Updated.
+	(stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk6
+
+2012-08-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* patches/ecj/hotspot.patch:
+	Make this patch file compatible with patch tool 2.5.4
+
+2012-08-16  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (add-zero.stamp): Setup drops directory by symlinking.
+	(add-zero-debug.stamp): Likewise.
+
+2012-08-16  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (stamps/add-nss.stamp): Only try patching the
+	security files if they actually exist.
+
+2012-08-16  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR1121: Old installs still suffer from GCC PR41686
+	* Makefile.am:
+	(ICEDTEA_BOOTSTRAP_CLASSES):
+	Add javax.security.auth.kerberos.KerberosTicket
+	* NEWS: Updated.
+
+2012-08-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR1117: IcedTea6 prebuilds far too many classes on bootstrap
+	* patches/ecj/hotspot.patch:
+	Removed; replaced by hotspot-jdk-dependency
+	We don't need to add rt.jar on the classpath
+	as well as the bootclasspath.
+	* Makefile.am:
+	(ICEDTEA_BOOTSTRAP_DIRS): Removed.
+	(ICEDTEA_BOOTSTRAP_CLASSES): Extend with new
+	cases found through building without
+	ICEDTEA_BOOTSTRAP_DIRS.
+	(ICEDTEA_ECJ_PATCHES): Add new patches, remove
+	hotspot.patch.
+	(rt-source-files.txt): Remove use of
+	ICEDTEA_BOOTSTRAP_CLASSES.
+	* NEWS: Updated.
+	* patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch:
+	Backport from OpenJDK7.  Allows the serviceability
+	agent to be compiled with 1.5.  Added to bootstrap
+	only to reduce potential issues with the API change.
+	* patches/ecj/corba-dependencies.patch:
+	Point the CORBA build at the JDK sources as it
+	requires sun.tools.java.
+	* patches/ecj/hotspot-jdk-dependency.patch:
+	Point the HotSpot build at the JDK sources as it
+	requires com.sun.jdi for the serviceability agent.
+	Building com.sun.jdi requires 1.5+ source code and
+	thus 7010849 is necessary.
+	* patches/ecj/icedtea.patch:
+	Extend CORBA Defs-java changes so that it uses the
+	just-built langtools instead of the boot jdk's
+	tools.jar.
+	* patches/ecj/jaxws-jdk-dependency.patch:
+	Point the JAXWS build at the JDK sources as it
+	depends on com.sun.net.httpserver.
+	* patches/ecj/jaxws-langtools-dependency.patch:
+	Point the JAXWS build at the full langtools
+	distribution, rather than just javac/javah/javadoc
+	as it requires com.sun.mirror.
+
+2012-08-15  Mark Wielaard  <mjw at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Remove systemtap.patch, add
+	individual sdt-*.patches.
+	* patches/systemtap.patch: Removed.
+	* patches/sdt-arguments.patch: Added.
+	* patches/sdt-dtrace-hpp.patch: Added.
+	* patches/sdt-jni.patch: Added.
+	* patches/sdt-make.patch: Added.
+	* overlays/openjdk/hotspot/test/serviceability/SDTProbesGNULinuxTest.sh:
+	New testcase.
+
+2012-08-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR1113: Include tapset tests in distribution.
+	* Makefile.am:
+	(TAPSET_TEST_SRCS): Like tapset test sources.
+	(EXTRA_DIST): Add TAPSET_TEST_SRCS.
+	* NEWS: Updated.
+
+2012-08-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-add-nss): Only move java.security.old
+	if it exists.
+	(clean-add-nss-debug): Likewise.
+	(clean-add-nss-ecj): Likewise.
+
+2012-08-13  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	JamVM
+	- ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
+	- PPC: Don't use lwsync if it isn't supported
+	- X86: Generate machine-dependent stubs for i386
+	- When suspending, ignore detached threads that have died, this prevents
+	a user caused deadlock when an external thread has been attached to the
+	VM via JNI and it has exited without detaching
+	- Add missing REF_TO_OBJs for references passed from JNI,
+	this enable JamVM to run Qt-Jambi
+	* NEWS: Updated.
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2012-07-25 revision.
+	(JAMVM_SHA256SUM): Updated.
+
+2012-08-10  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* README: Fix CACAO URL.
+
+2012-08-06  Mark Wielaard  <mjw at redhat.com>
+
+	* test/tapset/jstaptest.pl (probestrings): Expect non-zero value
+	for hotspot.jni.NewObjectA.return.
+
+2012-08-03  Mark Wielaard  <mjw at redhat.com>
+
+	* Makefile.am (check-tapset-probes): New target.
+	(check-tapset-jstack): Likewise.
+	(check-tapset): Depend on check-tapset-probes check-tapset-jstack.
+	* test/tapset/jstaptest.pl (process_args): Add -p [$run_test_probes]
+	and -j [$run_test_jstack].
+	(test_jstack): Takes argument to pass to java process.
+	Pass -XX:+UseCompressedOops and/or -Xmx5G.
+
+2012-08-03  Yasumasa Suenaga  <suenaga.yasumasa at lab.ntt.co.jp>
+
+	* tapset/jstack.stp.in (NarrowOopStruct): New global.
+	(hotspot.vm_init_end): Initialize NarrowOopStruct.
+	(hotspot.vm_shutdown): Delete NarrowOopStruct for pid.
+	(jstack_call): Use NarrowOopStruct to calculate methodOopKlass.
+
+2012-08-09  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* Makefile.am: copy entire CACAO directory, including .hg
+
+2012-08-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	Apply NSS changes to java.security after
+	build.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Don't add NSS config patches.
+	(NSS_PATCHES): Add here instead.
+	(add-nss): Apply NSS_PATCHES.
+	(clean-add-nss): Revert java.security.
+	(add-nss-debug): Apply NSS_PATCHES to debug build.
+	(clean-add-nss-debug): Revert java.security for debug build.
+	(add-nss-ecj): Apply NSS_PATCHES to bootstrap build.
+	(clean-add-nss-ecj): Revert java.security for bootstrap build.
+
+2012-08-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch:
+	Backport of OpenJDK patch to make
+	com.oracle.security.ucrypto.TestDigest test
+	work on NSS.
+
+2012-06-28  Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+	(getMicrosecondLength, getMicrosecondPosition)
+	(setMicrosecondPosition): Use correct factor to convert seconds to
+	microseconds.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(getMicrosecondPosition): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java:
+	Define SECONDS_TO_MICROSECONDS.
+
+2012-06-28  Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(write): Synchronize access to writeInterrupted flag.
+
+2012-06-28  Omair Majid  <omajid at redhat.com>
+
+	PR1050: Stream objects not garbage collected
+	* NEWS: Update with fix.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
+	Add new member variable contextPointer.
+	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+	(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
+	Save j_context as contextPointer.
+	(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1unref):
+	Delete the global ref and dellocate the java context.
+	(cork_callback): Don't check userdata. It is NULL.
+	(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1cork):
+	Dont allocate and pass a java_context to pa_stream_cork. It is not needed.
+	* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
+	(testOpenCloseLotsOfTimes): New method.
+
+2012-06-26  Omair Majid  <omajid at redhat.com>
+
+	* test/tapset/jstaptest.pl (get_arch_dir): Fix dir for x86.
+
+2012-06-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/remove-mimpure-option-to-gcc.patch:
+	Dropped; upstreamed.
+	* patches/security/20120612/7079902.patch,
+	* patches/security/20120612/7110720.patch,
+	* patches/security/20120612/7143606.patch,
+	* patches/security/20120612/7143614.patch,
+	* patches/security/20120612/7143617.patch,
+	* patches/security/20120612/7143851.patch,
+	* patches/security/20120612/7143872.patch,
+	* patches/security/20120612/7145239.patch,
+	* patches/security/20120612/7152811.patch,
+	* patches/security/20120612/7157609.patch,
+	* patches/security/20120612/7160677.patch,
+	* patches/security/20120612/7160757.patch:
+	Dropped; provided by Oracle upstream.
+	* Makefile.am:
+	(JAXP_DROP_ZIP): Update to security fixed version.
+	(JAXP_DROP_SHA256SUM): Likewise.
+	(SECURITY_PATCHES): Drop; upstream.
+	(ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
+	* patches/ecj/override.patch: Regenerate
+	against Oracle version of security patches.
+
 2012-06-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am,
@@ -21,6 +304,30 @@
 
 	* NEWS: Add 1.10.8 & 1.11.3 releases.
 
+2012-06-11  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/7103224-glibc_name_collision.patch,
+	* patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch,
+	* patches/support_linux_3.patch:
+	Drop upstreamed patches.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Removed above patches.
+	* patches/openjdk/6633275-shaped_translucent_windows.patch:
+	Regenerated due to copyright header change by Oracle.
+
+2012-06-06  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6610244-modal-fatal-error-windows.patch:
+	Removed.
+	* Makefile.am,
+	Remove upstreamed patch.
+
+2012-05-16  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_VERSION): Move to b26, ready
+	for next release.
+
 2012-05-16  Andrew John Hughes  <ahughes at redhat.com>
 
 	Move to released b25.
diff -r 9aff0fc60733 -r 7f9b1d08b2c5 Makefile.am
--- a/Makefile.am	Wed Jun 13 15:54:52 2012 +0100
+++ b/Makefile.am	Mon Sep 10 17:48:48 2012 +0100
@@ -2,7 +2,7 @@
 
 OPENJDK_DATE = 01_may_2012
 OPENJDK_SHA256SUM = 42db988b436593017e29d6543ac09168a901027817e41dc1be5c795b85d53b05
-OPENJDK_VERSION = b25
+OPENJDK_VERSION = b26
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
 CACAO_VERSION = cff92704c4e0
@@ -11,8 +11,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-JAMVM_VERSION = 4617da717ecb05654ea5bb9572338061106a414d
-JAMVM_SHA256SUM = 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d
+JAMVM_VERSION = e70f2450890b82c37422616cc85e1a23385f03cd
+JAMVM_SHA256SUM = 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c
 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -24,8 +24,8 @@
 JAF_DROP_ZIP = jdk6-jaf-b20.zip
 JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp144_03.zip
-JAXP_DROP_SHA256SUM = c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012
+JAXP_DROP_ZIP = jaxp144_04.zip
+JAXP_DROP_SHA256SUM = 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
 
 HOTSPOT_SRC_ZIP = hotspot.tar.gz
@@ -62,31 +62,19 @@
 SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
 
 # Sources used from OpenJDK.
-ICEDTEA_BOOTSTRAP_DIRS = \
-	$(SHARE)/com/sun/jdi \
-	$(SHARE)/com/sun/net/httpserver \
-	$(SHARE)/com/sun/tools/jdi \
-	$(SHARE)/java/io \
-	$(SHARE)/java/security/cert \
-	$(SHARE)/java/util \
-	$(SHARE)/java/rmi \
-	$(SHARE)/sun/awt/ \
-	$(SHARE)/sun/nio/cs \
-	$(SHARE)/sun/rmi/rmic \
-	$(SHARE)/sun/tools/java \
-	$(SHARE)/javax/net/ssl \
-	$(SHARE)/javax/script \
-	$(SHARE)/javax/security/auth/kerberos \
-	$(SHARE)/javax/security/sasl \
-	$(LANGTOOLS)/com/sun/mirror \
-	$(LANGTOOLS)/com/sun/tools/apt
 
 # PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
 # PR43389 - javax.management.StandardMBean
+# PR54274 - sun.security.other requires missing X509CRLSelector methods
+# PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field
 ICEDTEA_BOOTSTRAP_CLASSES = \
 	$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
 	$(SHARE)/javax/management/StandardMBean.java \
-	$(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
+	$(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java \
+	$(SHARE)/java/security/cert/X509CRLSelector.java \
+	$(SHARE)/java/security/cert/X509CertSelector.java \
+	$(SHARE)/javax/security/sasl/Sasl.java \
+	$(SHARE)/javax/security/auth/kerberos/KerberosTicket.java
 
 # Flags
 MEMORY_LIMIT = -J-Xmx1024m
@@ -188,30 +176,32 @@
 # Relative path to JTreg tool
 JTREG_DIR = src/jtreg
 JTREG_SRCS = $(top_srcdir)/$(JTREG_DIR)
+TAPSET_TEST_SRCS = \
+	$(top_srcdir)/test/tapset/ClassUnloadedProbeTester.java \
+	$(top_srcdir)/test/tapset/JNIStapTest.c \
+	$(top_srcdir)/test/tapset/JNITestClass.c \
+	$(top_srcdir)/test/tapset/JNITestClass.h \
+	$(top_srcdir)/test/tapset/JNITestClass.java \
+	$(top_srcdir)/test/tapset/jstaptest.pl \
+	$(top_srcdir)/test/tapset/RunWrapper.java \
+	$(top_srcdir)/test/tapset/StapJNIClassLoader.java \
+	$(top_srcdir)/test/tapset/StapURLClassLoader.java \
+	$(top_srcdir)/test/tapset/SystemtapTester.java \
+	$(top_srcdir)/test/tapset/TestingRunner.java
 
 # Patch list
 
 ICEDTEA_FSG_PATCHES =
 
 SECURITY_PATCHES = \
-	patches/security/20120612/7079902.patch \
-	patches/security/20120612/7110720.patch \
-	patches/security/20120612/7143606.patch \
-	patches/security/20120612/7143614.patch \
-	patches/security/20120612/7143617.patch \
-	patches/security/20120612/7143851.patch \
-	patches/security/20120612/7143872.patch \
-	patches/security/20120612/7145239.patch \
-	patches/security/20120612/7152811.patch \
-	patches/security/20120612/7157609.patch \
-	patches/security/20120612/7160677.patch \
-	patches/security/20120612/7160757.patch
+	patches/security/20120830/7162476-xmldecoder_via_classfinder.patch \
+	patches/security/20120830/7163201-simplify_toolkit_internal_references.patch \
+	patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
 
 SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
 
 ICEDTEA_PATCHES = \
 	$(SECURITY_PATCHES) \
-	patches/openjdk/6610244-modal-fatal-error-windows.patch \
 	patches/stdc-limit-macros.patch \
 	patches/openjdk/4993545-nativeinlightfixer.patch \
 	patches/openjdk/6637796-set_bounds.patch \
@@ -346,8 +336,8 @@
 	patches/openjdk/6986968-crash_on_xim_restart.patch \
 	patches/openjdk/7036754-stroker-nan.patch \
 	patches/openjdk/pgram-pipe-regression.patch \
-	patches/openjdk/7034464-hugepage.patch \
-	patches/openjdk/7037939-hugepage.patch \
+	patches/openjdk/7034464-transparent_huge_pages.patch \
+	patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch \
 	patches/openjdk/7043564-hugepage.patch \
 	patches/openjdk/mutter.patch \
 	patches/fonts-rhel-version.patch \
@@ -367,7 +357,6 @@
 	patches/openjdk/6699843-IllegalArgumentException_drawString.patch \
 	patches/openjdk/6918065-Crash_in_Java2D_blit_loop.patch \
 	patches/openjdk/6623219-Font_canDisplayUpTo_does_not_work.patch \
-	patches/support_linux_3.patch \
 	patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch \
 	patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch \
 	patches/openjdk/7047069-Array_can_dynamically_change_size.patch \
@@ -402,15 +391,12 @@
 	patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
 	patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
 	patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
-	patches/openjdk/7103224-glibc_name_collision.patch \
 	patches/arm-debug.patch \
 	patches/arm-hsdis.patch	\
 	patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
 	patches/openjdk/6706974-krb5_test_infrastructure.patch \
 	patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
 	patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
-	patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
-	patches/openjdk/remove-mimpure-option-to-gcc.patch \
 	patches/ScriptEngineManager-doc.patch \
 	patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
 	patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \
@@ -429,7 +415,10 @@
 	patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch \
 	patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \
 	patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
-	patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch
+	patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
+	patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch \
+	patches/openjdk/7185678-xmenuitem_peer_npe.patch \
+	patches/merge_fix.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -461,15 +450,18 @@
 endif
 
 if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/systemtap.patch \
+ICEDTEA_PATCHES += patches/sdt-jni.patch \
+	patches/sdt-dtrace-hpp.patch \
+	patches/sdt-make.patch \
+	patches/sdt-arguments.patch \
 	patches/systemtap-gcc-4.5.patch \
 	patches/systemtap-alloc-size-workaround.patch
 endif
 

