/hg/icedtea6-hg: 19 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 16 05:02:00 PDT 2012
changeset a45c40af1f42 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a45c40af1f42
author: ptisnovs
date: Wed Mar 21 18:22:22 2012 +0100
PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
changeset ab91daaad8e2 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ab91daaad8e2
author: ptisnovs
date: Wed Mar 21 19:00:28 2012 +0100
Added patch which fixes the Apache XML security bug #38655
changeset 55b21736fe19 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=55b21736fe19
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Fri Mar 23 14:11:00 2012 +0100
Add tapset tests.
* Makefile.am:
Add target to run tapset tests.
* tapset/hotspot_jni.stp.in:
Add notes regarding required JVM option to Get<PrimitiveType>Field
family of probe aliases.
* test/tapset/ClassUnloadedProbeTester.java:
Part of test coverage for hotspot.stp and hotspot_jni.stp tapsets.
* test/tapset/JNIStapTest.c:
Likewise.
* test/tapset/JNITestClass.c:
Likewise.
* test/tapset/JNITestClass.h:
Likewise.
* test/tapset/JNITestClass.java:
Likewise.
* test/tapset/RunWrapper.java:
Likewise.
* test/tapset/StapJNIClassLoader.java:
Likewise.
* test/tapset/StapURLClassLoader.java:
Likewise.
* test/tapset/SystemtapTester.java:
Likewise.
* test/tapset/TestingRunner.java:
Likewise.
* test/tapset/jstaptest.pl:
Wrapper script, compiles and runs tests for tapsets.
changeset 393ad37b0c83 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=393ad37b0c83
author: Mark Wielaard <mark at klomp.org>
date: Fri Mar 23 22:39:35 2012 +0100
Add jstack tests to test/tapset/jstaptest.pl.
changeset 5491f5a5175a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5491f5a5175a
author: Mark Wielaard <mark at klomp.org>
date: Mon Mar 26 22:07:22 2012 +0200
jstaptest.pl: thread_start and stop thread id can be any positive number.
tid was hard coded as being '8', but newer hotspot might start more
than 7 background threads before the first user thread is started.
So allow tid to be any positive number.
changeset e5b8981cf2ab in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e5b8981cf2ab
author: Mark Wielaard <mark at klomp.org>
date: Mon Mar 26 23:45:05 2012 +0200
Merge
changeset 86fa5b8eb7a9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=86fa5b8eb7a9
author: ptisnovs
date: Tue Mar 27 15:30:53 2012 +0200
Backport of: 6792400: Avoid loading of Normalizer resources for simple uses
* patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch:
Added new patch
* NEWS: Mention backport.
* Makefile.am: Updated
changeset 4826fae07d72 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4826fae07d72
author: ptisnovs
date: Thu Mar 29 18:18:31 2012 +0200
Removed revert-6885123.patch to fix RH bug #789154 - javac error
messages no longer contain the full path to the offending file.
changeset e611555d93cb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e611555d93cb
author: ptisnovs
date: Fri Apr 20 17:30:17 2012 +0200
NEWS: Mention bugfix PR797 (the same as bugfig RH789154).
changeset 2e70726c57bb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2e70726c57bb
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 04 17:42:29 2012 +0100
Backport cryptography tests from OpenJDK7.
2012-05-04 Andrew John Hughes <ahughes at redhat.com>
Backport cryptography tests from 7.
* Makefile.am: Add new patches.
* patches/generalise_crypto_tests.patch:
IcedTea7 patch to generalise crypto tests.
* patches/openjdk/7088989-ucrypto_tests.patch:
Backport of 7088989.
* patches/remove-gcm-test.patch:
Remove GCM testing as not part of 6.
* patches/skip_wrap_mode.patch:
IcedTea7 patch to skip wrap mode tests when mode
is not available.
changeset 6adf4cd96962 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6adf4cd96962
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 09 13:38:18 2012 +0100
Add nss.cfg to j2re-image as well.
2012-05-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(add-nss): Copy nss.cfg to j2re-image as well.
(clean-add-nss): Remove nss.cfg from j2re-image.
(add-nss-debug): Same as for add-nss.
(clean-add-nss-debug): Same as for clean-add-nss.
(add-nss-ecj): Same as for add-nss.
(clean-add-nss-ecj): Same as for clean-add-nss.
changeset ad292421658b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ad292421658b
author: ptisnovs
date: Wed May 09 18:34:17 2012 +0200
Make the test TestRSA compatible with JDK6 syntax.
changeset 643fb6254e80 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=643fb6254e80
author: ptisnovs
date: Wed May 09 18:39:35 2012 +0200
Added missing patch.
changeset fe14de44c8a8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fe14de44c8a8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 09 23:31:43 2012 +0100
Allow builds where the memory limit of the VM needs to be increased to run javac.
2012-05-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(MEMORY_LIMIT): Always set this.
* javac.in:
Split out '-J' prefixed options and pass them
to the VM rather than ecj. Filter out
'-J-Xbootclasspath/p:', which makes no sense
as there's nothing to prepend, and confuses
the VM.
changeset 6ae19889a9e0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6ae19889a9e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu May 10 04:11:15 2012 +0100
Backport patches from OpenJDK7 to improve NSS/PKCS11 provider.
2012-05-10 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patches.
* patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch,
* patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch,
* patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch,
* patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch,
* patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch,
* patches/openjdk/p11cipher-6812738-native_cleanup.patch,
* patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch,
* patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch:
Backports from 7 to improve P11Cipher.
changeset aec65000349f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aec65000349f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 16 10:55:10 2012 +0100
Add latest releases to NEWS.
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add latest releases, 1.10.7 & 1.11.2
changeset 041afe1e0108 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=041afe1e0108
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 16 10:58:54 2012 +0100
Merge
changeset aaefc2cbbc10 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aaefc2cbbc10
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 16 12:59:46 2012 +0100
Move to b25.
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
Move to released b25.
* Makefile.am:
(OPENJDK_DATE): Set to b25 release date.
(OPENJDK_SHA256SUM): Set to b25 checksum.
changeset dc9ce5c9dbc1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=dc9ce5c9dbc1
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 16 13:01:42 2012 +0100
Move hg tree to b26, ready for next release.
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Move to b26, ready
for next release.
diffstat:
ChangeLog | 175 +
Makefile.am | 87 +-
NEWS | 30 +-
javac.in | 26 +-
patches/apache-xml-internal-fix-bug-38655.patch | 11 +
patches/ecj/icedtea.patch | 134 +-
patches/generalise_crypto_tests.patch | 847 +
patches/idresolver_fix.patch | 194 +
patches/openjdk/6633275-shaped_translucent_windows.patch | 7 -
patches/openjdk/6725214-direct3d-01.patch | 7 -
patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch | 50 +
patches/openjdk/6851973-kerberos.patch | 202 -
patches/openjdk/7088989-ucrypto_tests.patch | 1022 ++
patches/openjdk/7091528-javadoc_class_files.patch | 191 -
patches/openjdk/7102369-7094468-rmiregistry.patch | 473 -
patches/openjdk/7103725-ssl_beast_regression.patch | 22 -
patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 1176 ++
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 615 +
patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch | 60 +
patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch | 22 +
patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch | 172 +
patches/openjdk/p11cipher-6812738-native_cleanup.patch | 4849 ++++++++++
patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch | 328 +
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch | 102 +
patches/remove-gcm-test.patch | 77 +
patches/remove_multicatch_in_testrsa.patch | 109 +
patches/revert-6885123.patch | 567 -
patches/security/20120214/7082299.patch | 201 -
patches/security/20120214/7088367.patch | 45 -
patches/security/20120214/7110683.patch | 170 -
patches/security/20120214/7110687.patch | 237 -
patches/security/20120214/7110700.patch | 42 -
patches/security/20120214/7110704.patch | 63 -
patches/security/20120214/7118283.patch | 27 -
patches/security/20120214/7126960.patch | 82 -
patches/skip_wrap_mode.patch | 24 +
tapset/hotspot_jni.stp.in | 20 +-
test/tapset/ClassUnloadedProbeTester.java | 38 +
test/tapset/JNIStapTest.c | 2107 ++++
test/tapset/JNITestClass.c | 7 +
test/tapset/JNITestClass.h | 21 +
test/tapset/JNITestClass.java | 121 +
test/tapset/RunWrapper.java | 21 +
test/tapset/StapJNIClassLoader.java | 64 +
test/tapset/StapURLClassLoader.java | 24 +
test/tapset/SystemtapTester.java | 202 +
test/tapset/TestingRunner.java | 82 +
test/tapset/jstaptest.pl | 1009 ++
48 files changed, 13713 insertions(+), 2449 deletions(-)
diffs (truncated from 16881 to 500 lines):
diff -r f4bcb05229c9 -r dc9ce5c9dbc1 ChangeLog
--- a/ChangeLog Tue Mar 20 13:35:23 2012 +0000
+++ b/ChangeLog Wed May 16 13:01:42 2012 +0100
@@ -1,3 +1,146 @@
+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.
+ * Makefile.am:
+ (OPENJDK_DATE): Set to b25 release date.
+ (OPENJDK_SHA256SUM): Set to b25 checksum.
+
+2012-05-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add latest releases, 1.10.7 & 1.11.2
+
+2012-05-10 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patches.
+ * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch,
+ * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch,
+ * patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch,
+ * patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch,
+ * patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch,
+ * patches/openjdk/p11cipher-6812738-native_cleanup.patch,
+ * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch,
+ * patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch:
+ Backports from 7 to improve P11Cipher.
+
+2012-05-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (MEMORY_LIMIT): Always set this.
+ * javac.in:
+ Split out '-J' prefixed options and pass them
+ to the VM rather than ecj. Filter out
+ '-J-Xbootclasspath/p:', which makes no sense
+ as there's nothing to prepend, and confuses
+ the VM.
+
+2012-05-09 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/remove_multicatch_in_testrsa.patch:
+ Make the test TestRSA compatible with JDK6 syntax.
+ * Makefile.am: Updated.
+
+2012-05-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (add-nss): Copy nss.cfg to j2re-image as well.
+ (clean-add-nss): Remove nss.cfg from j2re-image.
+ (add-nss-debug): Same as for add-nss.
+ (clean-add-nss-debug): Same as for clean-add-nss.
+ (add-nss-ecj): Same as for add-nss.
+ (clean-add-nss-ecj): Same as for clean-add-nss.
+
+2012-05-04 Andrew John Hughes <ahughes at redhat.com>
+
+ Backport cryptography tests from 7.
+ * Makefile.am: Add new patches.
+ * patches/generalise_crypto_tests.patch:
+ IcedTea7 patch to generalise crypto tests.
+ * patches/openjdk/7088989-ucrypto_tests.patch:
+ Backport of 7088989.
+ * patches/remove-gcm-test.patch:
+ Remove GCM testing as not part of 6.
+ * patches/skip_wrap_mode.patch:
+ IcedTea7 patch to skip wrap mode tests when mode
+ is not available.
+
+2012-04-20 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * NEWS: Mention bugfix PR797 (the same as bugfig RH789154).
+
+2012-03-29 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/revert-6885123.patch: Removed to fix
+ RH bug #789154 - javac error messages no longer
+ contain the full path to the offending file.
+ * NEWS: Mention bugfix.
+ * Makefile.am: Updated.
+
+2012-03-27 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch:
+ Backport of: 6792400: Avoid loading of Normalizer resources
+ for simple uses
+ * NEWS: Mention backport.
+ * Makefile.am: Updated
+
+2012-03-21 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/apache-xml-internal-fix-bug-38655.patch:
+ Added patch which fixes the Apache XML security bug #38655
+ * Makefile.am: Updated
+
+2012-03-21 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ * Makefile.am: Updated
+ * patches/idresolver_fix.patch: added patch for a class
+ IdResolver.
+
+2012-03-26 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl: thread_start and thread_stop thread id
+ can be any positive number.
+
+2012-03-23 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl: Add jstack tests.
+
+2012-03-23 Jon VanAlten <jon.vanalten at redhat.com>
+
+ * Makefile.am:
+ Add target to run tapset tests.
+ * tapset/hotspot_jni.stp.in:
+ Add notes regarding required JVM option to Get<PrimitiveType>Field
+ family of probe aliases.
+ * test/tapset/ClassUnloadedProbeTester.java:
+ Part of test coverage for hotspot.stp and hotspot_jni.stp tapsets.
+ * test/tapset/JNIStapTest.c:
+ Likewise.
+ * test/tapset/JNITestClass.c:
+ Likewise.
+ * test/tapset/JNITestClass.h:
+ Likewise.
+ * test/tapset/JNITestClass.java:
+ Likewise.
+ * test/tapset/RunWrapper.java:
+ Likewise.
+ * test/tapset/StapJNIClassLoader.java:
+ Likewise.
+ * test/tapset/StapURLClassLoader.java:
+ Likewise.
+ * test/tapset/SystemtapTester.java:
+ Likewise.
+ * test/tapset/TestingRunner.java:
+ Likewise.
+ * test/tapset/jstaptest.pl:
+ Wrapper script, compiles and runs tests for tapsets.
+
2012-03-20 Mark Wielaard <mjw at redhat.com>
* Makefile.am (clean-jtreg): Depend on clean-jtreg-reports.
@@ -113,6 +256,19 @@
* tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size.
+2012-03-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20120214/7082299.patch,
+ * patches/security/20120214/7088367.patch,
+ * patches/security/20120214/7110683.patch,
+ * patches/security/20120214/7110687.patch,
+ * patches/security/20120214/7110700.patch,
+ * patches/security/20120214/7110704.patch,
+ * patches/security/20120214/7118283.patch,
+ * patches/security/20120214/7126960.patch:
+ Removed; upstream.
+ * Makefile.am: Drop above patches.
+
2012-03-02 Xerxes RÃ¥nby <xerxes at zafena.se>
Andrew Haley <aph at redhat.com>
@@ -263,6 +419,20 @@
(Thumb2_Return): Pass stackdepth to Thumb2_Safepoint.
(Thumb2_codegen): Pass stackdepth to Thumb2_Return.
+2012-01-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6851973-kerberos.patch,
+ * patches/openjdk/7091528-javadoc_class_files.patch,
+ * patches/openjdk/7102369-7094468-rmiregistry.patch,
+ * patches/openjdk/7103725-ssl_beast_regression.patch:
+ Dropped; upstream.
+ * Makefile.am: Remove dropped patches.
+ * patches/ecj/icedtea.patch: Updated due to 6790292.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6725214-direct3d-01.patch:
+ Remove copyright notice changes broken as a result of the annoying
+ 7128474 change.
+
2012-01-18 Xerxes RÃ¥nby <xerxes at zafena.se>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
@@ -1947,6 +2117,11 @@
2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+ * Makefile.am:
+ Bump to b25 (next version in hg).
+
+2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+
* NEWS:
Remove inaccurate line about ARM assembler.
diff -r f4bcb05229c9 -r dc9ce5c9dbc1 Makefile.am
--- a/Makefile.am Tue Mar 20 13:35:23 2012 +0000
+++ b/Makefile.am Wed May 16 13:01:42 2012 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 14_nov_2011
-OPENJDK_SHA256SUM = f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
-OPENJDK_VERSION = b24
+OPENJDK_DATE = 01_may_2012
+OPENJDK_SHA256SUM = 42db988b436593017e29d6543ac09168a901027817e41dc1be5c795b85d53b05
+OPENJDK_VERSION = b26
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = cff92704c4e0
@@ -89,6 +89,7 @@
$(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
# Flags
+MEMORY_LIMIT = -J-Xmx1024m
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
IT_LANGUAGE_SOURCE_VERSION=6
@@ -120,15 +121,6 @@
PULSE_JAVA_CLEAN_TARGET = clean-pulse-java
endif
-# FIXME: This should not depend on bootstrapping
-# but on whether MEMORY_LIMIT is accepted
-# as an argument to javac
-if BOOTSTRAPPING
- MEMORY_LIMIT =
-else
- MEMORY_LIMIT = -J-Xmx1024m
-endif
-
if ENABLE_CACAO
ICEDTEA_BUILD_TARGET=jdk_only
ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
@@ -201,15 +193,7 @@
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES = \
- patches/security/20120214/7082299.patch \
- patches/security/20120214/7088367.patch \
- patches/security/20120214/7110683.patch \
- patches/security/20120214/7110687.patch \
- patches/security/20120214/7110700.patch \
- patches/security/20120214/7110704.patch \
- patches/security/20120214/7118283.patch \
- patches/security/20120214/7126960.patch
+SECURITY_PATCHES =
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -345,7 +329,6 @@
patches/openjdk/7027667-AAShapePipeRegTest.patch \
patches/openjdk/7019861-AA-regression-fix.patch \
patches/g356743-libpng-1.5.patch \
- patches/revert-6885123.patch \
patches/openjdk/7032388-work_without_cmov_instruction.patch \
patches/openjdk/7031385-gcc-register-allocation-fix.patch \
patches/openjdk/6986968-crash_on_xim_restart.patch \
@@ -411,10 +394,6 @@
patches/arm-debug.patch \
patches/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
- patches/openjdk/7102369-7094468-rmiregistry.patch \
- patches/openjdk/6851973-kerberos.patch \
- patches/openjdk/7091528-javadoc_class_files.patch \
- patches/openjdk/7103725-ssl_beast_regression.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 \
@@ -422,7 +401,23 @@
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
+ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \
+ patches/idresolver_fix.patch \
+ patches/apache-xml-internal-fix-bug-38655.patch \
+ patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \
+ patches/openjdk/7088989-ucrypto_tests.patch \
+ patches/generalise_crypto_tests.patch \
+ patches/remove-gcm-test.patch \
+ patches/skip_wrap_mode.patch \
+ patches/remove_multicatch_in_testrsa.patch \
+ patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch \
+ patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch \
+ patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch \
+ patches/openjdk/p11cipher-6812738-native_cleanup.patch \
+ 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
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -654,9 +649,16 @@
all-local: icedtea-against-icedtea
-check-local: jtregcheck
+check-local: jtregcheck check-tapset
-clean-local: clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
+clean-tests: clean-jtreg clean-tapset-report
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
+ if [ -e test ] ; then \
+ rmdir test ; \
+ fi \
+ fi
+
+clean-local: clean-tests $(PULSE_JAVA_CLEAN_TARGET) \
clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
clean-overlay clean-native-ecj clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
@@ -700,7 +702,7 @@
clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
- clean-download-hotspot jtregcheck
+ clean-download-hotspot clean-tests clean-tapset-report jtregcheck
env:
@echo 'unset JAVA_HOME'
@@ -1592,19 +1594,25 @@
stamps/add-nss.stamp: stamps/icedtea.stamp
cp $(abs_top_builddir)/nss.cfg \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security
+ cp $(abs_top_builddir)/nss.cfg \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/security
touch stamps/add-nss.stamp
clean-add-nss:
rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
rm -f stamps/add-nss.stamp
stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp
cp $(abs_top_builddir)/nss.cfg \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ cp $(abs_top_builddir)/nss.cfg \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
touch stamps/add-nss-debug.stamp
clean-add-nss-debug:
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
rm -f stamps/add-nss-debug.stamp
stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
@@ -1709,10 +1717,13 @@
stamps/add-nss-ecj.stamp: stamps/icedtea-ecj.stamp
cp $(abs_top_builddir)/nss.cfg \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ cp $(abs_top_builddir)/nss.cfg \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
touch stamps/add-nss-ecj.stamp
clean-add-nss-ecj:
rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
rm -f stamps/add-nss-ecj.stamp
stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -2163,9 +2174,6 @@
rmdir test/jtreg ; \
fi
rm -f test/jtreg.jar
- if [ -e test ] ; then \
- rmdir test ; \
- fi
rm -f stamps/jtreg.stamp
check-hotspot: stamps/jtreg.stamp
@@ -2246,6 +2254,19 @@
$(jtreg_processes); \
fi
+check-tapset:
+if ENABLE_SYSTEMTAP
+ $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
+ -S $(abs_top_srcdir)/test/tapset \
+ -o test/check-stap.log
+endif
+
+clean-tapset-report:
+if ENABLE_SYSTEMTAP
+ rm -f test/check-stap.log
+endif
+
# Support classes for non-OpenJDK bootstraps
# rt.jar additional class files.
diff -r f4bcb05229c9 -r dc9ce5c9dbc1 NEWS
--- a/NEWS Tue Mar 20 13:35:23 2012 +0000
+++ b/NEWS Wed May 16 13:01:42 2012 +0100
@@ -12,9 +12,6 @@
New in release 1.12 (2012-XX-XX):
-* Bug fixes
- - PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
- - PR886: 6-1.11.1 fails to build CACAO on ppc
* Backports
- S6706974: Add krb5 test infrastructure
- S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
@@ -22,6 +19,33 @@
- S6883983: JarVerifier dependency on sun.security.pkcs should be removed
- S4465490: Suspicious about double-check locking idiom being used in the code
+New in release 1.11.2 (2012-05-11):
+
+* Bug fixes
+ - RH789154: javac error messages no longer contain the full path to the offending file:
+ - PR797: Compiler error message does not display entire file name and path
+ - PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ - PR886: 6-1.11.1 fails to build CACAO on ppc
+ - Specify both source and target in IT_GET_DTDTYPE_CHECK.
+ - Install nss.cfg into j2re-image too.
+ - PR584: Don't use shared Eden in incremental mode.
+* Backports
+ - S6792400: Avoid loading of Normalizer resources for simple uses
+
+New in release 1.10.7 (2012-05-11):
+
+* Fixed build with GCC 4.7
+* Bug fixes
+ - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
+ - PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ - Specify both source and target in IT_GET_DTDTYPE_CHECK.
+ - PR758: [regression] javah from 6hg/b23 generates `jlong' from `private int'
+ - Install nss.cfg into j2re-image too.
+* Backports
+ - S6792400: Avoid loading of Normalizer resources for simple uses
+ - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
+ - S7140882: Don't return booleans from methods returning pointers
+
New in release 1.10.6 (2012-02-14):
* Security fixes
diff -r f4bcb05229c9 -r dc9ce5c9dbc1 javac.in
--- a/javac.in Tue Mar 20 13:35:23 2012 +0000
+++ b/javac.in Wed May 16 13:01:42 2012 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
use strict;
use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none);
+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
my $ECJ_WARNINGS="-nowarn";
@@ -31,24 +31,34 @@
splice @new_args, $_, 1 for @indices;
}
- return @new_args;
+ return \@new_args;
+}
+
+sub split_vm_args
+{
+ my @new_args = @{$_[0]};
+
+ my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+ my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+ return (\@vm_args, \@javac_args);
}
if ( -e "@abs_top_builddir@/native-ecj" )
{
- my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
+ my $ecj_args = gen_ecj_opts( \@ARGV );
+ exec '@abs_top_builddir@/native-ecj', @ecj_parms, @$ecj_args ;
}
elsif ( -e "@ECJ_JAR@" )
{
- my @ecj_args = gen_ecj_opts( \@ARGV );
+ my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
my @CLASSPATH = ('@ECJ_JAR@');
push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
+ exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
}
else
{
- my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@ECJ@', @ecj_parms, @ecj_args ;
+ my $ecj_args = gen_ecj_opts( \@ARGV );
More information about the distro-pkg-dev
mailing list