Mercurial > hg > release > icedtea6-1.12
changeset 2922:bc7bf543e3ab
Merge
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 31 Oct 2012 09:43:00 +0000 |
parents | ef0c6d430462 (current diff) 09db58b50cb3 (diff) |
children | d22acb707d7b |
files | ChangeLog Makefile.am patches/security/20121016/6631398.patch patches/security/20121016/7093490.patch patches/security/20121016/7143535.patch patches/security/20121016/7158800.patch patches/security/20121016/7158801.patch patches/security/20121016/7158804.patch patches/security/20121016/7167656.patch patches/security/20121016/7169884.patch patches/security/20121016/7169888.patch patches/security/20121016/7172522.patch patches/security/20121016/7176337.patch patches/security/20121016/7186286.patch patches/security/20121016/7189103.patch patches/security/20121016/7189490.patch patches/security/20121016/7189567.patch patches/security/20121016/7192975.patch patches/security/20121016/7195194.patch patches/security/20121016/7195917.patch patches/security/20121016/7195919.patch patches/security/20121016/7198296.patch patches/security/20121016/7198606.patch |
diffstat | 24 files changed, 515 insertions(+), 3764 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Tue Oct 30 20:10:04 2012 +0000 +++ b/AUTHORS Wed Oct 31 09:43:00 2012 +0000 @@ -15,7 +15,7 @@ Kyle Galloway <kgallowa@redhat.com> Dennis Gilmore <dgilmore@redhat.com> Andrew Haley <aph@redhat.com> -Andrew John Hughes <gnu_andrew@member.fsf.org, ahughes@redhat.com> +Andrew John Hughes <gnu_andrew@member.fsf.org, gnu.andrew@redhat.com> Tomas Hurka <tomas.hurka@sun.com> Ioana Ivan <iivan@redhat.com> Matthias Klose <doko@ubuntu.com>
--- a/ChangeLog Tue Oct 30 20:10:04 2012 +0000 +++ b/ChangeLog Wed Oct 31 09:43:00 2012 +0000 @@ -11,6 +11,40 @@ GenerateBreakIteratorData tool so that crashes have stack traces. +2011-10-24 Andrew John Hughes <gnu.andrew@redhat.com> + + * AUTHORS: Update my e-mail address. + * ChangeLog: Likewise. + +2012-10-24 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (OPENJDK_VERSION): Bump to next release, b27. + (SECURITY_PATCHES): Drop security patches now + available in upstream hg. + * patches/security/20121016/6631398.patch, + * patches/security/20121016/7093490.patch, + * patches/security/20121016/7143535.patch, + * patches/security/20121016/7158800.patch, + * patches/security/20121016/7158801.patch, + * patches/security/20121016/7158804.patch, + * patches/security/20121016/7167656.patch, + * patches/security/20121016/7169884.patch, + * patches/security/20121016/7169888.patch, + * patches/security/20121016/7172522.patch, + * patches/security/20121016/7176337.patch, + * patches/security/20121016/7186286.patch, + * patches/security/20121016/7189103.patch, + * patches/security/20121016/7189490.patch, + * patches/security/20121016/7189567.patch, + * patches/security/20121016/7192975.patch, + * patches/security/20121016/7195194.patch, + * patches/security/20121016/7195917.patch, + * patches/security/20121016/7195919.patch, + * patches/security/20121016/7198296.patch, + * patches/security/20121016/7198606.patch: + Removed; upstream. + 2012-10-24 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.10.10 & 1.11.5 releases. @@ -61,13 +95,13 @@ removing test-disabling patches. (cacao): Pass -j$(PARALLEL_JOBS) to make. -2009-11-02 Andrew John Hughes <ahughes@redhat.com> +2009-11-02 Andrew John Hughes <gnu.andrew@redhat.com> (extract-cacao): Test the actual CACAO source directory exists, not just the directory above. Use $@ to create stamp. -2012-04-12 Andrew John Hughes <ahughes@redhat.com> +2012-04-12 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (download-openjdk): Fix syntax. @@ -82,7 +116,7 @@ * NEWS: List PR1114. -2012-04-11 Andrew John Hughes <ahughes@redhat.com> +2012-04-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (download-openjdk): Don't download unless @@ -113,7 +147,7 @@ (ICEDTEA_BOOTSTRAP_CLASSES): Remove com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel. -2012-09-19 Andrew John Hughes <ahughes@redhat.com> +2012-09-19 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/7185678-xmenuitem_peer_npe.patch, * patches/security/20120830/7162476-xmldecoder_via_classfinder.patch, @@ -156,11 +190,11 @@ * Makefile.am (ICEDTEA_PATCHES): Add missing backslash after patches/openjdk/7034464-transparent_huge_pages.patch. -2012-09-03 Andrew John Hughes <ahughes@redhat.com> +2012-09-03 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.10.9 & 1.11.4. -2012-08-31 Andrew John Hughes <ahughes@redhat.com> +2012-08-31 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (JAXP_DROP_ZIP): Update to security fixed version. @@ -170,7 +204,7 @@ * patches/ecj/override.patch: Regenerate against Oracle version of security patches. -2012-08-31 Andrew John Hughes <ahughes@redhat.com> +2012-08-31 Andrew John Hughes <gnu.andrew@redhat.com> (ICEDTEA_PATCHES): Rename patches. * patches/openjdk/7034464-hugepage.patch: @@ -182,7 +216,7 @@ * patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch this. -2012-08-31 Andrew John Hughes <ahughes@redhat.com> +2012-08-31 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (SECURITY_PATCHES): Add 7162476, 7163201 & 7182135. @@ -229,7 +263,7 @@ * Makefile.am (stamps/add-nss.stamp): Only try patching the security files if they actually exist. -2012-08-16 Andrew John Hughes <ahughes@redhat.com> +2012-08-16 Andrew John Hughes <gnu.andrew@redhat.com> PR1121: Old installs still suffer from GCC PR41686 * Makefile.am: @@ -237,7 +271,7 @@ Add javax.security.auth.kerberos.KerberosTicket * NEWS: Updated. -2012-08-15 Andrew John Hughes <ahughes@redhat.com> +2012-08-15 Andrew John Hughes <gnu.andrew@redhat.com> PR1117: IcedTea6 prebuilds far too many classes on bootstrap * patches/ecj/hotspot.patch: @@ -290,7 +324,7 @@ * overlays/openjdk/hotspot/test/serviceability/SDTProbesGNULinuxTest.sh: New testcase. -2012-08-14 Andrew John Hughes <ahughes@redhat.com> +2012-08-14 Andrew John Hughes <gnu.andrew@redhat.com> PR1113: Include tapset tests in distribution. * Makefile.am: @@ -298,7 +332,7 @@ (EXTRA_DIST): Add TAPSET_TEST_SRCS. * NEWS: Updated. -2012-08-14 Andrew John Hughes <ahughes@redhat.com> +2012-08-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-add-nss): Only move java.security.old @@ -352,7 +386,7 @@ * Makefile.am: copy entire CACAO directory, including .hg -2012-08-09 Andrew John Hughes <ahughes@redhat.com> +2012-08-09 Andrew John Hughes <gnu.andrew@redhat.com> Apply NSS changes to java.security after build. @@ -366,7 +400,7 @@ (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@redhat.com> +2012-08-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch: @@ -411,7 +445,7 @@ * test/tapset/jstaptest.pl (get_arch_dir): Fix dir for x86. -2012-06-13 Andrew John Hughes <ahughes@redhat.com> +2012-06-13 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/remove-mimpure-option-to-gcc.patch: Dropped; upstreamed. @@ -436,7 +470,7 @@ * patches/ecj/override.patch: Regenerate against Oracle version of security patches. -2012-06-07 Andrew John Hughes <ahughes@redhat.com> +2012-06-07 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am, * patches/ecj/override.patch: @@ -455,11 +489,11 @@ * patches/security/20120612/7160757.patch: Security patches for 2012/06/12. -2012-06-12 Andrew John Hughes <ahughes@redhat.com> +2012-06-12 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.10.8 & 1.11.3 releases. -2012-06-11 Andrew John Hughes <ahughes@redhat.com> +2012-06-11 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/7103224-glibc_name_collision.patch, * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch, @@ -470,31 +504,31 @@ * patches/openjdk/6633275-shaped_translucent_windows.patch: Regenerated due to copyright header change by Oracle. -2012-06-06 Andrew John Hughes <ahughes@redhat.com> +2012-06-06 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6610244-modal-fatal-error-windows.patch: Removed. * Makefile.am, Remove upstreamed patch. -2012-05-16 Andrew John Hughes <ahughes@redhat.com> +2012-05-16 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (OPENJDK_VERSION): Move to b26, ready for next release. -2012-05-16 Andrew John Hughes <ahughes@redhat.com> +2012-05-16 Andrew John Hughes <gnu.andrew@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@redhat.com> +2012-05-16 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add latest releases, 1.10.7 & 1.11.2 -2012-05-10 Andrew John Hughes <ahughes@redhat.com> +2012-05-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patches. * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch, @@ -507,7 +541,7 @@ * patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch: Backports from 7 to improve P11Cipher. -2012-05-09 Andrew John Hughes <ahughes@redhat.com> +2012-05-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (MEMORY_LIMIT): Always set this. @@ -524,7 +558,7 @@ Make the test TestRSA compatible with JDK6 syntax. * Makefile.am: Updated. -2012-05-09 Andrew John Hughes <ahughes@redhat.com> +2012-05-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (add-nss): Copy nss.cfg to j2re-image as well. @@ -534,7 +568,7 @@ (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@redhat.com> +2012-05-04 Andrew John Hughes <gnu.andrew@redhat.com> Backport cryptography tests from 7. * Makefile.am: Add new patches. @@ -624,7 +658,7 @@ * Makefile.am (clean-jtreg): Depend on clean-jtreg-reports. -2012-03-20 Andrew John Hughes <ahughes@redhat.com> +2012-03-20 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_FIND_COMPILER): Define only once and @@ -642,7 +676,7 @@ * configure.ac: Invoke IT_FIND_COMPILER rather than IT_FIND_JAVAC. -2012-03-19 Andrew John Hughes <ahughes@redhat.com> +2012-03-19 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_FOR_JDK): Update JDK home directory @@ -650,7 +684,7 @@ and removing generic ones which may now pick up an unwanted 1.7 installation. -2012-03-16 Andrew John Hughes <ahughes@redhat.com> +2012-03-16 Andrew John Hughes <gnu.andrew@redhat.com> PR600, 886: * Makefile.am: @@ -659,7 +693,7 @@ (IT_ENABLE_JAMVM): Generate jvm.jamvm.cfg. * jvm.jamvm.cfg.in: Copied from jvm.cfg.in. -2012-03-16 Andrew John Hughes <ahughes@redhat.com> +2012-03-16 Andrew John Hughes <gnu.andrew@redhat.com> PR600, 886: * patches/pr600-arm-jvm.cfg.patch: Removed. @@ -735,7 +769,7 @@ * tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size. -2012-03-09 Andrew John Hughes <ahughes@redhat.com> +2012-03-09 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20120214/7082299.patch, * patches/security/20120214/7088367.patch, @@ -794,7 +828,7 @@ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (Helper_new): Don't use shared Eden in incremental mode. -2012-02-15 Andrew John Hughes <ahughes@redhat.com> +2012-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Bring in 1.8.13, 1.9.13 and 1.10.6 release notes. @@ -826,7 +860,7 @@ * NEWS: Update with fix. * patches/ecj/jaxws-getdtdtype.patch: Update to apply correctly. -2012-02-01 Andrew John Hughes <ahughes@redhat.com> +2012-02-01 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Sync with 1.11 branch. @@ -898,7 +932,7 @@ (Thumb2_Return): Pass stackdepth to Thumb2_Safepoint. (Thumb2_codegen): Pass stackdepth to Thumb2_Return. -2012-01-18 Andrew John Hughes <ahughes@redhat.com> +2012-01-18 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6851973-kerberos.patch, * patches/openjdk/7091528-javadoc_class_files.patch, @@ -970,7 +1004,7 @@ * patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch: New file. Sets XAtoms _NET_WM_PID and WM_CLIENT_MACHINE for X windows. -2012-01-12 Andrew John Hughes <ahughes@redhat.com> +2012-01-12 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.10.5, 1.9.12 and 1.8.12 release notes. Remove duplicates from 1.11. @@ -984,7 +1018,7 @@ com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe. -2012-01-10 Andrew John Hughes <ahughes@redhat.com> +2012-01-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * NEWS: Mention backport. @@ -1028,7 +1062,7 @@ * policytool.desktop.in: new file, stub for desktop file, have variable to be substituted during configure -2012-01-06 Andrew John Hughes <ahughes@redhat.com> +2012-01-06 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Cleanup ARM entry, separating details into their own section. @@ -1037,7 +1071,7 @@ * NEWS: ARM assembly language port. -2012-01-06 Andrew John Hughes <ahughes@redhat.com> +2012-01-06 Andrew John Hughes <gnu.andrew@redhat.com> Remove outdated NIO2 backport. * overlays/nio2/openjdk/jdk/make/mkdemo/nio/Makefile, @@ -1398,11 +1432,11 @@ * configure.ac: Remove --enable-nio2 option. * NEWS: Mention removal. -2012-01-06 Andrew John Hughes <ahughes@redhat.com> +2012-01-06 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Fix formatting. -2012-01-06 Andrew John Hughes <ahughes@redhat.com> +2012-01-06 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add missing entries for 1.9.11, 1.8.11, 1.10.3, @@ -1413,12 +1447,12 @@ * Makefile.am: Fixed path to excludelist.jdk.jtx file containing black list of JDK JTreg tests. -2011-12-23 Andrew John Hughes <ahughes@redhat.com> +2011-12-23 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add RH bug number which alerted us to the problem to the 7103725 backport. -2011-12-22 Andrew John Hughes <ahughes@redhat.com> +2011-12-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patches. * patches/openjdk/6851973-kerberos.patch, @@ -1432,7 +1466,7 @@ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Safepoint): Disable. -2011-12-20 Andrew John Hughes <ahughes@redhat.com> +2011-12-20 Andrew John Hughes <gnu.andrew@redhat.com> * jtreg/JavaTest.cmdMgrs.lst, * jtreg/JavaTest.toolMgrs.lst, @@ -2594,29 +2628,29 @@ (CACAO_VERSION): Updated CACAO to 2011-12-01 revision. (CACAO_SHA256SUM): Updated. -2011-11-28 Andrew John Hughes <ahughes@redhat.com> +2011-11-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Bump to b25 (next version in hg). -2011-11-28 Andrew John Hughes <ahughes@redhat.com> +2011-11-28 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Remove inaccurate line about ARM assembler. -2011-11-28 Andrew John Hughes <ahughes@redhat.com> +2011-11-28 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add changes in b24. -2011-11-25 Andrew John Hughes <ahughes@redhat.com> +2011-11-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (OPENJDK_DATE): Bump to b24. (OPENJDK_SHA256SUM): Likewise. (OPENJDK_VERSION): Likewise. -2011-11-24 Andrew John Hughes <ahughes@redhat.com> +2011-11-24 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20111018/7000600.patch, * patches/security/20111018/7019773.patch, @@ -2640,7 +2674,7 @@ * patches/xjc.patch: Rewritten to work with upstream security patches. -2011-11-11 Andrew John Hughes <ahughes@redhat.com> +2011-11-11 Andrew John Hughes <gnu.andrew@redhat.com> PR719: make distcheck work in IcedTea6 * Makefile.am: @@ -2848,18 +2882,18 @@ OpenJDK changeset. * Makefile.am (ICEDTEA_PATCHES): Add the above. -2011-10-21 Andrew John Hughes <ahughes@redhat.com> +2011-10-21 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20111018/7083012.patch: Remove testcases not in upstream version. -2011-10-19 Andrew John Hughes <ahughes@redhat.com> +2011-10-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Move jtregcheck from clean-local to .PHONY where it's supposed to be (bad patch program!) -2011-10-14 Andrew John Hughes <ahughes@redhat.com> +2011-10-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patches. * patches/rhino.patch: Change after 7046823 is applied. @@ -2879,7 +2913,7 @@ * patches/security/20111018/7077466.patch: Security patches. -2010-10-19 Andrew John Hughes <ahughes@redhat.com> +2010-10-19 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add release notes for 1.8.10, 1.9.10 and 1.10.4 security updates. @@ -2934,7 +2968,7 @@ (JAMVM_VERSION): Updated JamVM to 2011-10-07 revision. (JAMVM_SHA256SUM): Updated. -2010-10-05 Andrew John Hughes <ahughes@redhat.com> +2010-10-05 Andrew John Hughes <gnu.andrew@redhat.com> Move jtreg sources to top-level to avoid conflict between ${srcdir}/test and @@ -3983,7 +4017,7 @@ * jtreg/legal/license.txt: New location of JTreg sources. -2010-07-18 Andrew John Hughes <ahughes@redhat.com> +2010-07-18 Andrew John Hughes <gnu.andrew@redhat.com> Allow all or individual test suites to be disabled. @@ -4002,7 +4036,7 @@ * configure.ac: Call new macros. -2011-10-05 Andrew John Hughes <ahughes@redhat.com> +2011-10-05 Andrew John Hughes <gnu.andrew@redhat.com> Fix make dist when a relative path is used to configure. * Makefile.am: @@ -4014,13 +4048,13 @@ REWRITER_BUILD_DIR and works with a relative path in REWRITER_SRCS. -2011-10-05 Andrew John Hughes <ahughes@redhat.com> +2011-10-05 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (EXTRA_DIST): Complete ARM port removal by removing arm_port. -2011-10-05 Andrew John Hughes <ahughes@redhat.com> +2011-10-05 Andrew John Hughes <gnu.andrew@redhat.com> * ChangeLog: Cleanup. * NEWS: Likewise. @@ -4084,7 +4118,7 @@ bugzilla: Bug #727195 "Japanese font mappings are broken" https://bugzilla.redhat.com/show_bug.cgi?id=727195 -2011-09-08 Andrew John Hughes <ahughes@redhat.com> +2011-09-08 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6578583-modality-broken-vista.patch: Removed. @@ -4345,7 +4379,7 @@ * patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch: Backport of 6613904. -2011-07-13 Andrew John Hughes <ahughes@redhat.com> +2011-07-13 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add b23 changes. @@ -4364,7 +4398,7 @@ * patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch: Backport of 6758179. -2011-05-25 Andrew John Hughes <ahughes@redhat.com> +2011-05-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ENDORSED_DIR): Removed. @@ -4395,7 +4429,7 @@ * NEWS: Update and make bug fixes more prominent. -2011-07-11 Andrew John Hughes <ahughes@redhat.com> +2011-07-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-add-jamvm): Only perform sed on jvm.cfg @@ -4407,7 +4441,7 @@ (clean-add-jamvm): Likewise. (clean-add-jamvm-debug): Likewise. -2011-07-11 Andrew John Hughes <ahughes@redhat.com> +2011-07-11 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Import 1.10.2, 1.9.8, 1.8.8 and 1.10.1 release announcements. Sync 1.10 @@ -4415,7 +4449,7 @@ items from the 1.11 list that have been released in 1.10.1 & 1.10.2. -2011-07-11 Andrew John Hughes <ahughes@redhat.com> +2011-07-11 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Place ARM removal in a more prominent location. @@ -4453,7 +4487,7 @@ * patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch: Backport of 6711682. -2011-07-07 Andrew John Hughes <ahughes@redhat.com> +2011-07-07 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (OPENJDK_DATE): Updated. @@ -4477,7 +4511,7 @@ * patches/openjdk/6679308-Poor_text_rendering_on_translucent_image.patch: Fixed test location (added missing prefix 'jdk' into path). -2011-07-06 Andrew John Hughes <ahughes@redhat.com> +2011-07-06 Andrew John Hughes <gnu.andrew@redhat.com> Make JPEG classes more binary compatible with Oracle versions. @@ -4509,7 +4543,7 @@ (getDefaultColorId(ColorModel)): Fix typo (was DefaultColorID). * NEWS: Updated. -2011-07-06 Andrew John Hughes <ahughes@redhat.com> +2011-07-06 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20110215/6878713.patch, * patches/security/20110607/6213702.patch, @@ -4532,7 +4566,7 @@ patch version (security patch is now part of the tarball, not a patch) -2011-07-06 Andrew John Hughes <ahughes@redhat.com> +2011-07-06 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java, * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java, @@ -4562,17 +4596,17 @@ * patches/openjdk/7029152-String_intrinsics_miss_optimization.patch: Backport of 7029152 fix. -2011-06-29 Andrew John Hughes <ahughes@redhat.com> +2011-06-29 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Updated with latest bug fixes. -2011-06-29 Andrew John Hughes <ahughes@redhat.com> +2011-06-29 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/jaxws-getdtdtype.patch: Fix patch to still apply after recent security updates. -2011-06-29 Andrew John Hughes <ahughes@redhat.com> +2011-06-29 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_FIND_JAVA): Check that the binary is also @@ -4611,7 +4645,7 @@ * patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch: Backport of 6783910 fix. -2011-06-28 Andrew John Hughes <ahughes@redhat.com> +2011-06-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/support_linux_3.patch: @@ -4932,7 +4966,7 @@ openjdk/jdk/test/tools/jar/ChangeDir.java deletes all its work files. -2011-05-23 Andrew John Hughes <ahughes@redhat.com> +2011-05-23 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add security patches. * patches/nio2.patch: Rerolled post-security @@ -4990,7 +5024,7 @@ will be needed on particular RHEL version (ie. only one file for RHEL 6.0, RHEL 6.1 and RHEL 6.2) -2011-05-30 Andrew John Hughes <ahughes@redhat.com> +2011-05-30 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/7036220-shark_llvm_29_headers.patch: Moved to... @@ -5028,7 +5062,7 @@ make the test compatible with OpenJDK7/IcedTea7, disabling printing unnecessary information to error output. -2011-05-18 Andrew John Hughes <ahughes@redhat.com> +2011-05-18 Andrew John Hughes <gnu.andrew@redhat.com> * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, * patches/hotspot/hs20/arm.patch, @@ -5378,13 +5412,13 @@ Fixes register allocation by constraining output to one of a/b/c/d registers. -2011-03-31 Andrew John Hughes <ahughes@redhat.com> +2011-03-31 Andrew John Hughes <gnu.andrew@redhat.com> * patches/jaxp-serial-version-uid.patch, * patches/openjdk/6768387-jtable_not_serializable.patch: Dropped, upstream. -2011-03-31 Andrew John Hughes <ahughes@redhat.com> +2011-03-31 Andrew John Hughes <gnu.andrew@redhat.com> S7032388, PR682: Make HotSpot work on machines without cmov instruction again @@ -5402,14 +5436,14 @@ test: openjdk/langtools/test/tools/javac/api/6411310/Test.java -2011-03-31 Andrew John Hughes <ahughes@redhat.com> +2011-03-31 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (JAXP_DROP_ZIP): Update. (JAXP_DROP_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Drop above. -2011-03-31 Andrew John Hughes <ahughes@redhat.com> +2011-03-31 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Revert broken changes in @@ -5418,7 +5452,7 @@ (jtregcheck): Revert to version before last change. Remove pointless touch invocation. -2011-03-31 Andrew John Hughes <ahughes@redhat.com> +2011-03-31 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add missing download-openjdk and new download-hotspot aliases. @@ -5438,12 +5472,12 @@ and JavaFileObject classes. This patch also contains regression test for check if the fix is correct. -2011-03-29 Andrew John Hughes <ahughes@redhat.com> +2011-03-29 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Update test documentation. * NEWS: Cleanup. -2011-03-28 Andrew John Hughes <ahughes@redhat.com> +2011-03-28 Andrew John Hughes <gnu.andrew@redhat.com> Patch contributed by: Alexis Ballier <aballier@gentoo.org> * Makefile.am: Add patch. @@ -5488,7 +5522,7 @@ (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. -2011-03-23 Andrew John Hughes <ahughes@redhat.com> +2011-03-23 Andrew John Hughes <gnu.andrew@redhat.com> * hotspot.map: Bump to hs20 b11. @@ -5648,24 +5682,24 @@ * patches/jamvm/ignore-more-XX-options.patch: Removed. * patches/jamvm/ignore-unknown-options.patch: Added. -2011-03-03 Andrew John Hughes <ahughes@redhat.com> +2011-03-03 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Bump to b23. -2011-03-03 Andrew John Hughes <ahughes@redhat.com> +2011-03-03 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Update documentation to match current settings. * NEWS: Mention change to hs20. * acinclude.m4: Default to using hs20. -2011-03-03 Andrew John Hughes <ahughes@redhat.com> +2011-03-03 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20110215/6927050.patch: Remove no longer used patch. -2011-03-02 Andrew John Hughes <ahughes@redhat.com> +2011-03-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (icedtea): Explicitly set -j1 for the @@ -5676,7 +5710,7 @@ (icedtea-debug): Likewise. (icedtea-ecj): Likewise. -2011-03-02 Andrew John Hughes <ahughes@redhat.com> +2011-03-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Apply 6878713 for hs20 which still doesn't @@ -5685,18 +5719,18 @@ * patches/security/20110215/6878713.patch: Readded. -2011-03-02 Andrew John Hughes <ahughes@redhat.com> +2011-03-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (EXTRA_DIST): Remove dead shark directory. * NEWS: Fix formatting. -2011-03-02 Andrew John Hughes <ahughes@redhat.com> +2011-03-02 Andrew John Hughes <gnu.andrew@redhat.com> * patches/jaxp-serial-version-uid.patch: Rejigged to work post-b22 update. -2011-03-02 Andrew John Hughes <ahughes@redhat.com> +2011-03-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use b22 tarball. @@ -5803,7 +5837,7 @@ * Makefile.am: (icedtea-debug-against-debug): Correct typo. -2011-02-25 Andrew John Hughes <ahughes@redhat.com> +2011-02-25 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Update with latest bug fixes. @@ -5835,7 +5869,7 @@ * patches/jtreg-png-reader.patch: Fixed tree to which this patch is applied. -2011-02-24 Andrew John Hughes <ahughes@redhat.com> +2011-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * patches/pr639-missing_shark_include.patch: Renamed. @@ -5846,24 +5880,24 @@ compilation of Shark files and lack of LLVM linker flags for the launcher. -2011-02-24 Andrew John Hughes <ahughes@redhat.com> +2011-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Only apply PR639 fix on hs20. * NEWS: Updated. -2011-02-24 Andrew John Hughes <ahughes@redhat.com> +2011-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/pr639-missing_shark_include.patch: Add missing include for Shark. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.11 section. * configure.ac: Bump to 1.11pre. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Add missing $. @@ -5874,7 +5908,7 @@ (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Invert @@ -5886,7 +5920,7 @@ (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_ENABLE_JAMVM): Renamed from IT_CHECK_ENABLE_JAMVM. @@ -5900,7 +5934,7 @@ (IT_WITH_HG_REVISION): Renamed from IT_CHECK_WITH_HG_REVISION. (IT_WITH_TZDATA_DIR): Renamed from IT_CHECK_WITH_TZDATA_DIR. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Treat @@ -5912,7 +5946,7 @@ (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Check zip exists @@ -5923,7 +5957,7 @@ (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * patches/cacao/arm-jvm.cfg-pr600.patch: Moved... @@ -5933,7 +5967,7 @@ CACAO. * patches/pr600-arm-jvm.cfg.patch: to here. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: Make java, javah, rmic and jar macros more @@ -5954,7 +5988,7 @@ * patches/openjdk/6663040-com.sun.awt.patch: added Renamed and moved patch to proper location. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Mention --with-alt-jamvm-src-zip. * acinclude.m4: @@ -5987,21 +6021,21 @@ * patches/openjdk/6775317-non-AA-simple-shape-performance.patch * patches/openjdk/6766342-AA-simple-shape-performance.patch -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Update with native2ascii option and JamVM. Mention --without-hotspot-build in HotSpot documentation. -2011-02-23 Andrew John Hughes <ahughes@redhat.com> +2011-02-23 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (download-openjdk): Verify HotSpot tarball, regardless of source. * hotspot.map: Bump to latest hs20 (b10). -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> Use more accurate ENABLE_CACAO rather than WITH_CACAO. @@ -6042,13 +6076,13 @@ Testcase correction - the test LastErrorString must not rewrite system files. -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> * patches/sunsrc.patch: Removed. * Makefile.am: Drop patch, obsoleted by pr586-include_all_srcs.patch. -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> PR586: Classes missing from src.zip * Makefile.am: Add new patch. @@ -6056,7 +6090,7 @@ Don't filter sources to include. * NEWS: Updated. -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> PR635: zero fails to build on icedtea6 trunk 20110217 with hs20 * Makefile.am: @@ -6068,7 +6102,7 @@ Fix icedtea-ecj build with --enable-jamvm (stamps/icedtea-ecj.stamp): Add stamps/jamvm.stamp -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> PR497: Mercurial revision detection not very reliable * acinclude.m4: @@ -6114,7 +6148,7 @@ (BUILD_JAMVM): New conditional. (ENABLE_JAMVM): New conditional. -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> PR633: IcedTea installs javaws manpages on x86 even with --disable-webstart @@ -6124,7 +6158,7 @@ * patches/pr633-no_javaws_man_page.patch: Don't try and install javaws.1 on 32-bit platforms. -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> PR103: Usage of native2ascii during bootstrap. * Makefile.am: @@ -6134,18 +6168,18 @@ (IT_FIND_NATIVE2ASCII): Added. * configure.ac: Call IT_FIND_NATIVE2ASCII. -2011-02-22 Andrew John Hughes <ahughes@redhat.com> +2011-02-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (bootstrap-directory-ecj): Fix double absolute path specification in creation of $(ECJ_BOOT_DIR)/lib. -2011-02-21 Andrew John Hughes <ahughes@redhat.com> +2011-02-21 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Mention cleanups. -2011-02-21 Andrew John Hughes <ahughes@redhat.com> +2011-02-21 Andrew John Hughes <gnu.andrew@redhat.com> Ensure all our macros have an IT_ prefix. * acinclude.m4: @@ -6185,7 +6219,7 @@ (IT_OBTAIN_HG_REVISIONS): Fix dependence on WITH_OPENJDK_SRC_DIR. * configure.ac: Use renamed macros throughout. -2011-02-21 Andrew John Hughes <ahughes@redhat.com> +2011-02-21 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea-ant.patch, * patches/ecj/icedtea-hotspot.patch, @@ -6357,14 +6391,14 @@ * patches/jtreg-WindowWithWarningTest: Removed patch for obsolete test. -2011-02-18 Andrew John Hughes <ahughes@redhat.com> +2011-02-18 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (JAXP_DROP_ZIP): Use zip with security fix. (JAXP_DROP_SHA256SUM): Likewise. (SECURITY_PATCHES): Drop local JAXP security fix. -2011-02-17 Andrew John Hughes <ahughes@redhat.com> +2011-02-17 Andrew John Hughes <gnu.andrew@redhat.com> S6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails * Makefile.am: Add patch. @@ -6372,7 +6406,7 @@ * patches/openjdk/6444769-windowwithwarningtest.patch: Remove obsolete WindowWithWarningTest. -2011-02-17 Andrew John Hughes <ahughes@redhat.com> +2011-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20110209/4421494.patch, * patches/security/20110215/6878713.patch, @@ -6384,11 +6418,11 @@ Drop security patches available upstream. * Makefile.am: Remove above. -2011-02-17 Andrew John Hughes <ahughes@redhat.com> +2011-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Fix placement of PR632. -2011-02-17 Andrew John Hughes <ahughes@redhat.com> +2011-02-17 Andrew John Hughes <gnu.andrew@redhat.com> 6693253: Security Warning appearance requires enhancements 6779717: A Window does not show applet security warning icon on X platforms @@ -6432,7 +6466,7 @@ * Makefile.am (ICEDTEA_PATCHES): Add new patch. * NEWS: Updated. -2011-02-16 Andrew John Hughes <ahughes@redhat.com> +2011-02-16 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-nomotif-6706121.patch: Remove .orig file created by previous @@ -6444,12 +6478,12 @@ * Makefile.am (ICEDTEA_PATCHES): Added the patch * patches/openjdk/6896068-sg2d.patch: Patch -2011-02-16 Andrew John Hughes <ahughes@redhat.com> +2011-02-16 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Include new releases: 1.7.9, 1.7.10, 1.8.6, 1.8.7, 1.9.6, 1.9.7. -2011-02-11 Andrew John Hughes <ahughes@redhat.com> +2011-02-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add additional patch. * NEWS: Updated. @@ -6457,7 +6491,7 @@ Add patch for 6927050 missing from first two Oracle bundles. -2011-02-10 Andrew John Hughes <ahughes@redhat.com> +2011-02-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add additional patch. * NEWS: Updated. @@ -6465,7 +6499,7 @@ Add patch for 6985453 missing from first Oracle bundle. -2011-02-09 Andrew John Hughes <ahughes@redhat.com> +2011-02-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patches. * NEWS: Updated. @@ -6481,19 +6515,19 @@ * patches/security/20110215/6994263.patch: Security updates from Oracle SSR. -2011-02-15 Andrew John Hughes <ahughes@redhat.com> +2011-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Mention backports of copyright header fixes for 6616323 and 6633275. -2011-02-15 Andrew John Hughes <ahughes@redhat.com> +2011-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patch below. * NEWS: Updated. * patches/openjdk/6633275-shaped_translucent_windows.patch: Support shaped/translucent windows -2011-02-13 Andrew John Hughes <ahughes@redhat.com> +2011-02-13 Andrew John Hughes <gnu.andrew@redhat.com> G344659: Fix issue when building on SPARC * Makefile.am: Add new patch. @@ -6501,7 +6535,7 @@ * patches/g344659-sparc_fix.patch: Add fix for SPARC builds on Gentoo. -2011-02-13 Andrew John Hughes <ahughes@redhat.com> +2011-02-13 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Updated. @@ -6512,14 +6546,14 @@ * patches/rh676659-gcc-export-dynamic.patch: Pass -Wl,-export-dynamic rather than -export-dynamic. -2011-02-09 Andrew John Hughes <ahughes@redhat.com> +2011-02-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patch. * NEWS: Updated. * patches/security/20110209/4421494.patch: Add floating point bug fix. -2011-02-06 Andrew John Hughes <ahughes@redhat.com> +2011-02-06 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patches below. * patches/openjdk/4993545-nativeinlightfixer.patch, @@ -6534,7 +6568,7 @@ * patches/openjdk/6797195-hw_lw_mixing.patch: New AWT backport from OpenJDK7. -2011-02-03 Andrew John Hughes <ahughes@redhat.com> +2011-02-03 Andrew John Hughes <gnu.andrew@redhat.com> PR616, PR99: * Makefile.am: Add new patch. @@ -6554,7 +6588,7 @@ * patches/openjdk/4645692-CubicCurve2D.solveCubic.patch: Likewise. * patches/openjdk/4724552-CubicCurve2D.patch: Likewise. -2011-02-01 Andrew John Hughes <ahughes@redhat.com> +2011-02-01 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add announcements for 1.7.8, 1.8.5 and 1.9.5. @@ -6565,7 +6599,7 @@ Added two new regression tests which check correct behaviour of PNG reader. -2011-01-29 Andrew John Hughes <ahughes@redhat.com> +2011-01-29 Andrew John Hughes <gnu.andrew@redhat.com> * patches/gcc-suffix.patch, * patches/ia64-fix.patch: @@ -6627,11 +6661,11 @@ * patches/openjdk/6797139-jbutton_truncation.patch: Likewise. * patches/openjdk/6883341-text_bearing_exception.patch: Likewise. -2011-01-24 Andrew John Hughes <ahughes@redhat.com> +2011-01-24 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add unlisted backports. -2011-01-24 Andrew John Hughes <ahughes@redhat.com> +2011-01-24 Andrew John Hughes <gnu.andrew@redhat.com> * patches/661505-jpeg.patch: Move to... @@ -6641,12 +6675,12 @@ * patches/rh661505-jpeg.patch: ... here. -2011-01-24 Andrew John Hughes <ahughes@redhat.com> +2011-01-24 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.9.3, 1.9.4, 1.7.7 and 1.8.4 NEWS entries. -2011-01-24 Andrew John Hughes <ahughes@redhat.com> +2011-01-24 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Update 1.10 with b21 changes. Remove changes in b21 from list of backports. @@ -6661,12 +6695,12 @@ * Makefile.am (ICEDTEA_PATCHES): Add missing backslash. -2011-01-22 Andrew John Hughes <ahughes@redhat.com> +2011-01-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Bump to b22. -2011-01-22 Andrew John Hughes <ahughes@redhat.com> +2011-01-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use b21 tarball. @@ -6693,25 +6727,25 @@ * Makefile.am (ICEDTEA_PATCHES): Add new patch. * patches/openjdk/6642612-filechooser_button_sizes.patch: New file. -2011-01-13 Andrew John Hughes <ahughes@redhat.com> +2011-01-13 Andrew John Hughes <gnu.andrew@redhat.com> * patches/jtreg-DeleteFont.patch: Drop patch. No longer needed due to backport of 7009828 upstream. * Makefile.am: Drop above. -2011-01-13 Andrew John Hughes <ahughes@redhat.com> +2011-01-13 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6980392-fix_test6581734.patch: Remove upstreamed patch. * Makefile.am: Drop above patch. -2011-01-10 Andrew John Hughes <ahughes@redhat.com> +2011-01-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (OPENJDK_VERSION): Bump to b21. -2011-01-10 Andrew John Hughes <ahughes@redhat.com> +2011-01-10 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6541476-png-iTXt-chunk.patch, * patches/openjdk/6782079-png_metadata_oom.patch, @@ -6720,7 +6754,7 @@ * Makefile.am: Remove above patches. -2011-01-07 Andrew John Hughes <ahughes@redhat.com> +2011-01-07 Andrew John Hughes <gnu.andrew@redhat.com> * patches/jtreg-TestXEmbedServer-fix.patch: Moved to... @@ -6730,7 +6764,7 @@ * patches/openjdk/6560348-jtreg-TestXEmbedServer-fix.patch: ... OpenJDK patch with appropriate bug ID. -2011-01-07 Andrew John Hughes <ahughes@redhat.com> +2011-01-07 Andrew John Hughes <gnu.andrew@redhat.com> * patches/jtreg-TestXEmbedServer-fix.patch, * patches/openjdk/6668231-ssl_cert.patch, @@ -6859,7 +6893,7 @@ Regression test fix - corrected .out file used for check messages generated by java compiler. -2010-12-01 Andrew John Hughes <ahughes@redhat.com> +2010-12-01 Andrew John Hughes <gnu.andrew@redhat.com> * patches/applet_hole.patch: Add generic types to Hashtable to stop warnings @@ -6870,12 +6904,12 @@ * test/jtreg/com/sun/javatest/regtest/CompileAction.java: Removed printing of unnecessary messages from JTreg harness. -2010-12-01 Andrew John Hughes <ahughes@redhat.com> +2010-12-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Apply 7002666 to both hs17 and hs19. -2010-12-01 Andrew John Hughes <ahughes@redhat.com> +2010-12-01 Andrew John Hughes <gnu.andrew@redhat.com> * patches/disable-default-compoops.patch: Removed. * Makefile.am: Replace disable compressed oops workaround @@ -6914,7 +6948,7 @@ * patches/hotspot/hs19/params-cast-size_t.patch: Update for hs19. -2010-11-24 Andrew John Hughes <ahughes@redhat.com> +2010-11-24 Andrew John Hughes <gnu.andrew@redhat.com> Final plugin & NetX cleanup. * patches/extensions/netx-umask.patch: @@ -6931,7 +6965,7 @@ * patches/applet_hole.patch: Remainder of netx.patch which makes AppletViewerPanel accessible. -2010-11-24 Andrew John Hughes <ahughes@redhat.com> +2010-11-24 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.7.6, 1.8.3 and 1.9.2 releases. @@ -6953,13 +6987,13 @@ * Makefile.am (stamps/add-zero.stamp): Add shark alias when building zero with shark support on hotspot archs. -2010-11-19 Andrew John Hughes <ahughes@redhat.com> +2010-11-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/xrender-gc-cleanup.patch: Fix memory leak in XRender pipeline. -2010-11-19 Andrew John Hughes <ahughes@redhat.com> +2010-11-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add download-cacao alias. @@ -6973,14 +7007,14 @@ * patches/jtreg-DeleteFont.patch: Testcase correction - the test now ignores directory created by HS. -2010-11-12 Andrew John Hughes <ahughes@redhat.com> +2010-11-12 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-local): Add clean-fonts. (.PHONY): Likewise. (clean-fonts): Remove fonts.stamp. -2010-11-12 Andrew John Hughes <ahughes@redhat.com> +2010-11-12 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6622432-bigdecimal_performance.patch, * patches/openjdk/6850606-bigdecimal_regression.patch, @@ -6995,7 +7029,7 @@ * Makefile.am: Upgrade CACAO version, use .tar.gz archive -2010-11-09 Andrew John Hughes <ahughes@redhat.com> +2010-11-09 Andrew John Hughes <gnu.andrew@redhat.com> * patches/6703377-freetypescaler.patch, * patches/openjdk/6853592-badwindow-warning-fix.patch: @@ -7013,11 +7047,11 @@ * patches/openjdk/6980392-fix_test6581734.patch: Testcase correction - added missing right bracket. -2010-11-10 Andrew John Hughes <ahughes@redhat.com> +2010-11-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove additional whitespace. -2010-11-10 Andrew John Hughes <ahughes@redhat.com> +2010-11-10 Andrew John Hughes <gnu.andrew@redhat.com> RH647737 Disable compressed oops in hs19. @@ -7037,7 +7071,7 @@ Updated font configurations for Fedora 9-14 Add additional fontconfig files to Makefile. -2010-11-10 Andrew John Hughes <ahughes@redhat.com> +2010-11-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add BigDecimal/Integer performance improvement patches. @@ -7046,7 +7080,7 @@ * patches/openjdk/6876282-bigdecimal_divide.patch: Added. -2010-11-09 Andrew John Hughes <ahughes@redhat.com> +2010-11-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (JAXWS_DROP_URL): Switch to IcedTea server. @@ -7068,7 +7102,7 @@ Backport of the openjdk7 rendering engine, which fixes various bugs and includes performance improvements. -2010-11-05 Andrew John Hughes <ahughes@redhat.com> +2010-11-05 Andrew John Hughes <gnu.andrew@redhat.com> * hotspot.map: Switch back to master now changes have been @@ -7079,12 +7113,12 @@ * patches/hotspot/hs19/params-cast-size_t.patch: Add additional fixes for S390. -2010-11-02 Andrew John Hughes <ahughes@redhat.com> +2010-11-02 Andrew John Hughes <gnu.andrew@redhat.com> * hotspot.map: Update md5sum for new HotSpot. -2010-11-02 Andrew John Hughes <ahughes@redhat.com> +2010-11-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (replace-hotspot): Don't hardcode 'master' @@ -7102,7 +7136,7 @@ for checking if all non-Latin fonts are installed and properly configured. -2010-10-22 Andrew John Hughes <ahughes@redhat.com> +2010-10-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch for hs19 builds only. @@ -7111,7 +7145,7 @@ Fix build on PPC machines (thanks to Gary Benson). -2010-10-22 Andrew John Hughes <ahughes@redhat.com> +2010-10-22 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (FIND_JAVAC): Don't fail if $JAVAC is empty, @@ -7119,7 +7153,7 @@ (FIND_ECJ_JAR): Check additional Gentoo locations. Fail only if both $JAVAC is empty and ECJ_JAR is no. -2010-10-20 Andrew John Hughes <ahughes@redhat.com> +2010-10-20 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Clarify HotSpot build documentation. * acinclude.m4: @@ -7130,7 +7164,7 @@ Use DEFAULT_BUILD only for when the option is not specified. -2010-10-19 Andrew John Hughes <ahughes@redhat.com> +2010-10-19 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20101012/6559775.patch, * patches/security/20101012/6622002.patch, @@ -7154,7 +7188,7 @@ * patches/icedtea-lcms.patch: Rejigged against upstream security patch. -2010-10-18 Andrew John Hughes <ahughes@redhat.com> +2010-10-18 Andrew John Hughes <gnu.andrew@redhat.com> * patches/hotspot/hs19/alpha-fixes.patch, * patches/hotspot/hs19/gcc-suffix.patch, @@ -7234,7 +7268,7 @@ * acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Default to original. -2010-10-19 Andrew John Hughes <ahughes@redhat.com> +2010-10-19 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Drop plugin dependencies. Document new JDK detection. Drop removed @@ -7255,7 +7289,7 @@ the build enabled by --with-hotspot-build, which is 'original' (hs17) at present. -2010-10-19 Andrew John Hughes <ahughes@redhat.com> +2010-10-19 Andrew John Hughes <gnu.andrew@redhat.com> Move NetX and the plugin to the IcedTea-Web project: http://icedtea.classpath.org/hg/icedtea-web @@ -7523,13 +7557,13 @@ (IT_CHECK_XULRUNNER_VERSION): Likewise. * configure.ac: Don't call IT_CHECK_XULRUNNER_VERSION. -2010-10-18 Andrew John Hughes <ahughes@redhat.com> +2010-10-18 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (RUNTIME): Define conditionally, so that jsse.jar is added when not bootstrapping. -2010-10-18 Andrew John Hughes <ahughes@redhat.com> +2010-10-18 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (RUNTIME): Revert Omair's change which breaks @@ -7554,7 +7588,7 @@ (temporarilyUntrust): New method. (isTemporarilyUntrusted): New method. -2010-10-18 Andrew John Hughes <ahughes@redhat.com> +2010-10-18 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (NETX_SUN_CLASSES): List internal Sun class @@ -7604,7 +7638,7 @@ * configure.ac: New option --with-llvm-config. * INSTALL: Document it. -2010-10-13 Andrew John Hughes <ahughes@redhat.com> +2010-10-13 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.7.5, 1.8.2 and 1.9.1 releases. @@ -7617,12 +7651,12 @@ (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@redhat.com> +2010-10-11 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add CVE numbers and list 6925672 which is covered by the 6891766 fix. -2010-10-11 Andrew John Hughes <ahughes@redhat.com> +2010-10-11 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-timerqueue.patch: Dropped; superceded by 6623943. @@ -7658,7 +7692,7 @@ * net/sourceforge/jnlp/util/FileUtils.java (recursiveDelete): New method. -2010-10-05 Andrew John Hughes <ahughes@redhat.com> +2010-10-05 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20100330/hotspot/original/6626217.patch: Remove dead security patch. @@ -7708,12 +7742,12 @@ passed in. (handleMessage): Removed the redundant reframe from initialization. -2010-09-29 Andrew John Hughes <ahughes@redhat.com> +2010-09-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (extract-openjdk): Add missing endif. -2010-09-29 Andrew John Hughes <ahughes@redhat.com> +2010-09-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (download-openjdk): Clone OpenJDK to openjdk.hg @@ -7729,13 +7763,13 @@ NPERR_GENERIC_ERROR instead of NPERR_NO_ERROR. * NEWS: Updated accordingly. -2010-09-29 Andrew John Hughes <ahughes@redhat.com> +2010-09-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (add-tzdata-support-debug): Depend on icedtea-debug, not icedtea. (add-tzdata-support-ecj): Depend on icedtea-ecj, not icedtea. -2010-09-24 Andrew John Hughes <ahughes@redhat.com> +2010-09-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (.PHONY): Add new clean targets. @@ -7759,20 +7793,20 @@ (add-tzdata-support-ecj): New target to add alternate timezone data support to the ecj build. (clean-add-tzdata-support-ecj): Remove alternate timezone data support from the ecj build. -2010-09-24 Andrew John Hughes <ahughes@redhat.com> +2010-09-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (distclean-local): Remove any old tarballs before trying to remove the drops directory. -2010-09-24 Andrew John Hughes <ahughes@redhat.com> +2010-09-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-local): Remove add-x and add-x-debug clean targets. (clean-icedtea-against-icedtea): Add clean-add-x targets. (clean-icedtea-debug-against-icedtea): Add clean-add-x-debug targets. -2010-09-23 Andrew John Hughes <ahughes@redhat.com> +2010-09-23 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-awt-window-size.patch: Moved to... @@ -7780,7 +7814,7 @@ * patches/openjdk/6721088-awt_window_size.patch, ...here to reflect upstreaming. -2010-09-23 Andrew John Hughes <ahughes@redhat.com> +2010-09-23 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-awt-window-size.patch, * patches/openjdk/6969395-net_bugs.patch, @@ -7788,7 +7822,7 @@ Dropped; upstreamed. * Makefile.am: Remove above patches. -2010-09-23 Andrew John Hughes <ahughes@redhat.com> +2010-09-23 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (.PHONY): Add clean-add-nss, clean-add-nss-debug, @@ -7807,7 +7841,7 @@ (clean-add-tzdata-support): Remove alternate timezone data support from the build. (clean-add-tzdata-support-debug): Likewise for debug. -2010-09-23 Andrew John Hughes <ahughes@redhat.com> +2010-09-23 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (.PHONY): Add clean-add-pulseaudio and @@ -7823,7 +7857,7 @@ (clean-add-pulseaudio): Remove PulseAudio support from the build. (clean-add-pulseaudio-debug): Likewise for debug. -2010-09-22 Andrew John Hughes <ahughes@redhat.com> +2010-09-22 Andrew John Hughes <gnu.andrew@redhat.com> Move SystemTap support to a separate target. * Makefile.am: @@ -7843,7 +7877,7 @@ (clean-add-systemtap): Remove SystemTap support from the build. (clean-add-systemtap-debug): Likewise for debug. -2010-09-22 Andrew John Hughes <ahughes@redhat.com> +2010-09-22 Andrew John Hughes <gnu.andrew@redhat.com> * ports/hotspot/make/linux/makefiles/shark.make, * ports/hotspot/src/cpu/zero/vm/asm_helper.cpp, @@ -7967,14 +8001,14 @@ * patches/openjdk/6984543-onscreen_rendering_resize_test.patch: Testcase correction. -2010-09-20 Andrew John Hughes <ahughes@redhat.com> +2010-09-20 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Enable icedtea-shark-build.patch on all builds as it applies to the top-level makefiles and not HotSpot. -2010-09-19 Andrew John Hughes <ahughes@redhat.com> +2010-09-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (hotspot): Only remake the main icedtea @@ -7982,13 +8016,13 @@ build) and not the additional targets from icedtea-against-icedtea and icedtea-against-ecj. -2010-09-19 Andrew John Hughes <ahughes@redhat.com> +2010-09-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Revert 2713dbdb914e changes to javaws.1 installation. -2010-09-19 Andrew John Hughes <ahughes@redhat.com> +2010-09-19 Andrew John Hughes <gnu.andrew@redhat.com> Support HotSpot 19. * patches/icedtea-alpha-fixes.patch, @@ -8022,7 +8056,7 @@ (ITNP_Destroy): Send a destroy message to let Java side know that the applet needs to be destroyed. -2010-09-17 Andrew John Hughes <ahughes@redhat.com> +2010-09-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. @@ -8035,7 +8069,7 @@ * Makefile.am: Only create man pages for javaws if ENABLE_DOCS is set and the man directory exists. -2010-09-17 Andrew John Hughes <ahughes@redhat.com> +2010-09-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6638712-wildcard_types.patch: Fix copyrights (from 6875336) and test output. @@ -8043,7 +8077,7 @@ Remove test output changes already incorporated in 6875336. -2010-09-09 Andrew John Hughes <ahughes@redhat.com> +2010-09-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patches. * NEWS: Document new patches. Fix key. @@ -8114,11 +8148,11 @@ * patches/params-cast-size_t.patch: Update, fix build failure on s390. -2010-09-08 Andrew John Hughes <ahughes@redhat.com> +2010-09-08 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Sync with 1.9 branch. -2010-09-07 Andrew John Hughes <ahughes@redhat.com> +2010-09-07 Andrew John Hughes <gnu.andrew@redhat.com> S6510892, S6969395: * Makefile.am: Add new patches. @@ -8127,7 +8161,7 @@ * patches/openjdk/6969395-net_bugs.patch: Fix networking tests. -2010-09-05 Andrew John Hughes <ahughes@redhat.com> +2010-09-05 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6438179-systray_check.patch: Dropped, applied upstream. @@ -8154,7 +8188,7 @@ Backport of 6755274 and 6791612 patches to fix OpenGL-related failures (improper OpenGL initialization and missing link to native functions) -2010-08-27 Andrew John Hughes <ahughes@redhat.com> +2010-08-27 Andrew John Hughes <gnu.andrew@redhat.com> PR398, S6951319: * Makefile.am: Add new patch. @@ -8198,7 +8232,7 @@ * Makefile.am (ICEDTEA_PATCHES): Apply new patch. * patches/openjdk/6438179-systray_check.patch: Backport of S6438179. -2010-08-24 Andrew John Hughes <ahughes@redhat.com> +2010-08-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Compile NimbusLookAndFeel as a bootstrap class so the older version from @@ -8231,7 +8265,7 @@ * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (setSplashImageURL): Check for possible null. -2010-08-13 Andrew John Hughes <ahughes@redhat.com> +2010-08-13 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/javah.patch: Moved to... * Makefile.am: Apply patch to OpenGL headers @@ -8239,7 +8273,7 @@ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188 * patches/ecj/cp40188-opengl.patch: here. -2009-05-19 Andrew John Hughes <ahughes@redhat.com> +2009-05-19 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_JAVAH): Renamed from IT_CP39408_JAVAH. @@ -8248,13 +8282,13 @@ Make full bootstrap the default again. Rename IT_CP39408_JAVAH to IT_JAVAH. -2009-03-18 Andrew John Hughes <ahughes@redhat.com> +2009-03-18 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CP39408_JAVAH): Add classpath specification to JAVAC invocation to handle buggy ecjs. -2009-03-17 Andrew John Hughes <ahughes@redhat.com> +2009-03-17 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CP39408_JAVAH): New test for Classpath @@ -8262,7 +8296,7 @@ * configure.ac: Enable new test. Result as yet unused. -2010-08-13 Andrew John Hughes <ahughes@redhat.com> +2010-08-13 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Replace conditionals on LACKS_SUN_AWT_TOOLKIT @@ -8273,7 +8307,7 @@ * configure.ac: Remove check for sun.awt.Toolkit. -2010-08-12 Andrew John Hughes <ahughes@redhat.com> +2010-08-12 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/4356282-opentype.patch, * patches/openjdk/6795060-icu_crash.patch, @@ -8282,7 +8316,7 @@ * Makefile.am: Remove above patches. -2010-08-12 Andrew John Hughes <ahughes@redhat.com> +2010-08-12 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6678385-window_movement_crasher.patch: Dropped, applied upstream. @@ -8297,7 +8331,7 @@ * patches/openjdk/6954424-opentype_javadoc.patch: Fixes javadocs to mention OpenType font support. -2009-07-17 Andrew John Hughes <ahughes@redhat.com> +2009-07-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove use of WITH_OPENJDK and SYSTEM_GCJ_DIR @@ -8332,7 +8366,7 @@ * patches/update-bootclasspath.patch: New patch. Adds netx, rhino and plugin jars to the bootclasspath. -2010-08-09 Andrew John Hughes <ahughes@redhat.com> +2010-08-09 Andrew John Hughes <gnu.andrew@redhat.com> Produce separate JAR files for NetX and the plugin (netx.jar and plugin.jar) rather than @@ -8372,12 +8406,12 @@ * NEWS: Update with support for JNLP spec 1.6 * net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. -2010-08-06 Andrew John Hughes <ahughes@redhat.com> +2010-08-06 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Bump to 1.10. * NEWS: Add 1.10 section. -2010-08-06 Andrew John Hughes <ahughes@redhat.com> +2010-08-06 Andrew John Hughes <gnu.andrew@redhat.com> Fix build on PAX-enabled kernels. https://bugs.gentoo.org/244901 @@ -8398,7 +8432,7 @@ * patches/no-test_gamma.patch: test_gamma patch for PaX-enabled kernels. -2010-08-05 Andrew John Hughes <ahughes@redhat.com> +2010-08-05 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * NEWS: Updated. @@ -8414,7 +8448,7 @@ getMethod. Fixes applications that have a main-class that inherits main(String[]). -2010-08-05 Andrew John Hughes <ahughes@redhat.com> +2010-08-05 Andrew John Hughes <gnu.andrew@redhat.com> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 * Makefile.am: Add new patch. @@ -8433,7 +8467,7 @@ (SharkBuilder::CreateDump): Make non-product debug code LLVM 2.7 API compatible. -2010-08-03 Andrew John Hughes <ahughes@redhat.com> +2010-08-03 Andrew John Hughes <gnu.andrew@redhat.com> Backport latest XRender pipeline. * patches/xrender/icedtea-000.patch, @@ -8464,11 +8498,11 @@ build heavily on changes made by 6725214 for the Direct3D pipeline. -2010-08-02 Andrew John Hughes <ahughes@redhat.com> +2010-08-02 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Updated with font fixes. -2010-08-02 Andrew John Hughes <ahughes@redhat.com> +2010-08-02 Andrew John Hughes <gnu.andrew@redhat.com> http://bugs.gentoo.org/show_bug.cgi?id=266295: * Makefile.am: Add patch below. @@ -8476,7 +8510,7 @@ Add a font configuration for Gentoo (currently a copy of Fedora's). -2010-07-30 Andrew John Hughes <ahughes@redhat.com> +2010-07-30 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patch below. * patches/fonts-rhel.patch: @@ -8519,11 +8553,11 @@ * Makefile.am: include above patch. * NEWS: Add 6967533 backport. -2010-07-29 Andrew John Hughes <ahughes@redhat.com> +2010-07-29 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 6961732 backport. -2010-07-29 Andrew John Hughes <ahughes@redhat.com> +2010-07-29 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Update with contents of b19 & b20, and fixes to NetX, Zero and Shark not on @@ -8543,7 +8577,7 @@ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkDecacher::end_frame): Add missing fields. -2010-07-28 Andrew John Hughes <ahughes@redhat.com> +2010-07-28 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add 1.7.2, 1.7.3, 1.7.4 and 1.6.3 releases. @@ -8642,18 +8676,18 @@ * NEWS: Add 1.8.1 entry. -2010-07-26 Andrew John Hughes <ahughes@redhat.com> +2010-07-26 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-jtreg-jrunscript.patch: Regenerate after 50002bfcff96 from dcubed being added to OpenJDK6. -2010-07-26 Andrew John Hughes <ahughes@redhat.com> +2010-07-26 Andrew John Hughes <gnu.andrew@redhat.com> * README: Updated for HEAD using IcedTea7 version. * INSTALL: Likewise. -2010-07-21 Andrew John Hughes <ahughes@redhat.com> +2010-07-21 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Updated, with documentation of new options and removal of outdated information. @@ -8667,16 +8701,16 @@ * configure.ac: Fix default in configure help for NIO2. -2010-07-21 Andrew John Hughes <ahughes@redhat.com> +2010-07-21 Andrew John Hughes <gnu.andrew@redhat.com> * README: Updated. -2010-07-20 Andrew John Hughes <ahughes@redhat.com> +2010-07-20 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c: Define _ATFILE_SOURCE to obtain fstatat64, regardless of architecture. -2010-07-25 Andrew John Hughes <ahughes@redhat.com> +2010-07-25 Andrew John Hughes <gnu.andrew@redhat.com> Make purpose of OpenJDK patches clearer and use original changeset for 6963870. @@ -8688,7 +8722,7 @@ * patches/openjdk/6961732-negative_leading.patch, * patches/openjdk/6963870-swing_npe.patch: these. -2010-07-25 Andrew John Hughes <ahughes@redhat.com> +2010-07-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patch. * patches/openjdk/6668231-ssl_cert.patch: @@ -8706,7 +8740,7 @@ class CompoundBorder method getBorderInsets. * Makefile.am: Include above patch. -2010-07-23 Andrew John Hughes <ahughes@redhat.com> +2010-07-23 Andrew John Hughes <gnu.andrew@redhat.com> * netx/net/sourceforge/jnlp/security/AccessWarningPane.java: (addComponents()): Fix call to getType(). @@ -8715,7 +8749,7 @@ (getType): Rename to getAccessType() to avoid conflict with Window.getType() in OpenJDK7. -2010-07-23 Andrew John Hughes <ahughes@redhat.com> +2010-07-23 Andrew John Hughes <gnu.andrew@redhat.com> * netx/javax/jnlp/BasicService.java, * netx/javax/jnlp/ClipboardService.java, @@ -9038,7 +9072,7 @@ * plugin/icedteanp/IcedTeaPluginUtils.h: Same. * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Same. -2010-07-12 Andrew John Hughes <ahughes@redhat.com> +2010-07-12 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/521 * Makefile.am: @@ -9068,7 +9102,7 @@ and determines what the files encoding is. * NEWS: Fixes icedtea bug 486. -2010-07-08 Andrew John Hughes <ahughes@redhat.com> +2010-07-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (rebuild): Add new target to allow a quick @@ -9089,7 +9123,7 @@ New file. Some applets, for legacy support, expect this class to be present. -2010-07-08 Andrew John Hughes <ahughes@redhat.com> +2010-07-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-extract-ecj): Don't depend on clean-patch-ecj, @@ -9097,13 +9131,13 @@ (clean-extract-openjdk): Likewise for clean-patch and clean-patch-fsg. -2010-07-07 Andrew John Hughes <ahughes@redhat.com> +2010-07-07 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6961732.patch: Dropped, applied upstream. * Makefile.am: Remove above patch. -2010-07-06 Andrew John Hughes <ahughes@redhat.com> +2010-07-06 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (PULSE_JAVA_BUILDDIR): Use a different name from @@ -9119,7 +9153,7 @@ PULSE_JAVA_CLASS_DIR are set, there is no need to test them. -2010-07-05 Andrew John Hughes <ahughes@redhat.com> +2010-07-05 Andrew John Hughes <gnu.andrew@redhat.com> Revert rt.jar only for ecj tree. Don't do so (or build rt-class-files) for builds with @@ -9135,13 +9169,13 @@ (clean-rt): Only replace rt.jar when LACKS_SUN_AWT_TOOLKIT and overwrite in $(ECJ_BOOT_DIR) not $(BOOT_DIR). -2010-07-05 Andrew John Hughes <ahughes@redhat.com> +2010-07-05 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-local): Don't remove the stamps directory here. (distclean-local): Remove it here. -2010-07-04 Andrew John Hughes <ahughes@redhat.com> +2010-07-04 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-local): Add missing dependencies. @@ -9159,25 +9193,25 @@ (rt): Only replace rt.jar if the bootstrap tree still exists. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (generated): Make sure generated.stamp is created. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (download-openjdk): Create download-openjdk.stamp, not download.stamp. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (distclean-local): Delete empty tapset directory if srcdir != builddir. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> Don't delete alternate source zips. Only zips downloaded by the build should be deleted. @@ -9193,7 +9227,7 @@ (clean-download-openjdk): Remvoe HOTSPOT_SRC_ZIP as well. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (distclean-local): Added. Removes downloads @@ -9206,14 +9240,14 @@ (clean-download): Metatarget for all download cleaning. (clean-cacao): Remove extraction stamp. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-IcedTeaPlugin): Check directory exists before using rmdir. (clean-pulse-java): Likewise. -2010-07-01 Andrew John Hughes <ahughes@redhat.com> +2010-07-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (clean-local): Add clean-extract (in place @@ -9262,7 +9296,7 @@ (sanitizeFileName): Use a blacklisting approach rather than a whitelisting approach: should work better with non ascii filenames. -2010-06-30 Andrew John Hughes <ahughes@redhat.com> +2010-06-30 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/93 * Makefile.am: Fix cleanup process. @@ -9291,7 +9325,7 @@ (clean-add-zero-debug): Inverse of add-zero-debug.stamp. (clean): Removed; already provided by autoconf to point to clean-local. -2010-06-29 Andrew John Hughes <ahughes@redhat.com> +2010-06-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/no-sync.patch: Don't pass --sync @@ -9299,7 +9333,7 @@ to be so accurate that we have to flush all buffers to disc. -2010-06-28 Andrew John Hughes <ahughes@redhat.com> +2010-06-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_DEBUG_BUILD_TARGET): Don't add @@ -9308,7 +9342,7 @@ Makefile to just add the debug suffix and not move it to ../$(OS)-$(ARCH)-debug. -2010-06-25 Andrew John Hughes <ahughes@redhat.com> +2010-06-25 Andrew John Hughes <gnu.andrew@redhat.com> Remove VisualVM support, now maintained at http://icedtea.classpath.org/hg/visualvm @@ -9348,7 +9382,7 @@ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update. * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update. -2010-06-24 Andrew John Hughes <ahughes@redhat.com> +2010-06-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch and update: @@ -9360,7 +9394,7 @@ the update from 1.1.0pre to 1.1.0pre1 in the new changeset. -2010-06-24 Andrew John Hughes <ahughes@redhat.com> +2010-06-24 Andrew John Hughes <gnu.andrew@redhat.com> * patches/cacao/6714758.patch: Removed, 6714758 is not in OpenJDK6. @@ -9396,7 +9430,7 @@ (activateJars): Always call activateNative. (activateNative): Search for native code anywhere in the jar. -2010-06-24 Andrew John Hughes <ahughes@redhat.com> +2010-06-24 Andrew John Hughes <gnu.andrew@redhat.com> Matthias Klose <doko@ubuntu.com> * patches/cacao/no-strict-aliasing.patch: Remove, applied upstream. @@ -9418,7 +9452,7 @@ * Makefile.am (ICEDTEA_PATCHES): Add/remove patches. Use Mercurial snapshot of CACAO 1.1.0pre. -2010-05-11 Andrew John Hughes <ahughes@redhat.com> +2010-05-11 Andrew John Hughes <gnu.andrew@redhat.com> Fix issues with the CACAO build so it at least builds again (though it still fails to @@ -9431,31 +9465,31 @@ * patches/cacao/jsig.patch: Place fake libjsig.so in correct location for HotSpot 17+. -2010-06-22 Andrew John Hughes <ahughes@redhat.com> +2010-06-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/openjdk/6961732.patch: Backport of 6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds -2010-06-22 Andrew John Hughes <ahughes@redhat.com> +2010-06-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ports.stamp): Remove unneeded linking of platform_zero (no longer exists). -2010-06-22 Andrew John Hughes <ahughes@redhat.com> +2010-06-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Replace ICEDTEA_DEBUG_BUILD_DIR with DEBUG_BUILD_OUTPUT_DIR. -2010-06-22 Andrew John Hughes <ahughes@redhat.com> +2010-06-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Bump to b20 tarball. -2010-06-17 Andrew John Hughes <ahughes@redhat.com> +2010-06-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/nimbus-source-target.patch: Upstreamed as 6961536. @@ -9559,7 +9593,7 @@ * patches/shark-debug-option.patch: Remaining Zero changes not upstreamed. -2010-06-14 Andrew John Hughes <ahughes@redhat.com> +2010-06-14 Andrew John Hughes <gnu.andrew@redhat.com> Don't print out the return value of pthread_self which is a pthread_t. pthread_t is an opaque type @@ -9574,7 +9608,7 @@ (PLUGIN_DEBUG_4ARG(str,arg1,arg2,arg3,arg4)): Likewise. (PLUGIN_DEBUG_5ARG(str,arg1,arg2,arg3,arg4,arg5)): Likewise. -2010-06-14 Andrew John Hughes <ahughes@redhat.com> +2010-06-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Make available BUILD_DIR for where a relative @@ -9588,7 +9622,7 @@ * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug causing 100% CPU usage (rhbz# 592553). -2010-06-14 Andrew John Hughes <ahughes@redhat.com> +2010-06-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (SRC_DIR_LINK): Use reflink only if hard @@ -9609,7 +9643,7 @@ * plugin/icedteanp/IcedTeaPluginUtils.h: Bug #488. Fix bug due to incorrect assumption that 'A' > 'a'. -2010-06-14 Andrew John Hughes <ahughes@redhat.com> +2010-06-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (REFLINK): Remove unneeded quotation. @@ -9630,7 +9664,7 @@ * plugin/icedteanp/IcedTeaNPPlugin.cc: Use getproperty NPAPI call instead of evaluate, to get page URL. -2010-06-14 Andrew John Hughes <ahughes@redhat.com> +2010-06-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (REFLINK): Set to --reflink=auto if @@ -9646,7 +9680,7 @@ * configure.ac: Invoke IT_CP_SUPPORTS_REFLINK. -2010-06-13 Andrew John Hughes <ahughes@redhat.com> +2010-06-13 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java: Removed, provided upstream. @@ -9656,7 +9690,7 @@ * patches/nimbus-source-target.patch: Fix source/target options for Nimbus sources to 6, due to presence of @Override on interfaces. -2010-06-13 Andrew John Hughes <ahughes@redhat.com> +2010-06-13 Andrew John Hughes <gnu.andrew@redhat.com> * generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java, * generated/com/sun/java/swing/plaf/nimbus/ButtonPainter.java, @@ -9747,13 +9781,13 @@ Add generated Nimbus files so SynthUI can be compiled during bootstrap. -2010-06-11 Andrew John Hughes <ahughes@redhat.com> +2010-06-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (rt.stamp): Drop old dependencies no longer needed. -2010-06-10 Andrew John Hughes <ahughes@redhat.com> +2010-06-10 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-doc-headers.patch: Dropped, upstream file has completely changed. @@ -9776,7 +9810,7 @@ * patches/icedtea-nio2.patch: Converted to use new doc generation makefile. -2010-06-08 Andrew John Hughes <ahughes@redhat.com> +2010-06-08 Andrew John Hughes <gnu.andrew@redhat.com> Remove use of ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ made obsolete by previous merge. Use --reflink=auto instead @@ -9792,7 +9826,7 @@ (netx-dist.stamp): Likewise. (plugin-tests.stamp): Likewise. -2010-06-07 Andrew John Hughes <ahughes@redhat.com> +2010-06-07 Andrew John Hughes <gnu.andrew@redhat.com> Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR absolute and dispense with ICEDTEA_BUILD_DIR and @@ -9826,7 +9860,7 @@ * Makefile.am (stamps/icedtea.stamp): Use full path when adding PulseAudio sources to src.zip -2010-06-06 Andrew John Hughes <ahughes@redhat.com> +2010-06-06 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-alpha-fixes.patch: Remove upstreamed JDK portion. @@ -9850,7 +9884,7 @@ jar application to avoid relying on the one on the path. -2010-05-26 Andrew John Hughes <ahughes@redhat.com> +2010-05-26 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea.patch, * patches/icedtea-clean-crypto.patch, @@ -9860,7 +9894,7 @@ * patches/xrender/icedtea-000.patch: Update after changes to licensing headers. -2010-05-28 Andrew John Hughes <ahughes@redhat.com> +2010-05-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (bootstrap-directory-ecj.stamp): Join dependent parts @@ -9868,7 +9902,7 @@ (rewriter.stamp): Likewise. (rewrite-rhino.stamp): Likewise. -2010-05-28 Andrew John Hughes <ahughes@redhat.com> +2010-05-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (DEBUG_BUILD_OUTPUT_DIR): New variable to represent @@ -9878,7 +9912,7 @@ (icedtea-debug): Replace use of -debug with DEBUG_BUILD_OUTPUT_DIR. -2010-05-24 Andrew John Hughes <ahughes@redhat.com> +2010-05-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: The --enable-hg option should take precedence @@ -9886,7 +9920,7 @@ Using a live Mercurial checkout only makes sense in this context. -2010-05-20 Andrew John Hughes <ahughes@redhat.com> +2010-05-20 Andrew John Hughes <gnu.andrew@redhat.com> Remove hs17 build option as this is now the default. * patches/hotspot/hs17/6873059-javac-versioning-hotspot.patch: @@ -10189,7 +10223,7 @@ (SharkTopLevelBlock::improve_virtual_call): Disable an optimization that cannot currently be supported. -2010-05-04 Andrew John Hughes <ahughes@redhat.com> +2010-05-04 Andrew John Hughes <gnu.andrew@redhat.com> Move OpenJDK patches to appropriate subdirectory. * patches/icedtea-6616792-fix.patch, @@ -10224,7 +10258,7 @@ version of these tests are now available in OpenJDK itself. -2010-04-28 Andrew John Hughes <ahughes@redhat.com> +2010-04-28 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patch when SystemTap is enabled to support @@ -10233,7 +10267,7 @@ Add cast to NULL (doesn't apply to DTrace due to differences between SystemTap and DTrace macros). -2010-04-26 Andrew John Hughes <ahughes@redhat.com> +2010-04-26 Andrew John Hughes <gnu.andrew@redhat.com> Use build directories outside the source tree and link instead of copying external @@ -10285,7 +10319,7 @@ introduced with LLVM r100304. (SharkBuilder::CreateMemset): Likewise -2010-04-18 Andrew John Hughes <ahughes@redhat.com> +2010-04-18 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java: Alters an existing file so converted to a patch. @@ -10295,7 +10329,7 @@ * patches/icedtea-nio2.patch: Extend with above NIO2 patch. -2010-04-18 Andrew John Hughes <ahughes@redhat.com> +2010-04-18 Andrew John Hughes <gnu.andrew@redhat.com> * patches/zero/shark_do_nothing_on_stub_frame.patch: Moved to hs16 and hs17 versions. @@ -10305,23 +10339,23 @@ * patches/hotspot/original/shark_do_nothing_on_stub_frame.patch: New HotSpot build-specific versions. -2010-04-18 Andrew John Hughes <ahughes@redhat.com> +2010-04-18 Andrew John Hughes <gnu.andrew@redhat.com> * hotspot.map: Bump to hs17 build 14. -2010-04-18 Andrew John Hughes <ahughes@redhat.com> +2010-04-18 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (FIND_JAR): Log all output to config.log (AC_CHECK_WITH_HG_REVISION): Likewise. (IT_CHECK_PLUGIN_DEPENDENCIES): Likewise. -2010-04-16 Andrew John Hughes <ahughes@redhat.com> +2010-04-16 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Bump to b19 tarball. -2010-04-12 Andrew John Hughes <ahughes@redhat.com> +2010-04-12 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/373 * Makefile.am: Add patch below. @@ -10336,7 +10370,7 @@ (createPanel): Don't print stack traces on InterruptedException. (handleMessage): Same. -2010-04-12 Andrew John Hughes <ahughes@redhat.com> +2010-04-12 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add patch below. * patches/nss-debug.patch: @@ -10365,13 +10399,13 @@ (frame::is_fake_stub_frame): Likewise. * patches/zero/shark_do_nothing_on_stub_frame.patch: New. -2010-04-12 Andrew John Hughes <ahughes@redhat.com> +2010-04-12 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Make NSS patch to main block as it's now applied unconditionally. -2010-04-12 Andrew John Hughes <ahughes@redhat.com> +2010-04-12 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add NETX_SRCDIR to EXTRA_DIST. @@ -10380,7 +10414,7 @@ * configure.ac: Clarify result message of the NSS check. -2010-04-11 Andrew John Hughes <ahughes@redhat.com> +2010-04-11 Andrew John Hughes <gnu.andrew@redhat.com> * patches/hotspot/original/6873059-javac-versioning-hotspot.patch, * patches/openjdk/6873059-javac-versioning-corba.patch, @@ -10389,7 +10423,7 @@ * Makefile.am: Move 6873059 to hs17-specific block. -2010-04-11 Andrew John Hughes <ahughes@redhat.com> +2010-04-11 Andrew John Hughes <gnu.andrew@redhat.com> Support hs17. * patches/icedtea-params-cast-size_t.patch, @@ -10421,7 +10455,7 @@ is enabled or disabled by default. * patches/icedtea-nss-not-enabled-config.patch: New. -2010-04-09 Andrew John Hughes <ahughes@redhat.com> +2010-04-09 Andrew John Hughes <gnu.andrew@redhat.com> * patches/zero/6939845.patch, * Makefile.am: @@ -10436,7 +10470,7 @@ * patches/zero/6939845.patch: added from upstream. * patches/zero/cppInterpreter-fast-bytecodes.patch: removed. -2010-04-09 Andrew John Hughes <ahughes@redhat.com> +2010-04-09 Andrew John Hughes <gnu.andrew@redhat.com> * patches/zero/6903453.patch, * patches/zero/6909153.patch, @@ -10445,7 +10479,7 @@ * Makefile.am: Remove patches applied upstream. -2010-04-08 Andrew John Hughes <ahughes@redhat.com> +2010-04-08 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Move NSS detection to macros in acinclude.m4. @@ -10463,12 +10497,12 @@ * configure.ac: Always make nss.cfg a config file, always substitute NSS_LIBDIR. -2010-04-08 Andrew John Hughes <ahughes@redhat.com> +2010-04-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove remaining references to rt source directory. -2010-04-07 Andrew John Hughes <ahughes@redhat.com> +2010-04-07 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6879689-hotspot_warning_fix.patch, * patches/security/20100330/6633872.patch, @@ -10533,7 +10567,7 @@ (IcedTeaScriptableJavaObject::deAllocate): Same. (IcedTeaScriptableJavaObject::invalidate): Same. -2010-04-06 Andrew John Hughes <ahughes@redhat.com> +2010-04-06 Andrew John Hughes <gnu.andrew@redhat.com> * patches/hotspot/hs16/6873059-javac-versioning-hotspot.patch: Moved to hotspot/original. @@ -10587,7 +10621,7 @@ * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer): Fix typo. -2009-03-31 Andrew John Hughes <ahughes@redhat.com> +2009-03-31 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/20100330/6894807.patch, * patches/security/20100330/hotspot/hs16/6894807.patch, @@ -10605,7 +10639,7 @@ * acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS. -2009-03-30 Andrew John Hughes <ahughes@redhat.com> +2009-03-30 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new security patches. * NEWS: List new security patches. @@ -10634,12 +10668,12 @@ New security and hardening patches http://www.oracle.com/technology/deploy/security/critical-patch-updates/javacpumar2010.html -2010-03-30 Andrew John Hughes <ahughes@redhat.com> +2010-03-30 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-override.patch: Fix path on previous HttpsClient hunk. -2010-03-30 Andrew John Hughes <ahughes@redhat.com> +2010-03-30 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6873059-javac-versioning-hotspot.patch: Move to hotspot/original directory. @@ -10656,7 +10690,7 @@ * bytecodeInterpreter.cpp Fix to support fast bytecodes -2010-03-30 Andrew John Hughes <ahughes@redhat.com> +2010-03-30 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/annotation-tests.patch: Dropped, was applied upstream in a different @@ -10668,7 +10702,7 @@ Dropped, applied upstream. * Makefile.am: Remove above. -2010-03-29 Andrew John Hughes <ahughes@redhat.com> +2010-03-29 Andrew John Hughes <gnu.andrew@redhat.com> * .hgignore: Use a regular expression to match openjdk @@ -10713,25 +10747,25 @@ * THANKYOU: Add C. K. Jester-Young who created the initial Perl version of javac.in. -2010-03-28 Andrew John Hughes <ahughes@redhat.com> +2010-03-28 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-override.patch: Remove @Override on interface method in sun/net/www/protocol/https/HttpsClient.java -2009-08-21 Andrew John Hughes <ahughes@redhat.com> +2009-08-21 Andrew John Hughes <gnu.andrew@redhat.com> * javac.in: Remove 1.7 setting. Add ecj_parms so same parameters are used for all ecj invocations. -2009-07-21 Andrew John Hughes <ahughes@redhat.com> +2009-07-21 Andrew John Hughes <gnu.andrew@redhat.com> * javac.in: Move ecj opt generation to a subroutine so it is only performed when needed. -2008-11-10 Andrew John Hughes <ahughes@redhat.com> +2008-11-10 Andrew John Hughes <gnu.andrew@redhat.com> * javac.in: Update with native ecj changes. @@ -10752,14 +10786,14 @@ (start_jvm_if_needed): Change pipe file name format. (NP_Initialize): Put FIFO pipe in a separate per-user directory. -2010-03-19 Andrew John Hughes <ahughes@redhat.com> +2010-03-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_ENV): Remove BINARY_PLUGS_PATH. (tools.stamp): Removed. (clean-tools): Removed. -2010-03-19 Andrew John Hughes <ahughes@redhat.com> +2010-03-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_ENV_ECJ): Include ICEDTEA_ENV. @@ -10867,7 +10901,7 @@ * patches/icedtea-sh4-support.patch: removed duplicated lines causing warning message when this patch is applied -2010-03-18 Andrew John Hughes <ahughes@redhat.com> +2010-03-18 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Update for 1.8. List OpenJDK6 b18 features @@ -10897,7 +10931,7 @@ * NEWS: Add 1.7.1, update for 1.8. -2010-03-16 Andrew John Hughes <ahughes@redhat.com> +2010-03-16 Andrew John Hughes <gnu.andrew@redhat.com> * IcedTeaPlugin.cc, * plugin/icedtea/netscape/javascript/JSException.java, @@ -10977,7 +11011,7 @@ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: Fix references to IcedTeaNPPlugin.h. -2010-03-16 Andrew John Hughes <ahughes@redhat.com> +2010-03-16 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-override.patch: Moved to ecj subdirectory. * Makefile.am: @@ -10987,7 +11021,7 @@ * patches/ecj/override.patch: Apply to ecj tree only. -2010-03-16 Andrew John Hughes <ahughes@redhat.com> +2010-03-16 Andrew John Hughes <gnu.andrew@redhat.com> NetX/plugin build sync (3/3): * patches/icedtea-copy-plugs.patch: @@ -11051,7 +11085,7 @@ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed unused function declerations. Added decleration for finalize. -2010-03-15 Andrew John Hughes <ahughes@redhat.com> +2010-03-15 Andrew John Hughes <gnu.andrew@redhat.com> NetX/plugin build sync (2/3): Have the OpenJDK build extract the @@ -11141,14 +11175,14 @@ (startProcessing): Call consumer.queue() instead of consumer.consume(). (postMessage): Remove unused method. -2010-03-12 Andrew John Hughes <ahughes@redhat.com> +2010-03-12 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-fonts.patch: Removed, applied upstream as S6934327. http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/178f954e1fd1 * Makefile.am: Drop above patch. -2010-03-12 Andrew John Hughes <ahughes@redhat.com> +2010-03-12 Andrew John Hughes <gnu.andrew@redhat.com> NetX/plugin build sync (1/3): Build NetX and plugin sources separately. @@ -11461,7 +11495,7 @@ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Whitespace changes. -2010-03-10 Andrew John Hughes <ahughes@redhat.com> +2010-03-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. @@ -11470,7 +11504,7 @@ threads blocked when the ReentrantReadWriteLock is not held. -2010-03-10 Andrew John Hughes <ahughes@redhat.com> +2010-03-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (JAXP): Removed, redundant. @@ -11564,7 +11598,7 @@ * plugin/tests/LiveConnect/common.js (testAll): Check eval tests checkbox before calling doTest(); -2010-03-08 Andrew John Hughes <ahughes@redhat.com> +2010-03-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (IT_CFLAGS): General CFLAGS for all IcedTea @@ -11583,7 +11617,7 @@ generalised to ARCHFLAG. * configure.ac: Call renamed IT_SET_ARCH_SETTINGS. -2010-03-08 Andrew John Hughes <ahughes@redhat.com> +2010-03-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (stamps/extract-ecj.stamp): Revert previous change @@ -11593,7 +11627,7 @@ * Makefile.am (ICEDTEA_ECJ_PATCHES): Add DISTRIBUTION_ECJ_PATCHES. -2010-03-08 Andrew John Hughes <ahughes@redhat.com> +2010-03-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (SHARE): Use openjdk-ecj for building bootstrap classes. @@ -11608,7 +11642,7 @@ (rt-source-files.txt): Depend on $(OPENJDK_ECJ_TREE) ensuring ecj patched versions are used. -2010-03-04 Andrew John Hughes <ahughes@redhat.com> +2010-03-04 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Don't unset ICEDTEA_BUILD_TARGET if unused. @@ -11625,13 +11659,13 @@ (sharkCompiler::sharkCompiler): Move mattr define to make its memory valid in the scope where it are used by the args vector. -2010-03-02 Andrew John Hughes <ahughes@redhat.com> +2010-03-02 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6928623-verbose-langtools.patch: Removed, applied upstream. * Makefile.am: Drop above patch. -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (stamps/cacao.stamp): Depend on rt.stamp @@ -11639,13 +11673,13 @@ than the contents of lib/rt, so that --with-openjdk builds work. -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (stamps/plugin.stamp): Create stamp with the right filename. -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (icedtea-against-icedtea): Convert to stamp @@ -11666,18 +11700,18 @@ (icedtea-debug): Likewise. (tools-jar): New alias for tools.stamp -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Patch should be added to ICEDTEA_ECJ_PATCHES not ICEDTEA_ENV_ECJ. -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove errant backslash. -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> Simply JAXWS patching for OpenJDK6. * Makefile.am, @@ -11691,17 +11725,17 @@ * patches/ecj/icedtea-jaxws-getdtdtype.patch: Updated to apply to JAXWS tree as a patch. -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea-jaxws-getdtdtype.patch: Replace getDTDType method, don't add another. -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea-jaxws-getdtdtype.patch: Add additional fix for AttributeBase.java -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (stamps/extract.stamp): Add meta extract target @@ -11710,7 +11744,7 @@ to extract-openjdk.stamp. (clean-extract-jaxws): Remove jaxws sources. -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Make use of JAXWS dependent on absence of @@ -11727,28 +11761,28 @@ * patches/icedtea-jaxws-getdtdtype.patch: New patch to work around the getDTDType() bug. -2010-03-01 Andrew John Hughes <ahughes@redhat.com> +2010-03-01 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea.patch: Don't add tools.jar to bootclasspath; now just a symlink to rt.jar. -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-jaxws-getdtdtype.patch: Fix path. -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-jaxws-getdtdtype.patch: Add additional fix for AttributeBase.java -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-jaxws-getdtdtype.patch: Replace getDTDType method, don't add another. * HACKING: Document the patch. -2009-11-17 Andrew John Hughes <ahughes@redhat.com> +2009-11-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Make use of JAXWS dependent on absence of @@ -11786,7 +11820,7 @@ (SharkCompiler::generate_native_code): Undefine debug code for NDEBUG builds -2010-02-25 Andrew John Hughes <ahughes@redhat.com> +2010-02-25 Andrew John Hughes <gnu.andrew@redhat.com> * patches/hotspot/hs16/icedtea-params-cast-size_t.patch, * patches/hotspot/hs16/memory-limits.patch: @@ -11814,13 +11848,13 @@ * patches/zero.patch: Moved from hotspot/hs16. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add PULSE_JAVA_CLEAN_TARGET to handle optionally defined clean-pulse-java target. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add THANKYOU to EXTRA_DIST. @@ -11834,20 +11868,20 @@ * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement allowed property get/set based on specifications. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * .hgignore: Severely trim the list especially the use of regular expressions which are matching unwanted files. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (rewrite-rhino.stamp): Use full path to jar application to avoid relying on the one on the path. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add missing pulse-java alias and reorganise @@ -11856,7 +11890,7 @@ directive for build directory to pick up generated headers. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (icedtea.stamp): Prefix libpulse-java.so with @@ -11865,7 +11899,7 @@ (clean-pulse-java): No need to delete libpulse-java.so as no longer at top-level. -2010-02-24 Andrew John Hughes <ahughes@redhat.com> +2010-02-24 Andrew John Hughes <gnu.andrew@redhat.com> * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c: Removed, never built and no corresponding @@ -12003,7 +12037,7 @@ Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the JIT are linked in. -2010-02-21 Andrew John Hughes <ahughes@redhat.com> +2010-02-21 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (icedtea-debug.stamp): Add missing -debug on @@ -12023,12 +12057,12 @@ * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass --with-hotspot-src-zip if configured for alternate hotspot. -2010-02-19 Andrew John Hughes <ahughes@redhat.com> +2010-02-19 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-cacao-ignore-jdi-tests.patch: Updated for b18. -2010-02-19 Andrew John Hughes <ahughes@redhat.com> +2010-02-19 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (FIND_RHINO_JAR): Clear RHINO_JAR variable @@ -12042,14 +12076,14 @@ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp (os::atomic_copy64): Added s390 specific implementation. -2010-02-19 Andrew John Hughes <ahughes@redhat.com> +2010-02-19 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add java/nio/StringCharBuffer.java to OPENJDK_BOOTSTRAP_CLASSES. Some versions of ecj seem not to build it automatically. -2010-02-18 Andrew John Hughes <ahughes@redhat.com> +2010-02-18 Andrew John Hughes <gnu.andrew@redhat.com> Drop hotspot-tools targets to simplify bootstrapping OpenJDK. @@ -12092,30 +12126,30 @@ * tools-copy/tools-langtools-copy-files.txt: Removed. -2010-02-17 Andrew John Hughes <ahughes@redhat.com> +2010-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Update JAXP tarball. -2010-02-17 Andrew John Hughes <ahughes@redhat.com> +2010-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove dead JAXWS and JAXP sourcepaths. Add sun.misc.Unsafe explicitly to ensure it is compiled as a bootstrap class. -2010-02-17 Andrew John Hughes <ahughes@redhat.com> +2010-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-6761856-freetypescaler.patch: Dropped; applied upstream. * Makefile.am: Remove above patch. -2010-02-17 Andrew John Hughes <ahughes@redhat.com> +2010-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Bump to released b18 tarball. -2010-02-17 Andrew John Hughes <ahughes@redhat.com> +2010-02-17 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/179 * ChangeLog: Remove rogue whitespace highlighted @@ -12150,7 +12184,7 @@ (doubles and longs): http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#16628 -2010-02-15 Andrew John Hughes <ahughes@redhat.com> +2010-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * patches/openjdk/6716076-loggingdeadlock2.patch, * patches/openjdk/6912628-turkcert.patch, @@ -12173,13 +12207,13 @@ * contrib/jck/compile-native-code.sh: Add s390. -2010-02-15 Andrew John Hughes <ahughes@redhat.com> +2010-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-6829636-loggingdeadlock2.patch: Dropped; OpenJDK hg backport. * Makefile.am: Remove above patch. -2010-02-15 Andrew John Hughes <ahughes@redhat.com> +2010-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-6829636-loggingdeadlock2.patch, * patches/icedtea-6912628-turkcert.patch, @@ -12196,13 +12230,13 @@ Move OpenJDK patches to appropriate directory and use correct bug IDs for loggingdeadlock2 and turkish. -2010-02-15 Andrew John Hughes <ahughes@redhat.com> +2010-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-6897844-xshm.patch: Dropped, applied upstream. * Makefile.am: Remove above patch. -2010-02-15 Andrew John Hughes <ahughes@redhat.com> +2010-02-15 Andrew John Hughes <gnu.andrew@redhat.com> * rewriter/agpl-3.0.txt, * rewriter/com/redhat/rewriter/ClassRewriter.java: @@ -12286,7 +12320,7 @@ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp (llvm/ModuleProvider.h): Undefine when using LLVM 2.7. -2010-01-29 Andrew John Hughes <ahughes@redhat.com> +2010-01-29 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-6920143-using-with-mouse.patch, * patches/icedtea-6920172-location-relative-to-test.patch, @@ -12295,13 +12329,13 @@ Dropped, already in OpenJDK6 hg. * Makefile.am: Remove above patches. -2010-01-29 Andrew John Hughes <ahughes@redhat.com> +2010-01-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add INITIAL_BOOTSTRAP_LINK_STAMP to avoid the need to check for bootstrap/jdk1.6.0 on each javac or jar invocation. -2010-01-29 Andrew John Hughes <ahughes@redhat.com> +2010-01-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add ICEDTEANPPLUGIN_TARGET back as a dependency of icedtea and icedtea-debug. @@ -12320,7 +12354,7 @@ Added othervm flag to ensure that this test will run in isolation -2010-01-27 Andrew John Hughes <ahughes@redhat.com> +2010-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use one general stamps/plugin.stamp to mark plugin @@ -12335,17 +12369,17 @@ added buffer checking on compile buffer, fix large tableswitch bug, fix byte accessor bug, add opc_return_register_finalizer. -2010-01-27 Andrew John Hughes <ahughes@redhat.com> +2010-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Reference plugin directory by absolute path in EXTRA_DIST to avoid confusion with build rule. -2010-01-27 Andrew John Hughes <ahughes@redhat.com> +2010-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Updated for 1.7 release. -2010-01-27 Andrew John Hughes <ahughes@redhat.com> +2010-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * HACKING: Document new patch. * Makefile.am: Add new patch. @@ -12354,7 +12388,7 @@ it will build against libpng 1.4 (png_check_sig --> png_sig_cmp) -2010-01-27 Andrew John Hughes <ahughes@redhat.com> +2010-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add missing items for 1.5.1, 1.5.2, @@ -12374,14 +12408,14 @@ * Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG. -2010-01-26 Andrew John Hughes <ahughes@redhat.com> +2010-01-26 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (stamps/plugin-tests.stamp): Add a target for building the plugin tests. (plugin-tests): Alias for the above. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_OLD_PLUGIN): New macro for @@ -12399,38 +12433,38 @@ to IT_CHECK_XULRUNNER_VERSION (which depends on the other macros). -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Build NPPlugin source files separately. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Fix ICEDTEAPLUGIN_TARGET to use new stamp targets and remove redundant ICEDTEANPPPLUGIN_TARGET. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use NPPLUGIN_SRCDIR for Java plugin sources. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Provide stamp targets for both npplugin and the old plugin so 'make plugin' builds the one configured. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove trailing space after IcedTea version in plugin version information when package version is not set. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Build NPPlugin in the build directory, @@ -12447,7 +12481,7 @@ * plugin/icedteanp/IcedTeaNPPlugin.cc: Use PRInt32 rather than PRInt32_t for port. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * IcedTeaPlugin.cc: Standardise plugin versioning. @@ -12466,13 +12500,13 @@ * plugin/icedteanp/IcedTeaNPPlugin.cc: Standardise plugin versioning. -2010-01-25 Andrew John Hughes <ahughes@redhat.com> +2010-01-25 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-libraries.patch: Make all dlopen choices at build-time, not just one. Support libjpeg8 as well. -2010-01-21 Andrew John Hughes <ahughes@redhat.com> +2010-01-21 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/433 * Makefile.am: @@ -12493,13 +12527,13 @@ * Makefile.am: Don't hide errors in statement sequences building the NPPlugin. Use ICEDTEA_REV to defined PLUGIN_VERSION. -2010-01-21 Andrew John Hughes <ahughes@redhat.com> +2010-01-21 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Fix paths to patches and IcedTeaNPPlugin.cc for make dist. -2010-01-20 Andrew John Hughes <ahughes@redhat.com> +2010-01-20 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Pass DERIVATIVE_ID and HOTSPOT_BUILD_VERSION @@ -12524,7 +12558,7 @@ Create a link from client to server after CACAO install to make openjdk find the expected client dir on 32bit systems. -2010-01-08 Andrew John Hughes <ahughes@redhat.com> +2010-01-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Calculate JDK and HotSpot Mercurial revisions @@ -12557,13 +12591,13 @@ the value of the location of main jar resource (which needs to be changed to the codebase portion instead of the entire location). -2010-01-18 Andrew John Hughes <ahughes@redhat.com> +2010-01-18 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Use AC_LANG_PUSH and AC_LANG_POP instead of deprecated SAVE and RESTORE macros. -2010-01-18 Andrew John Hughes <ahughes@redhat.com> +2010-01-18 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/416: * Makefile.am: @@ -12571,12 +12605,12 @@ to determine names of tarballs rather than hardcoding openjdk.tar.gz and hotspot.tar.gz -2010-01-17 Andrew John Hughes <ahughes@redhat.com> +2010-01-17 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: Re-add missing bracket removed by merge. -2010-01-16 Andrew John Hughes <ahughes@redhat.com> +2010-01-16 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-liveconnect.patch: Don't quote JAVA_ARGS twice. @@ -12593,7 +12627,7 @@ * patches/icedtea-sparc-trapsfix.patch: Merged sparc headers are located in asm/. -2010-01-16 Andrew John Hughes <ahughes@redhat.com> +2010-01-16 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (IT_CHECK_NUMBER_OF_PARALLEL_JOBS): @@ -12606,13 +12640,13 @@ Dependency of above. Uses getconf to obtain the number of available processors. -2010-01-16 Andrew John Hughes <ahughes@redhat.com> +2010-01-16 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: Send output to AS_MESSAGE_LOG_FD rather than /dev/null so we have a record of errors. -2010-01-16 Andrew John Hughes <ahughes@redhat.com> +2010-01-16 Andrew John Hughes <gnu.andrew@redhat.com> configure output and option cleanup * Makefile.am: @@ -12709,7 +12743,7 @@ * plugin/tests/LiveConnect/jsj_type_casting_tests.js: New file. Contains JS -> Java type conversion tests. -2010-01-11 Andrew John Hughes <ahughes@redhat.com> +2010-01-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove redundant platform_zero symlink. @@ -12718,12 +12752,12 @@ Replace 32-bit DefaultMaxRAM with 64-bit MaxRAM when building HotSpot 16 b13. -2010-01-11 Andrew John Hughes <ahughes@redhat.com> +2010-01-11 Andrew John Hughes <gnu.andrew@redhat.com> * patches/hotspot/hs16/memory-limits.patch: Add HotSpot 16 version of memory limits patch. -2010-01-11 Andrew John Hughes <ahughes@redhat.com> +2010-01-11 Andrew John Hughes <gnu.andrew@redhat.com> Bump to latest HotSpot 16 (b13). * patches/icedtea-memory-limits.patch: @@ -12734,7 +12768,7 @@ * patches/hotspot/original/memory-limits.patch: Recreated for the new build. -2010-01-11 Andrew John Hughes <ahughes@redhat.com> +2010-01-11 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-libraries.patch: Decide which libjpeg library to load @@ -12742,7 +12776,7 @@ JPEG_LIB_VERSION. (See http://bugs.debian.org/563999) -2010-01-11 Andrew John Hughes <ahughes@redhat.com> +2010-01-11 Andrew John Hughes <gnu.andrew@redhat.com> Fix issues with the CACAO build. * Makefile.am: @@ -12768,7 +12802,7 @@ * Makefile.am (ICEDTEA_PATCHES): Added the above. * contrib/checkopts/checkopts: Updated for the above. -2010-01-08 Andrew John Hughes <ahughes@redhat.com> +2010-01-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Calculate JDK and HotSpot Mercurial revisions @@ -12785,7 +12819,7 @@ Updated to use distribution name and JDK and HotSpot Mercurial revision IDs. -2010-01-08 Andrew John Hughes <ahughes@redhat.com> +2010-01-08 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-jdk-docs-target.patch: Dropped, refined version applied upstream. @@ -12797,7 +12831,7 @@ * plugin/icedteanp/IcedTeaNPPlugin.h: Remove debug specific line from code. -2010-01-05 Andrew John Hughes <ahughes@redhat.com> +2010-01-05 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Store path to rt-closed.jar in ICEDTEA_PLUGS @@ -12820,13 +12854,13 @@ * patches/zero/6913869.patch: Likewise. * Makefile.am (ICEDTEA_PATCHES): Added the above. -2010-01-04 Andrew John Hughes <ahughes@redhat.com> +2010-01-04 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Drop redundant (and broken in some cases) symbolic link. -2009-12-27 Andrew John Hughes <ahughes@redhat.com> +2009-12-27 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea-jaxp-dependency.patch: Recreated against current hg. @@ -12858,13 +12892,13 @@ (parse): Fix regression introduced when fix for Bug# 406 was ported over. Normalized default width and height. -2009-12-24 Andrew John Hughes <ahughes@redhat.com> +2009-12-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove native2ascii workaround, fixed properly in b18. -2009-12-24 Andrew John Hughes <ahughes@redhat.com> +2009-12-24 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (rt.stamp): Make zip updating dependent @@ -12877,7 +12911,7 @@ Check for sun.awt.SunToolkit using the new IT_CHECK_FOR_CLASS macro. -2009-12-24 Andrew John Hughes <ahughes@redhat.com> +2009-12-24 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Bump version to 1.8pre. * NEWS: Mention X11 fix. @@ -12886,7 +12920,7 @@ * Makefile.am: Set JDK_UPDATE_VERSION based on upstream drop version -2009-12-22 Andrew John Hughes <ahughes@redhat.com> +2009-12-22 Andrew John Hughes <gnu.andrew@redhat.com> Support b18. Add --with-tzdata-dir option, use updated system rt.jar rather than a fresh @@ -13006,7 +13040,7 @@ Fix bug where it could execute VFP on non-VFP processors Fix bug where it was calling C interpreter for java_lang_Math_sin and co. -2009-11-23 Andrew John Hughes <ahughes@redhat.com> +2009-11-23 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Reorganise to match IcedTea7 layout. @@ -13256,7 +13290,7 @@ (parse): Handle nested objected tags, don't allow parameter value overwrite. -2009-12-02 Andrew John Hughes <ahughes@redhat.com> +2009-12-02 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add support for new JAXP and JAXWS drop zips. @@ -13296,7 +13330,7 @@ (ZeroEntry::invoke): Likewise. (ZeroEntry::invoke_osr): Likewise. -2009-11-23 Andrew John Hughes <ahughes@redhat.com> +2009-11-23 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Reorganise to match IcedTea7 layout. @@ -13589,7 +13623,7 @@ dependent on the llvm version. Made deallocateMemForFunction method dependent on the llvm version. -2009-11-08 Andrew John Hughes <ahughes@redhat.com> +2009-11-08 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-xshm.patch: Renamed to... * Makefile.am: @@ -13598,14 +13632,14 @@ * patches/icedtea-6897844-xshm.patch: ...include bug ID. -2009-11-08 Andrew John Hughes <ahughes@redhat.com> +2009-11-08 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add missing security patch. * NEWS: List new security fixes with CVEs. * patches/security/icedtea-6664512.patch: Missing security patch from OpenJDK6 repository. -2009-11-08 Andrew John Hughes <ahughes@redhat.com> +2009-11-08 Andrew John Hughes <gnu.andrew@redhat.com> * patches/security/icedtea-6657138.patch, * patches/security/icedtea-6824265.patch: @@ -13679,7 +13713,7 @@ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp (InlineSmallCode): Only define for Shark. -2009-10-28 Andrew John Hughes <ahughes@redhat.com> +2009-10-28 Andrew John Hughes <gnu.andrew@redhat.com> * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Define InlineSmallCode, using x86 value to begin with. @@ -13688,13 +13722,13 @@ * NEWS: Mention systemtap JNI class tracing support. -2009-10-27 Andrew John Hughes <ahughes@redhat.com> +2009-10-27 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Mention b17, HotSpot 16 and libjpeg7 support for 1.7. -2009-10-27 Andrew John Hughes <ahughes@redhat.com> +2009-10-27 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Replace references to default with hs16. * patches/hotspot/default/icedtea-params-cast-size_t.patch, @@ -13706,7 +13740,7 @@ * patches/hotspot/hs16/openjdk-6886353-ignore_deoptimizealot.patch, * patches/hotspot/hs16/zero.patch: ...here. -2009-10-27 Andrew John Hughes <ahughes@redhat.com> +2009-10-27 Andrew John Hughes <gnu.andrew@redhat.com> * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp: Empty class required by invokedynamic support. @@ -13719,7 +13753,7 @@ the following changeset from IcedTea7 to the copy of the Zero port in the openjdk directory: - 2009-05-21 Andrew John Hughes <ahughes@redhat.com> + 2009-05-21 Andrew John Hughes <gnu.andrew@redhat.com> * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: (delayed_value_impl(intptr_t,Register,int)): Add stub. @@ -13741,7 +13775,7 @@ * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp: Define HeapBaseMinAddress as 2G (copied from x86_64). -2009-10-22 Andrew John Hughes <ahughes@redhat.com> +2009-10-22 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Update HotSpot build documentation. @@ -13755,7 +13789,7 @@ * gcjwebplugin.cc: Remove. -2009-10-21 Andrew John Hughes <ahughes@redhat.com> +2009-10-21 Andrew John Hughes <gnu.andrew@redhat.com> Correctly use original build by default. * acinclude.m4: @@ -13763,7 +13797,7 @@ be "default", it's the no clause that should be changed to "original". -2009-10-21 Andrew John Hughes <ahughes@redhat.com> +2009-10-21 Andrew John Hughes <gnu.andrew@redhat.com> Move non-version-dependent HotSpot patches back to top-level. @@ -13830,7 +13864,7 @@ * patches/icedtea-zero-build-hotspot.patch: Moved from hotspot/original. -2009-10-21 Andrew John Hughes <ahughes@redhat.com> +2009-10-21 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea-hotspot-original.patch: Renamed to be used in all builds. @@ -13912,12 +13946,12 @@ * Makefile.am (ICEDTEA_PATCHES): Remove patches/icedtea-messageutils.patch. -2009-10-16 Andrew John Hughes <ahughes@redhat.com> +2009-10-16 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Update to b17 tarball. -2009-10-02 Andrew John Hughes <ahughes@redhat.com> +2009-10-02 Andrew John Hughes <gnu.andrew@redhat.com> Bump to b17 and use original HotSpot. * patches/ecj/icedtea-hotspot-default.patch: @@ -14098,7 +14132,7 @@ * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. -2009-09-03 Andrew John Hughes <ahughes@redhat.com> +2009-09-03 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/356 * HACKING: Updated. @@ -14293,7 +14327,7 @@ * asm_helper.cpp: Missed from previous checkin -2009-09-11 Andrew John Hughes <ahughes@redhat.com> +2009-09-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Reference netscape.* plugin sources by path rather than @@ -14331,7 +14365,7 @@ * NEWS: Update for 1.6. -2009-09-10 Andrew John Hughes <ahughes@redhat.com> +2009-09-10 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Update documentation to reflect recent changes and add Shark requirements. @@ -14662,7 +14696,7 @@ * acinclude.m4, configure.ac (FIND_PULSEAUDIO): Remove. * INSTALL: Don't require the pulseaudio binary. -2009-08-25 Andrew John Hughes <ahughes@redhat.com> +2009-08-25 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Unset JAVA_HOME and JDK_HOME before building. @@ -14825,7 +14859,7 @@ Fixes compilation error and logic for ARM. (zero_cmpxchg_ptr): Likewise. -2009-08-20 Andrew John Hughes <ahughes@redhat.com> +2009-08-20 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new backported patch to fix @@ -15174,7 +15208,7 @@ ConstantInt API moved back to the 2.5 API, ConstantFP partially moved back to the 2.5 API. -2009-08-04 Andrew John Hughes <ahughes@redhat.com> +2009-08-04 Andrew John Hughes <gnu.andrew@redhat.com> * rt/net/sourceforge/jnlp/DefaultLaunchHandler.java, * rt/net/sourceforge/jnlp/ExtensionDesc.java, @@ -15209,12 +15243,12 @@ * rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java (initialize): Disable creation of desktop shortcuts. -2009-08-03 Andrew John Hughes <ahughes@redhat.com> +2009-08-03 Andrew John Hughes <gnu.andrew@redhat.com> * hotspot.map: Bump to hs14b16. -2009-07-30 Andrew John Hughes <ahughes@redhat.com> +2009-07-30 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. @@ -15673,7 +15707,7 @@ * rt/net/sourceforge/jnlp/Parser.java: Add 1.5 and 6.0 to supportedVersions. -2009-06-24 Andrew John Hughes <ahughes@redhat.com> +2009-06-24 Andrew John Hughes <gnu.andrew@redhat.com> * patches/cacao/no-strict-aliasing.patch: New patch to fix CACAO build on GCC 4.4 (see PR129). @@ -16025,7 +16059,7 @@ * patches/icedtea-liveconnect.patch: Make netscape.javascript package visible to javac by adding it to the non-core package list. -2009-06-10 Andrew John Hughes <ahughes@redhat.com> +2009-06-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove duplicate WITH_ICEDTEA blocks. @@ -16848,14 +16882,14 @@ * configure.ac: Bumped version. * NEWS: Updated for 1.5 release. -2009-05-14 Andrew John Hughes <ahughes@redhat.com> +2009-05-14 Andrew John Hughes <gnu.andrew@redhat.com> * INSTALL: Add notes on using alternate HotSpot builds. * NEWS: Mention HotSpot bump. -2009-05-14 Andrew John Hughes <ahughes@redhat.com> +2009-05-14 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use HotSpot from the new HotSpot Express @@ -17165,7 +17199,7 @@ * Makefile.am (ICEDTEA_PATCHES): Apply the above. * HACKING: Document the above. -2009-04-29 Andrew John Hughes <ahughes@redhat.com> +2009-04-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use abs_top_builddir to locate generated @@ -17495,7 +17529,7 @@ * patches/icedtea-lcms.patch: Reworked to patch lcms sources with most recent upstream version (1.18). -2009-03-24 Andrew John Hughes <ahughes@redhat.com> +2009-03-24 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-6536193.patch, * patches/icedtea-6610888.patch, @@ -18069,7 +18103,7 @@ * configure.ac: Set version to 1.5pre. -2009-03-03 Andrew John Hughes <ahughes@redhat.com> +2009-03-03 Andrew John Hughes <gnu.andrew@redhat.com> * AUTHORS: Add Michael Franz. @@ -18347,12 +18381,12 @@ * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp: Fixed conditional. -2009-02-20 Andrew John Hughes <ahughes@redhat.com> +2009-02-20 Andrew John Hughes <gnu.andrew@redhat.com> * AUTHORS: Add back my main e-mail address. -2009-02-20 Andrew John Hughes <ahughes@redhat.com> +2009-02-20 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Disable NIO2 by default. @@ -18405,13 +18439,13 @@ * patches/hotspot/default/14.0b08/*: Moved to ... patches/hotspot/default/*. -2009-02-12 Andrew John Hughes <ahughes@redhat.com> +2009-02-12 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: Revert Rhino change so IcedTea6 builds on Gentoo again. -2009-02-12 Andrew John Hughes <ahughes@redhat.com> +2009-02-12 Andrew John Hughes <gnu.andrew@redhat.com> * patches/ecj/icedtea-hotspot-14.0b08.patch, * patches/hotspot/14.0b08/icedtea-6791168.patch, @@ -18470,7 +18504,7 @@ * acinclude.m4: Upgraded rhino to 1.7 from 1.6. -2009-02-12 Andrew John Hughes <ahughes@redhat.com> +2009-02-12 Andrew John Hughes <gnu.andrew@redhat.com> * configure.ac: Fix typo in --enable-nio2. @@ -18489,7 +18523,7 @@ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java (write): Fix bounds checking. -2009-02-11 Andrew John Hughes <ahughes@redhat.com> +2009-02-11 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patches. @@ -18514,12 +18548,12 @@ * patches/icedtea-version.patch: Changed PRODUCT_NAME from IcedTea6 to OpenJDK. -2009-02-05 Andrew John Hughes <ahughes@redhat.com> +2009-02-05 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Depend on overlay.stamp rather than patch.stamp. -2009-02-05 Andrew John Hughes <ahughes@redhat.com> +2009-02-05 Andrew John Hughes <gnu.andrew@redhat.com> Ensure the NIO2 code is in sync with the latest build drop, b98. @@ -18539,7 +18573,7 @@ * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/Path/InterruptCopy.java, * overlays/nio2/openjdk/jdk/test/org/classpath/icedtea/java/nio/file/attribute/NamedAttributeView/Basic.java, -2009-02-04 Andrew John Hughes <ahughes@redhat.com> +2009-02-04 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (AC_CHECK_FOR_GCJ_JDK): Drop out of loop @@ -18547,7 +18581,7 @@ (AC_CHECK_FOR_OPENJDK): Likewise. (AC_CHECK_FOR_ICEDTEA): Likewise. -2009-02-04 Andrew John Hughes <ahughes@redhat.com> +2009-02-04 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. @@ -18555,13 +18589,13 @@ Fix warnings that cause the build to fail with GCC 4.3.3. -2009-02-03 Andrew John Hughes <ahughes@redhat.com> +2009-02-03 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-nio2.patch: (docs/NON_CORE_PKGS.gmk): Rename NIO to NIO2. (docs/Makefile): Add rule for generating NIO2 docs. -2009-02-03 Andrew John Hughes <ahughes@redhat.com> +2009-02-03 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Move doc headers patch above NIO2 patch, @@ -18570,14 +18604,14 @@ Add IcedTea bugzilla URL and common licensing to all documentation. -2009-02-03 Andrew John Hughes <ahughes@redhat.com> +2009-02-03 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add new patch. * patches/icedtea-doc-headers.patch: Fix licensing of documentation. -2009-01-30 Andrew John Hughes <ahughes@redhat.com> +2009-01-30 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-nio2.patch: (mapfile-linux): Add new functions in sun.nio.ch.Net. @@ -18605,7 +18639,7 @@ * NEWS: Updated for 1.4. -2009-01-27 Andrew John Hughes <ahughes@redhat.com> +2009-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java: Use org.classpath.icedtea.java.nio.channels.FileChannel. @@ -18633,7 +18667,7 @@ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java: Use org.classpath.icedtea.java.nio.channels.FileChannel. -2009-01-27 Andrew John Hughes <ahughes@redhat.com> +2009-01-27 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java: (positionSBC(long)): Renamed from position(long). @@ -18652,7 +18686,7 @@ * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp: Add memory barriers where needed for PPC. -2009-01-26 Andrew John Hughes <ahughes@redhat.com> +2009-01-26 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java, @@ -18959,7 +18993,7 @@ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp (fp): Remove PRODUCT conditional, make the not-PRODUCT bit the default. -2009-01-19 Andrew John Hughes <ahughes@redhat.com> +2009-01-19 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaNetGetIndexAccess.java: (getByIndex(int)): New method. @@ -19069,7 +19103,7 @@ * rt/net/sourceforge/jnlp/tools/JarSigner.java: Implement the new CertVerifier verifier interface. -2009-01-19 Andrew John Hughes <ahughes@redhat.com> +2009-01-19 Andrew John Hughes <gnu.andrew@redhat.com> * generated/sun/nio/ch/SocketOptionRegistry.java: * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/DatagramChannel.java: @@ -19120,7 +19154,7 @@ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp (StackShadowPages): Increase for 64-bit builds. -2009-01-14 Andrew John Hughes <ahughes@redhat.com> +2009-01-14 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java: Extend java.nio.channels.FileChannel to minimise code. @@ -19146,13 +19180,13 @@ (getVersionedResourceURL): New function. Constructs a URL with a version-id as the query. -2009-01-13 Andrew John Hughes <ahughes@redhat.com> +2009-01-13 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/JavaIODeleteOnExitAccess.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/misc/SharedSecrets.java: Add missing SharedSecrets files. -2009-01-13 Andrew John Hughes <ahughes@redhat.com> +2009-01-13 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardProtocolFamily.java, * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/net/StandardSocketOption.java: @@ -19193,7 +19227,7 @@ Patch ThreadPoolExecutor to allow access to private variables, add missing files to nio/FILES_java.gmk -2009-01-12 Andrew John Hughes <ahughes@redhat.com> +2009-01-12 Andrew John Hughes <gnu.andrew@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java, * overlays/nio2/openjdk/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java, @@ -19252,7 +19286,7 @@ * contrib/jck/compile-native-code.sh: Build with -m32 or -m64. -2009-01-12 Andrew John Hughes <ahughes@redhat.com> +2009-01-12 Andrew John Hughes <gnu.andrew@redhat.com> Initial import of NIO2 code. * patches/ecj/icedtea-pr261.patch: Moved to general patches. @@ -19712,13 +19746,13 @@ (stamps/extract.stamp): Use AWK here rather than cut. * hotspot.map: Add md5sum for 14.0b08. -2008-12-17 Andrew John Hughes <ahughes@redhat.com> +2008-12-17 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4: (FIND_RHINO_JAR): Check for js.jar in Gentoo install location too. -2008-12-17 Andrew John Hughes <ahughes@redhat.com> +2008-12-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: No need to check again that SYSTEM_GCJ_DIR exists. @@ -19731,7 +19765,7 @@ More --with-x-home options to macros in acinclude.m4. Remove redundant erroneous use of GCC_OLD. -2008-12-17 Andrew John Hughes <ahughes@redhat.com> +2008-12-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove use of LIBGCJ_JAR, replacing with @@ -19745,7 +19779,7 @@ * javac.in: Use SYSTEM_GCJ_DIR/jre/lib/rt.jar not LIBGCJ_JAR. -2008-12-17 Andrew John Hughes <ahughes@redhat.com> +2008-12-17 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Remove the HotSpot directory while extracting @@ -19817,7 +19851,7 @@ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Provide new cacheable param to JARDesc constructor. -2008-12-09 Andrew John Hughes <ahughes@redhat.com> +2008-12-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Support use of HGREV. @@ -19826,14 +19860,14 @@ * configure.ac: Call AC_CHECK_WITH_HG_REVISION. -2008-12-09 Andrew John Hughes <ahughes@redhat.com> +2008-12-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Properly support --with-openjdk-src-dir. * acinclude.m4: Correct the define for OPENJDK_SRC_DIR. -2008-12-09 Andrew John Hughes <ahughes@redhat.com> +2008-12-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Support downloading from the Mercurial repository. @@ -19842,7 +19876,7 @@ * configure.ac: Check for --enable-hg. -2008-12-09 Andrew John Hughes <ahughes@redhat.com> +2008-12-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Make XRender patch wildcard work where @@ -19850,7 +19884,7 @@ * configure.ac: Capitalise 'XRender' in configure option. -2008-12-09 Andrew John Hughes <ahughes@redhat.com> +2008-12-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Don't use find to locate the hotspot directory, @@ -19919,7 +19953,7 @@ lost chunks from icedtea-sparc.patch, fix build failure with gcc-4.3. * Makefile.am (ICEDTEA_PATCHES): Apply new patch. -2008-12-04 Andrew John Hughes <ahughes@redhat.com> +2008-12-04 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Prefix the call to uname -m with @@ -19927,7 +19961,7 @@ * acinclude.m4: Apply linux32 on s390 as well. -2008-12-04 Andrew John Hughes <ahughes@redhat.com> +2008-12-04 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Prefix make invocations with @@ -20043,7 +20077,7 @@ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java: Make class package-private. -2008-12-03 Andrew John Hughes <ahughes@redhat.com> +2008-12-03 Andrew John Hughes <gnu.andrew@redhat.com> Create hierarchical patch space. * patches/icedtea-4486841.patch, @@ -20225,7 +20259,7 @@ patches/icedtea-6755943.patch, patches/icedtea-6766136.patch: New files. -2008-12-02 Andrew John Hughes <ahughes@redhat.com> +2008-12-02 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-bytecodeInterpreter.patch, * patches/icedtea-hotspot7-build-fixes.patch: @@ -20244,7 +20278,7 @@ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Updated using IcedTea7 versions for 14.0b08. -2008-12-01 Andrew John Hughes <ahughes@redhat.com> +2008-12-01 Andrew John Hughes <gnu.andrew@redhat.com> * patches/icedtea-hotspot-params-cast-size_t.patch, * patches/icedtea-hotspot-use-idx_t.patch, @@ -20627,18 +20661,18 @@ * patches/icedtea-6open-6756202.patch: Removed. * NEWS: Add integration of b13. -2008-11-07 Andrew John Hughes <ahughes@redhat.com> +2008-11-07 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Use 'node|short' instead of 'rev' for Mercurial revision number. -2008-10-30 Andrew John Hughes <ahughes@redhat.com> +2008-10-30 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add bootstrap-directory-symlink target to icedtea-ecj so it works as the user-specified make target. -2008-10-22 Andrew John Hughes <ahughes@redhat.com> +2008-10-22 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Pass JAR_KNOWS_J_OPTIONS to ecj make. * acinclude.m4: Check whether or not jar supports -J @@ -20822,7 +20856,7 @@ * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Act on window close events (Bug# 215) -2008-10-27 Andrew John Hughes <ahughes@redhat.com> +2008-10-27 Andrew John Hughes <gnu.andrew@redhat.com> PR icedtea/234: * Makefile.am:
--- a/Makefile.am Tue Oct 30 20:10:04 2012 +0000 +++ b/Makefile.am Wed Oct 31 09:43:00 2012 +0000 @@ -2,7 +2,7 @@ OPENJDK_DATE = 21_sep_2012 OPENJDK_SHA256SUM = 9635d8563b9ba811f1d6e333861f235a2d8835c623451abc44791891d40d8b09 -OPENJDK_VERSION = b26 +OPENJDK_VERSION = b27 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = cff92704c4e0 @@ -198,28 +198,7 @@ ICEDTEA_FSG_PATCHES = SECURITY_PATCHES = \ - patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - patches/security/20121016/6631398.patch \ - patches/security/20121016/7093490.patch \ - patches/security/20121016/7143535.patch \ - patches/security/20121016/7158800.patch \ - patches/security/20121016/7158801.patch \ - patches/security/20121016/7158804.patch \ - patches/security/20121016/7167656.patch \ - patches/security/20121016/7169884.patch \ - patches/security/20121016/7169888.patch \ - patches/security/20121016/7172522.patch \ - patches/security/20121016/7176337.patch \ - patches/security/20121016/7186286.patch \ - patches/security/20121016/7189103.patch \ - patches/security/20121016/7189490.patch \ - patches/security/20121016/7189567.patch \ - patches/security/20121016/7192975.patch \ - patches/security/20121016/7195194.patch \ - patches/security/20121016/7195917.patch \ - patches/security/20121016/7195919.patch \ - patches/security/20121016/7198296.patch \ - patches/security/20121016/7198606.patch + patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
--- a/patches/security/20121016/6631398.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# HG changeset patch -# User weijun -# Date 1339724916 -28800 -# Node ID 0fdc422fba9b63be684f1229af75f0c1f3ceec87 -# Parent f09937f0b2e32aa60a2cdd23f03a7e2d45091b60 -6631398: FilePermission improved path checking -Reviewed-by: mullan, skoivu, jdn - -diff --git a/src/share/classes/java/io/FilePermission.java b/src/share/classes/java/io/FilePermission.java ---- openjdk/jdk/src/share/classes/java/io/FilePermission.java -+++ openjdk/jdk/src/share/classes/java/io/FilePermission.java -@@ -399,7 +399,7 @@ - */ - - public int hashCode() { -- return this.cpath.hashCode(); -+ return 0; - } - - /**
--- a/patches/security/20121016/7093490.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1340913225 -3600 -# Node ID e7334bb16ad694bed492da52e5713c8391e79ce8 -# Parent 0fdc422fba9b63be684f1229af75f0c1f3ceec87 -7093490: adjust package access in rmiregistry -Reviewed-by: smarks - -diff --git a/src/share/classes/sun/rmi/registry/RegistryImpl.java b/src/share/classes/sun/rmi/registry/RegistryImpl.java ---- openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java -+++ openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -405,7 +405,8 @@ - */ - perms.add(new SocketPermission("*", "connect,accept")); - -- perms.add(new RuntimePermission("accessClassInPackage.sun.*")); -+ perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*")); -+ perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*")); - - perms.add(new FilePermission("<<ALL FILES>>", "read")); -
--- a/patches/security/20121016/7143535.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -# HG changeset patch -# User sundar -# Date 1345469787 -14400 -# Node ID 1e170e3c1b682d0f98a61a47e5049535c5bd4999 -# Parent e7334bb16ad694bed492da52e5713c8391e79ce8 -7143535: ScriptEngine corrected permissions -Reviewed-by: mschoene - -diff --git a/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java b/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -130,7 +130,11 @@ - public RhinoScriptEngine() { - - if (System.getSecurityManager() != null) { -- accCtxt = AccessController.getContext(); -+ try { -+ AccessController.checkPermission(new AllPermission()); -+ } catch (AccessControlException ace) { -+ accCtxt = AccessController.getContext(); -+ } - } - - Context cx = enterContext();
--- a/patches/security/20121016/7158800.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1413 +0,0 @@ -# HG changeset patch -# User kevinw -# Date 1345802362 -3600 -# Node ID 2faa3f7bad65189e69ab2f9a491743786bb8f07f -# Parent a080633e3a056dae9e94077c9ac4cf966137ade9 -7158800: Improve storage of symbol tables -7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table -7181200: JVM new hashing code breaks SA in product mode -7190262: Debug builds fail to verify String table with +UseCompressedStrings after 7158800 -Reviewed-by: coleenp - -diff --git a/src/share/vm/classfile/altHashing.cpp b/src/share/vm/classfile/altHashing.cpp -new file mode 100644 ---- /dev/null -+++ openjdk/hotspot/src/share/vm/classfile/altHashing.cpp -@@ -0,0 +1,304 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ * -+ */ -+ -+#include "precompiled.hpp" -+#include "classfile/altHashing.hpp" -+#include "classfile/symbolTable.hpp" -+#include "classfile/systemDictionary.hpp" -+#include "oops/markOop.hpp" -+#include "runtime/thread.hpp" -+ -+// Get the hash code of the classes mirror if it exists, otherwise just -+// return a random number, which is one of the possible hash code used for -+// objects. We don't want to call the synchronizer hash code to install -+// this value because it may safepoint. -+intptr_t object_hash(klassOop k) { -+ intptr_t hc = Klass::cast(k)->java_mirror()->mark()->hash(); -+ return hc != markOopDesc::no_hash ? hc : os::random(); -+} -+ -+// Seed value used for each alternative hash calculated. -+jint AltHashing::compute_seed() { -+ jlong nanos = os::javaTimeNanos(); -+ jlong now = os::javaTimeMillis(); -+ jint SEED_MATERIAL[8] = { -+ (jint) object_hash(SystemDictionary::String_klass()), -+ (jint) object_hash(SystemDictionary::System_klass()), -+ (jint) os::random(), // current thread isn't a java thread -+ (jint) (((julong)nanos) >> 32), -+ (jint) nanos, -+ (jint) (((julong)now) >> 32), -+ (jint) now, -+ (jint) (os::javaTimeNanos() >> 2) -+ }; -+ -+ return murmur3_32(SEED_MATERIAL, 8); -+} -+ -+ -+// Murmur3 hashing for Symbol -+jint AltHashing::murmur3_32(jint seed, const jbyte* data, int len) { -+ jint h1 = seed; -+ int count = len; -+ int offset = 0; -+ -+ // body -+ while (count >= 4) { -+ jint k1 = (data[offset] & 0x0FF) -+ | (data[offset + 1] & 0x0FF) << 8 -+ | (data[offset + 2] & 0x0FF) << 16 -+ | data[offset + 3] << 24; -+ -+ count -= 4; -+ offset += 4; -+ -+ k1 *= 0xcc9e2d51; -+ k1 = Integer_rotateLeft(k1, 15); -+ k1 *= 0x1b873593; -+ -+ h1 ^= k1; -+ h1 = Integer_rotateLeft(h1, 13); -+ h1 = h1 * 5 + 0xe6546b64; -+ } -+ -+ // tail -+ -+ if (count > 0) { -+ jint k1 = 0; -+ -+ switch (count) { -+ case 3: -+ k1 ^= (data[offset + 2] & 0xff) << 16; -+ // fall through -+ case 2: -+ k1 ^= (data[offset + 1] & 0xff) << 8; -+ // fall through -+ case 1: -+ k1 ^= (data[offset] & 0xff); -+ // fall through -+ default: -+ k1 *= 0xcc9e2d51; -+ k1 = Integer_rotateLeft(k1, 15); -+ k1 *= 0x1b873593; -+ h1 ^= k1; -+ } -+ } -+ -+ // finalization -+ h1 ^= len; -+ -+ // finalization mix force all bits of a hash block to avalanche -+ h1 ^= ((unsigned int)h1) >> 16; -+ h1 *= 0x85ebca6b; -+ h1 ^= ((unsigned int)h1) >> 13; -+ h1 *= 0xc2b2ae35; -+ h1 ^= ((unsigned int)h1) >> 16; -+ -+ return h1; -+} -+ -+// Murmur3 hashing for Strings -+jint AltHashing::murmur3_32(jint seed, const jchar* data, int len) { -+ jint h1 = seed; -+ -+ int off = 0; -+ int count = len; -+ -+ // body -+ while (count >= 2) { -+ jchar d1 = data[off++] & 0xFFFF; -+ jchar d2 = data[off++]; -+ jint k1 = (d1 | d2 << 16); -+ -+ count -= 2; -+ -+ k1 *= 0xcc9e2d51; -+ k1 = Integer_rotateLeft(k1, 15); -+ k1 *= 0x1b873593; -+ -+ h1 ^= k1; -+ h1 = Integer_rotateLeft(h1, 13); -+ h1 = h1 * 5 + 0xe6546b64; -+ } -+ -+ // tail -+ -+ if (count > 0) { -+ int k1 = data[off]; -+ -+ k1 *= 0xcc9e2d51; -+ k1 = Integer_rotateLeft(k1, 15); -+ k1 *= 0x1b873593; -+ h1 ^= k1; -+ } -+ -+ // finalization -+ h1 ^= len * 2; // (Character.SIZE / Byte.SIZE); -+ -+ // finalization mix force all bits of a hash block to avalanche -+ h1 ^= ((unsigned int)h1) >> 16; -+ h1 *= 0x85ebca6b; -+ h1 ^= ((unsigned int)h1) >> 13; -+ h1 *= 0xc2b2ae35; -+ h1 ^= ((unsigned int)h1) >> 16; -+ -+ return h1; -+} -+ -+// Hash used for the seed. -+jint AltHashing::murmur3_32(jint seed, const int* data, int len) { -+ jint h1 = seed; -+ -+ int off = 0; -+ int end = len; -+ -+ // body -+ while (off < end) { -+ jint k1 = data[off++]; -+ -+ k1 *= 0xcc9e2d51; -+ k1 = Integer_rotateLeft(k1, 15); -+ k1 *= 0x1b873593; -+ -+ h1 ^= k1; -+ h1 = Integer_rotateLeft(h1, 13); -+ h1 = h1 * 5 + 0xe6546b64; -+ } -+ -+ // tail (always empty, as body is always 32-bit chunks) -+ -+ // finalization -+ -+ h1 ^= len * 4; // (Integer.SIZE / Byte.SIZE); -+ -+ // finalization mix force all bits of a hash block to avalanche -+ h1 ^= ((juint)h1) >> 16; -+ h1 *= 0x85ebca6b; -+ h1 ^= ((juint)h1) >> 13; -+ h1 *= 0xc2b2ae35; -+ h1 ^= ((juint)h1) >> 16; -+ -+ return h1; -+} -+ -+jint AltHashing::murmur3_32(const int* data, int len) { -+ return murmur3_32(0, data, len); -+} -+ -+#ifndef PRODUCT -+// Overloaded versions for internal test. -+jint AltHashing::murmur3_32(const jbyte* data, int len) { -+ return murmur3_32(0, data, len); -+} -+ -+jint AltHashing::murmur3_32(const jchar* data, int len) { -+ return murmur3_32(0, data, len); -+} -+ -+// Internal test for alternate hashing. Translated from JDK version -+// test/sun/misc/Hashing.java -+static const jbyte ONE_BYTE[] = { (jbyte) 0x80}; -+static const jbyte TWO_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81}; -+static const jchar ONE_CHAR[] = { (jchar) 0x8180}; -+static const jbyte THREE_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82}; -+static const jbyte FOUR_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82, (jbyte) 0x83}; -+static const jchar TWO_CHAR[] = { (jchar) 0x8180, (jchar) 0x8382}; -+static const jint ONE_INT[] = { 0x83828180}; -+static const jbyte SIX_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82, (jbyte) 0x83, (jbyte) 0x84, (jbyte) 0x85}; -+static const jchar THREE_CHAR[] = { (jchar) 0x8180, (jchar) 0x8382, (jchar) 0x8584}; -+static const jbyte EIGHT_BYTE[] = { -+ (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82, -+ (jbyte) 0x83, (jbyte) 0x84, (jbyte) 0x85, -+ (jbyte) 0x86, (jbyte) 0x87}; -+static const jchar FOUR_CHAR[] = { -+ (jchar) 0x8180, (jchar) 0x8382, -+ (jchar) 0x8584, (jchar) 0x8786}; -+ -+static const jint TWO_INT[] = { 0x83828180, 0x87868584}; -+ -+static const juint MURMUR3_32_X86_CHECK_VALUE = 0xB0F57EE3; -+ -+void AltHashing::testMurmur3_32_ByteArray() { -+ // printf("testMurmur3_32_ByteArray\n"); -+ -+ jbyte* vector = new jbyte[256]; -+ jbyte* hashes = new jbyte[4 * 256]; -+ -+ for (int i = 0; i < 256; i++) { -+ vector[i] = (jbyte) i; -+ } -+ -+ // Hash subranges {}, {0}, {0,1}, {0,1,2}, ..., {0,...,255} -+ for (int i = 0; i < 256; i++) { -+ jint hash = murmur3_32(256 - i, vector, i); -+ hashes[i * 4] = (jbyte) hash; -+ hashes[i * 4 + 1] = (jbyte) (((juint)hash) >> 8); -+ hashes[i * 4 + 2] = (jbyte) (((juint)hash) >> 16); -+ hashes[i * 4 + 3] = (jbyte) (((juint)hash) >> 24); -+ } -+ -+ // hash to get const result. -+ juint final_hash = murmur3_32(hashes, 4*256); -+ -+ assert (MURMUR3_32_X86_CHECK_VALUE == final_hash, -+ err_msg( -+ "Calculated hash result not as expected. Expected %08X got %08X\n", -+ MURMUR3_32_X86_CHECK_VALUE, -+ final_hash)); -+} -+ -+void AltHashing::testEquivalentHashes() { -+ jint jbytes, jchars, ints; -+ -+ // printf("testEquivalentHashes\n"); -+ -+ jbytes = murmur3_32(TWO_BYTE, 2); -+ jchars = murmur3_32(ONE_CHAR, 1); -+ assert (jbytes == jchars, -+ err_msg("Hashes did not match. b:%08x != c:%08x\n", jbytes, jchars)); -+ -+ jbytes = murmur3_32(FOUR_BYTE, 4); -+ jchars = murmur3_32(TWO_CHAR, 2); -+ ints = murmur3_32(ONE_INT, 1); -+ assert ((jbytes == jchars) && (jbytes == ints), -+ err_msg("Hashes did not match. b:%08x != c:%08x != i:%08x\n", jbytes, jchars, ints)); -+ -+ jbytes = murmur3_32(SIX_BYTE, 6); -+ jchars = murmur3_32(THREE_CHAR, 3); -+ assert (jbytes == jchars, -+ err_msg("Hashes did not match. b:%08x != c:%08x\n", jbytes, jchars)); -+ -+ jbytes = murmur3_32(EIGHT_BYTE, 8); -+ jchars = murmur3_32(FOUR_CHAR, 4); -+ ints = murmur3_32(TWO_INT, 2); -+ assert ((jbytes == jchars) && (jbytes == ints), -+ err_msg("Hashes did not match. b:%08x != c:%08x != i:%08x\n", jbytes, jchars, ints)); -+} -+ -+// Returns true if the alternate hashcode is correct -+void AltHashing::test_alt_hash() { -+ testMurmur3_32_ByteArray(); -+ testEquivalentHashes(); -+} -+#endif // PRODUCT -diff --git a/src/share/vm/classfile/altHashing.hpp b/src/share/vm/classfile/altHashing.hpp -new file mode 100644 ---- /dev/null -+++ openjdk/hotspot/src/share/vm/classfile/altHashing.hpp -@@ -0,0 +1,62 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ * -+ */ -+ -+#ifndef SHARE_VM_CLASSFILE_ALTHASHING_HPP -+#define SHARE_VM_CLASSFILE_ALTHASHING_HPP -+ -+#include "prims/jni.h" -+#include "classfile/symbolTable.hpp" -+ -+/** -+ * Hashing utilities. -+ * -+ * Implementation of Murmur3 hashing. -+ * This code was translated from src/share/classes/sun/misc/Hashing.java -+ * code in the JDK. -+ */ -+ -+class AltHashing : AllStatic { -+ -+ // utility function copied from java/lang/Integer -+ static jint Integer_rotateLeft(jint i, int distance) { -+ return (i << distance) | (((juint)i) >> (32-distance)); -+ } -+ static jint murmur3_32(const int* data, int len); -+ static jint murmur3_32(jint seed, const int* data, int len); -+ -+#ifndef PRODUCT -+ // Hashing functions used for internal testing -+ static jint murmur3_32(const jbyte* data, int len); -+ static jint murmur3_32(const jchar* data, int len); -+ static void testMurmur3_32_ByteArray(); -+ static void testEquivalentHashes(); -+#endif // PRODUCT -+ -+ public: -+ static jint compute_seed(); -+ static jint murmur3_32(jint seed, const jbyte* data, int len); -+ static jint murmur3_32(jint seed, const jchar* data, int len); -+ NOT_PRODUCT(static void test_alt_hash();) -+}; -+#endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP -diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp -@@ -278,6 +278,28 @@ - return result; - } - -+unsigned int java_lang_String::to_hash(oop java_string) { -+ int length = java_lang_String::length(java_string); -+ // Zero length string will hash to zero with String.toHash() function. -+ if (length == 0) return 0; -+ -+ typeArrayOop value = java_lang_String::value(java_string); -+ int offset = java_lang_String::offset(java_string); -+ return java_lang_String::to_hash(value->char_at_addr(offset), length); -+} -+ -+unsigned int java_lang_String::hash_string(oop java_string) { -+ int length = java_lang_String::length(java_string); -+ // Zero length string doesn't hash necessarily hash to zero. -+ if (length == 0) { -+ return StringTable::hash_string(NULL, 0); -+ } -+ -+ typeArrayOop value = java_lang_String::value(java_string); -+ int offset = java_lang_String::offset(java_string); -+ return StringTable::hash_string(value->char_at_addr(offset), length); -+} -+ - symbolHandle java_lang_String::as_symbol(Handle java_string, TRAPS) { - oop obj = java_string(); - typeArrayOop value = java_lang_String::value(obj); -diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp ---- openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp -@@ -109,6 +109,30 @@ - static char* as_platform_dependent_str(Handle java_string, TRAPS); - static jchar* as_unicode_string(oop java_string, int& length); - -+ // Compute the hash value for a java.lang.String object which would -+ // contain the characters passed in. -+ // -+ // As the hash value used by the String object itself, in -+ // String.hashCode(). This value is normally calculated in Java code -+ // in the String.hashCode method(), but is precomputed for String -+ // objects in the shared archive file. -+ // hash P(31) from Kernighan & Ritchie -+ // -+ // For this reason, THIS ALGORITHM MUST MATCH String.toHash(). -+ template <typename T> static unsigned int to_hash(T* s, int len) { -+ unsigned int h = 0; -+ while (len-- > 0) { -+ h = 31*h + (unsigned int) *s; -+ s++; -+ } -+ return h; -+ } -+ static unsigned int to_hash(oop java_string); -+ -+ // This is the string hash code used by the StringTable, which may be -+ // the same as String.toHash or an alternate hash code. -+ static unsigned int hash_string(oop java_string); -+ - static bool equals(oop java_string, jchar* chars, int len); - - // Conversion between '.' and '/' formats -diff --git a/src/share/vm/classfile/symbolTable.cpp b/src/share/vm/classfile/symbolTable.cpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -23,6 +23,7 @@ - */ - - #include "precompiled.hpp" -+#include "classfile/altHashing.hpp" - #include "classfile/javaClasses.hpp" - #include "classfile/symbolTable.hpp" - #include "classfile/systemDictionary.hpp" -@@ -34,16 +35,40 @@ - #include "oops/symbolKlass.hpp" - #include "runtime/mutexLocker.hpp" - #include "utilities/hashtable.inline.hpp" -+#include "utilities/numberSeq.hpp" - - // -------------------------------------------------------------------------- - - SymbolTable* SymbolTable::_the_table = NULL; -+bool SymbolTable::_needs_rehashing = false; -+ -+// Create a new table and using alternate hash code, populate the new table -+// with the existing strings. Set flag to use the alternate hash code afterwards. -+void SymbolTable::rehash_table() { -+ -+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); -+ // This should never happen with -Xshare:dump but it might in testing mode. -+ if (DumpSharedSpaces) return; -+ // Create a new symbol table -+ SymbolTable* new_table = new SymbolTable(); -+ -+ the_table()->move_to(new_table); -+ -+ // Delete the table and buckets (entries are reused in new table). -+ delete _the_table; -+ // Don't check if we need rehashing until the table gets unbalanced again. -+ // Then rehash with a new global seed. -+ _needs_rehashing = false; -+ _the_table = new_table; -+} - - // Lookup a symbol in a bucket. - - symbolOop SymbolTable::lookup(int index, const char* name, - int len, unsigned int hash) { -+ int count = 0; - for (HashtableEntry* e = bucket(index); e != NULL; e = e->next()) { -+ count++; - if (e->hash() == hash) { - symbolOop sym = symbolOop(e->literal()); - if (sym->equals(name, len)) { -@@ -51,9 +76,20 @@ - } - } - } -+ // If the bucket size is too deep check if this hash code is insufficient. -+ if (count >= BasicHashtable::rehash_count && !needs_rehashing()) { -+ _needs_rehashing = check_rehash_table(count); -+ } - return NULL; - } - -+// Pick hashing algorithm. -+unsigned int SymbolTable::hash_symbol(const char* s, int len) { -+ return the_table()->use_alternate_hashcode() ? -+ AltHashing::murmur3_32(the_table()->seed(), (const jbyte*)s, len) : -+ java_lang_String::to_hash(s, len); -+} -+ - - // We take care not to be blocking while holding the - // SymbolTable_lock. Otherwise, the system might deadlock, since the -@@ -71,8 +107,17 @@ - // Found - if (s != NULL) return s; - -+ // We assume that lookup() has been called already, that it failed, -+ // and symbol was not found. We create the symbol here. -+ symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -+ symbolOop s_oop = sk->allocate_symbol((u1*)name, len, CHECK_NULL); -+ symbolHandle sym (THREAD, s_oop); -+ -+ // Allocation must be done before grabbing the SymbolTable_lock lock -+ MutexLocker ml(SymbolTable_lock, THREAD); -+ - // Otherwise, add to symbol to table -- return the_table()->basic_add(index, (u1*)name, len, hashValue, CHECK_NULL); -+ return the_table()->basic_add(sym, index, (u1*)name, len, hashValue, CHECK_NULL); - } - - symbolOop SymbolTable::lookup(symbolHandle sym, int begin, int end, TRAPS) { -@@ -108,7 +153,16 @@ - // We can't include the code in No_Safepoint_Verifier because of the - // ResourceMark. - -- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, CHECK_NULL); -+ // We assume that lookup() has been called already, that it failed, -+ // and symbol was not found. We create the symbol here. -+ symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -+ symbolOop s_oop = sk->allocate_symbol((u1*)buffer, len, CHECK_NULL); -+ symbolHandle newsym (THREAD, s_oop); -+ -+ // Allocation must be done before grabbing the SymbolTable_lock lock -+ MutexLocker ml(SymbolTable_lock, THREAD); -+ -+ return the_table()->basic_add(newsym, index, (u1*)buffer, len, hashValue, CHECK_NULL); - } - - symbolOop SymbolTable::lookup_only(const char* name, int len, -@@ -156,36 +210,68 @@ - void SymbolTable::add(constantPoolHandle cp, int names_count, - const char** names, int* lengths, int* cp_indices, - unsigned int* hashValues, TRAPS) { -- SymbolTable* table = the_table(); -- bool added = table->basic_add(cp, names_count, names, lengths, -- cp_indices, hashValues, CHECK); -- if (!added) { -+ -+ symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -+ symbolOop sym_oops[symbol_alloc_batch_size]; -+ bool allocated = sk->allocate_symbols(names_count, names, lengths, -+ sym_oops, CHECK); -+ if (!allocated) { - // do it the hard way - for (int i=0; i<names_count; i++) { -+ assert(!Universe::heap()->is_in_reserved(names[i]) || GC_locker::is_active(), -+ "proposed name of symbol must be stable"); -+ -+ // We assume that lookup() has been called already, that it failed, -+ // and symbol was not found. We create the symbol here. -+ symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -+ symbolOop s_oop = sk->allocate_symbol((u1*)names[i], lengths[i], CHECK); -+ symbolHandle sym (THREAD, s_oop); -+ -+ // Allocation must be done before grabbing the SymbolTable_lock lock -+ MutexLocker ml(SymbolTable_lock, THREAD); -+ -+ SymbolTable* table = the_table(); - int index = table->hash_to_index(hashValues[i]); -- symbolOop sym = table->basic_add(index, (u1*)names[i], lengths[i], -+ symbolOop s = table->basic_add(sym, index, (u1*)names[i], lengths[i], - hashValues[i], CHECK); -- cp->symbol_at_put(cp_indices[i], sym); -+ cp->symbol_at_put(cp_indices[i], s); - } -+ return; - } -+ -+ symbolHandle syms[symbol_alloc_batch_size]; -+ for (int i=0; i<names_count; i++) { -+ syms[i] = symbolHandle(THREAD, sym_oops[i]); -+ } -+ -+ // Allocation must be done before grabbing the SymbolTable_lock lock -+ MutexLocker ml(SymbolTable_lock, THREAD); -+ -+ SymbolTable* table = the_table(); -+ bool added = table->basic_add(syms, cp, names_count, names, lengths, -+ cp_indices, hashValues, CHECK); -+ assert(added, "should always return true"); - } - --symbolOop SymbolTable::basic_add(int index, u1 *name, int len, -- unsigned int hashValue, TRAPS) { -- assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), -- "proposed name of symbol must be stable"); -- -- // We assume that lookup() has been called already, that it failed, -- // and symbol was not found. We create the symbol here. -- symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -- symbolOop s_oop = sk->allocate_symbol(name, len, CHECK_NULL); -- symbolHandle sym (THREAD, s_oop); -- -- // Allocation must be done before grapping the SymbolTable_lock lock -- MutexLocker ml(SymbolTable_lock, THREAD); -+symbolOop SymbolTable::basic_add(symbolHandle sym, int index_arg, u1 *name, int len, -+ unsigned int hashValue_arg, TRAPS) { -+ // Cannot hit a safepoint in this function because the "this" pointer can move. -+ No_Safepoint_Verifier nsv; - - assert(sym->equals((char*)name, len), "symbol must be properly initialized"); - -+ // Check if the symbol table has been rehashed, if so, need to recalculate -+ // the hash value and index. -+ unsigned int hashValue; -+ int index; -+ if (use_alternate_hashcode()) { -+ hashValue = hash_symbol((const char*)name, len); -+ index = hash_to_index(hashValue); -+ } else { -+ hashValue = hashValue_arg; -+ index = index_arg; -+ } -+ - // Since look-up was done lock-free, we need to check if another - // thread beat us in the race to insert the symbol. - -@@ -201,48 +287,42 @@ - return sym(); - } - --bool SymbolTable::basic_add(constantPoolHandle cp, int names_count, -+bool SymbolTable::basic_add(symbolHandle* syms, -+ constantPoolHandle cp, int names_count, - const char** names, int* lengths, - int* cp_indices, unsigned int* hashValues, - TRAPS) { -- symbolKlass* sk = (symbolKlass*) Universe::symbolKlassObj()->klass_part(); -- symbolOop sym_oops[symbol_alloc_batch_size]; -- bool allocated = sk->allocate_symbols(names_count, names, lengths, -- sym_oops, CHECK_false); -- if (!allocated) { -- return false; -- } -- symbolHandle syms[symbol_alloc_batch_size]; -- int i; -- for (i=0; i<names_count; i++) { -- syms[i] = symbolHandle(THREAD, sym_oops[i]); -- } -+ // Cannot hit a safepoint in this function because the "this" pointer can move. -+ No_Safepoint_Verifier nsv; - -- // Allocation must be done before grabbing the SymbolTable_lock lock -- MutexLocker ml(SymbolTable_lock, THREAD); -- -- for (i=0; i<names_count; i++) { -+ for (int i=0; i<names_count; i++) { - assert(syms[i]->equals(names[i], lengths[i]), "symbol must be properly initialized"); -+ // Check if the symbol table has been rehashed, if so, need to recalculate -+ // the hash value. -+ unsigned int hashValue; -+ if (use_alternate_hashcode()) { -+ hashValue = hash_symbol(names[i], lengths[i]); -+ } else { -+ hashValue = hashValues[i]; -+ } - // Since look-up was done lock-free, we need to check if another - // thread beat us in the race to insert the symbol. -- int index = hash_to_index(hashValues[i]); -- symbolOop test = lookup(index, names[i], lengths[i], hashValues[i]); -+ int index = hash_to_index(hashValue); -+ symbolOop test = lookup(index, names[i], lengths[i], hashValue); - if (test != NULL) { - // A race occurred and another thread introduced the symbol, this one - // will be dropped and collected. Use test instead. - cp->symbol_at_put(cp_indices[i], test); - } else { - symbolOop sym = syms[i](); -- HashtableEntry* entry = new_entry(hashValues[i], sym); -+ HashtableEntry* entry = new_entry(hashValue, sym); - add_entry(index, entry); - cp->symbol_at_put(cp_indices[i], sym); - } - } -- -- return true; -+ return true; // always returns true - } - -- - void SymbolTable::verify() { - for (int i = 0; i < the_table()->table_size(); ++i) { - HashtableEntry* p = the_table()->bucket(i); -@@ -251,7 +331,7 @@ - guarantee(s != NULL, "symbol is NULL"); - s->verify(); - guarantee(s->is_perm(), "symbol not in permspace"); -- unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); -+ unsigned int h = hash_symbol((const char*)s->bytes(), s->utf8_length()); - guarantee(p->hash() == h, "broken hash in symbol table entry"); - guarantee(the_table()->hash_to_index(h) == i, - "wrong index in symbol table"); -@@ -259,6 +339,23 @@ - } - } - -+void SymbolTable::dump(outputStream* st) { -+ NumberSeq summary; -+ for (int i = 0; i < the_table()->table_size(); ++i) { -+ int count = 0; -+ for (HashtableEntry* e = the_table()->bucket(i); -+ e != NULL; e = e->next()) { -+ count++; -+ } -+ summary.add((double)count); -+ } -+ st->print_cr("SymbolTable statistics:"); -+ st->print_cr("Number of buckets : %7d", summary.num()); -+ st->print_cr("Average bucket size : %7.0f", summary.avg()); -+ st->print_cr("Variance of bucket size : %7.0f", summary.variance()); -+ st->print_cr("Std. dev. of bucket size: %7.0f", summary.sd()); -+ st->print_cr("Maximum bucket size : %7.0f", summary.maximum()); -+} - - //--------------------------------------------------------------------------- - // Non-product code -@@ -321,7 +418,6 @@ - tty->print_cr(" %s %d: %d\n", "Number chains longer than", - results_length, out_of_range); - } -- - #endif // PRODUCT - - // -------------------------------------------------------------------------- -@@ -367,66 +463,56 @@ - // -------------------------------------------------------------------------- - - --// Compute the hash value for a java.lang.String object which would --// contain the characters passed in. This hash value is used for at --// least two purposes. --// --// (a) As the hash value used by the StringTable for bucket selection --// and comparison (stored in the HashtableEntry structures). This --// is used in the String.intern() method. --// --// (b) As the hash value used by the String object itself, in --// String.hashCode(). This value is normally calculate in Java code --// in the String.hashCode method(), but is precomputed for String --// objects in the shared archive file. --// --// For this reason, THIS ALGORITHM MUST MATCH String.hashCode(). -+StringTable* StringTable::_the_table = NULL; - --int StringTable::hash_string(jchar* s, int len) { -- unsigned h = 0; -- while (len-- > 0) { -- h = 31*h + (unsigned) *s; -- s++; -- } -- return h; -+bool StringTable::_needs_rehashing = false; -+ -+// Pick hashing algorithm -+unsigned int StringTable::hash_string(const jchar* s, int len) { -+ return the_table()->use_alternate_hashcode() ? AltHashing::murmur3_32(the_table()->seed(), s, len) : -+ java_lang_String::to_hash(s, len); - } - -- --StringTable* StringTable::_the_table = NULL; -- - oop StringTable::lookup(int index, jchar* name, - int len, unsigned int hash) { -+ int count = 0; - for (HashtableEntry* l = bucket(index); l != NULL; l = l->next()) { -+ count++; - if (l->hash() == hash) { - if (java_lang_String::equals(l->literal(), name, len)) { - return l->literal(); - } - } - } -+ // If the bucket size is too deep check if this hash code is insufficient. -+ if (count >= BasicHashtable::rehash_count && !needs_rehashing()) { -+ _needs_rehashing = check_rehash_table(count); -+ } - return NULL; - } - - --oop StringTable::basic_add(int index, Handle string_or_null, jchar* name, -- int len, unsigned int hashValue, TRAPS) { -- debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); -- assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), -- "proposed name of symbol must be stable"); -+oop StringTable::basic_add(int index_arg, Handle string, jchar* name, -+ int len, unsigned int hashValue_arg, TRAPS) { - -- Handle string; -- // try to reuse the string if possible -- if (!string_or_null.is_null() && string_or_null()->is_perm()) { -- string = string_or_null; -- } else { -- string = java_lang_String::create_tenured_from_unicode(name, len, CHECK_NULL); -- } -- -- // Allocation must be done before grapping the SymbolTable_lock lock -- MutexLocker ml(StringTable_lock, THREAD); -+ // Cannot hit a safepoint in this function because the "this" pointer can move. -+ No_Safepoint_Verifier nsv; - - assert(java_lang_String::equals(string(), name, len), - "string must be properly initialized"); - -+ // Check if the symbol table has been rehashed, if so, need to recalculate -+ // the hash value and index before second lookup. -+ unsigned int hashValue; -+ int index; -+ if (use_alternate_hashcode()) { -+ hashValue = hash_string(name, len); -+ index = hash_to_index(hashValue); -+ } else { -+ hashValue = hashValue_arg; -+ index = index_arg; -+ } -+ - // Since look-up was done lock-free, we need to check if another - // thread beat us in the race to insert the symbol. - -@@ -456,13 +542,28 @@ - int len, TRAPS) { - unsigned int hashValue = hash_string(name, len); - int index = the_table()->hash_to_index(hashValue); -- oop string = the_table()->lookup(index, name, len, hashValue); -+ oop found_string = the_table()->lookup(index, name, len, hashValue); - - // Found -- if (string != NULL) return string; -+ if (found_string != NULL) return found_string; -+ -+ debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); -+ assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), -+ "proposed name of symbol must be stable"); -+ -+ Handle string; -+ // try to reuse the string if possible -+ if (!string_or_null.is_null() && string_or_null()->is_perm()) { -+ string = string_or_null; -+ } else { -+ string = java_lang_String::create_tenured_from_unicode(name, len, CHECK_NULL); -+ } -+ -+ // Allocation must be done before grabbing the StringTable_lock lock -+ MutexLocker ml(StringTable_lock, THREAD); - - // Otherwise, add to symbol to table -- return the_table()->basic_add(index, string_or_null, name, len, -+ return the_table()->basic_add(index, string, name, len, - hashValue, CHECK_NULL); - } - -@@ -517,3 +618,41 @@ - } - } - } -+ -+void StringTable::dump(outputStream* st) { -+ NumberSeq summary; -+ for (int i = 0; i < the_table()->table_size(); ++i) { -+ HashtableEntry* p = the_table()->bucket(i); -+ int count = 0; -+ for ( ; p != NULL; p = p->next()) { -+ count++; -+ } -+ summary.add((double)count); -+ } -+ st->print_cr("StringTable statistics:"); -+ st->print_cr("Number of buckets : %7d", summary.num()); -+ st->print_cr("Average bucket size : %7.0f", summary.avg()); -+ st->print_cr("Variance of bucket size : %7.0f", summary.variance()); -+ st->print_cr("Std. dev. of bucket size: %7.0f", summary.sd()); -+ st->print_cr("Maximum bucket size : %7.0f", summary.maximum()); -+} -+ -+ -+// Create a new table and using alternate hash code, populate the new table -+// with the existing strings. Set flag to use the alternate hash code afterwards. -+void StringTable::rehash_table() { -+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); -+ // This should never happen with -Xshare:dump but it might in testing mode. -+ if (DumpSharedSpaces) return; -+ StringTable* new_table = new StringTable(); -+ -+ // Rehash the table -+ the_table()->move_to(new_table); -+ -+ // Delete the table and buckets (entries are reused in new table). -+ delete _the_table; -+ // Don't check if we need rehashing until the table gets unbalanced again. -+ // Then rehash with a new global seed. -+ _needs_rehashing = false; -+ _the_table = new_table; -+} -diff --git a/src/share/vm/classfile/symbolTable.hpp b/src/share/vm/classfile/symbolTable.hpp ---- openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp -+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp -@@ -40,6 +40,7 @@ - // - symbolTableEntrys are allocated in blocks to reduce the space overhead. - - class BoolObjectClosure; -+class outputStream; - - - class SymbolTable : public Hashtable { -@@ -49,10 +50,13 @@ - // The symbol table - static SymbolTable* _the_table; - -+ // Set if one bucket is out of balance due to hash algorithm deficiency -+ static bool _needs_rehashing; -+ - // Adding elements -- symbolOop basic_add(int index, u1* name, int len, -+ symbolOop basic_add(symbolHandle sym, int index, u1* name, int len, - unsigned int hashValue, TRAPS); -- bool basic_add(constantPoolHandle cp, int names_count, -+ bool basic_add(symbolHandle* syms, constantPoolHandle cp, int names_count, - const char** names, int* lengths, int* cp_indices, - unsigned int* hashValues, TRAPS); - -@@ -61,6 +65,8 @@ - symbol_table_size = 20011 - }; - -+ static unsigned int hash_symbol(const char* s, int len); -+ - symbolOop lookup(int index, const char* name, int len, unsigned int hash); - - SymbolTable() -@@ -70,7 +76,6 @@ - : Hashtable(symbol_table_size, sizeof (HashtableEntry), t, - number_of_entries) {} - -- - public: - enum { - symbol_alloc_batch_size = 8 -@@ -137,6 +142,7 @@ - - // Debugging - static void verify(); -+ static void dump(outputStream* st); - - // Sharing - static void copy_buckets(char** top, char*end) { -@@ -148,6 +154,10 @@ - static void reverse(void* boundary = NULL) { - ((Hashtable*)the_table())->reverse(boundary); - } -+ -+ // Rehash the symbol table if it gets out of balance -+ static void rehash_table(); -+ static bool needs_rehashing() { return _needs_rehashing; } - }; - - -@@ -158,8 +168,11 @@ - // The string table - static StringTable* _the_table; - -+ // Set if one bucket is out of balance due to hash algorithm deficiency -+ static bool _needs_rehashing; -+ - static oop intern(Handle string_or_null, jchar* chars, int length, TRAPS); -- oop basic_add(int index, Handle string_or_null, jchar* name, int len, -+ oop basic_add(int index, Handle string, jchar* name, int len, - unsigned int hashValue, TRAPS); - - // Table size -@@ -192,10 +205,6 @@ - _the_table = new StringTable(t, number_of_entries); - } - -- -- static int hash_string(jchar* s, int len); -- -- - // GC support - // Delete pointers to otherwise-unreachable objects. - static void unlink(BoolObjectClosure* cl) { -@@ -207,6 +216,14 @@ - the_table()->Hashtable::oops_do(f); - } - -+ // Hashing algorithm, used as the hash value used by the -+ // StringTable for bucket selection and comparison (stored in the -+ // HashtableEntry structures). This is used in the String.intern() method. -+ static unsigned int hash_string(const jchar* s, int len); -+ -+ // Internal test. -+ static void test_alt_hash() PRODUCT_RETURN; -+ - // Probing - static oop lookup(symbolOop symbol); - -@@ -217,6 +234,7 @@ - - // Debugging - static void verify(); -+ static void dump(outputStream* st); - - // Sharing - static void copy_buckets(char** top, char*end) { -@@ -228,6 +246,9 @@ - static void reverse() { - ((BasicHashtable*)the_table())->reverse(); - } -+ -+ // Rehash the symbol table if it gets out of balance -+ static void rehash_table(); -+ static bool needs_rehashing() { return _needs_rehashing; } - }; -- - #endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP -diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp ---- openjdk/hotspot/src/share/vm/memory/dump.cpp -+++ openjdk/hotspot/src/share/vm/memory/dump.cpp -@@ -62,8 +62,8 @@ - // written later, increasing the likelihood that the shared page contain - // the hash can be shared. - // --// NOTE THAT the algorithm in StringTable::hash_string() MUST MATCH the --// algorithm in java.lang.String.hashCode(). -+// NOTE THAT we have to call java_lang_String::to_hash() to match the -+// algorithm in java.lang.String.toHash(). - - class StringHashCodeClosure: public OopClosure { - private: -@@ -88,7 +88,7 @@ - } else { - int offset = java_lang_String::offset(obj); - jchar* s = value->char_at_addr(offset); -- hash = StringTable::hash_string(s, length); -+ hash = java_lang_String::to_hash(s, length); - } - obj->int_field_put(hash_offset, hash); - } -diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp ---- openjdk/hotspot/src/share/vm/runtime/globals.hpp -+++ openjdk/hotspot/src/share/vm/runtime/globals.hpp -@@ -2511,6 +2511,9 @@ - product(bool, UseHeavyMonitors, false, \ - "use heavyweight instead of lightweight Java monitors") \ - \ -+ product(bool, PrintStringTableStatistics, false, \ -+ "print statistics about the StringTable and SymbolTable") \ -+ \ - notproduct(bool, PrintSymbolTableSizeHistogram, false, \ - "print histogram of the symbol table") \ - \ -diff --git a/src/share/vm/runtime/init.cpp b/src/share/vm/runtime/init.cpp ---- openjdk/hotspot/src/share/vm/runtime/init.cpp -+++ openjdk/hotspot/src/share/vm/runtime/init.cpp -@@ -23,6 +23,7 @@ - */ - - #include "precompiled.hpp" -+#include "classfile/symbolTable.hpp" - #include "code/icBuffer.hpp" - #include "gc_interface/collectedHeap.hpp" - #include "interpreter/bytecodes.hpp" -@@ -153,6 +154,10 @@ - // Print the collected safepoint statistics. - SafepointSynchronize::print_stat_on_exit(); - } -+ if (PrintStringTableStatistics) { -+ SymbolTable::dump(tty); -+ StringTable::dump(tty); -+ } - ostream_exit(); - } - } -diff --git a/src/share/vm/runtime/safepoint.cpp b/src/share/vm/runtime/safepoint.cpp ---- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp -+++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp -@@ -23,6 +23,7 @@ - */ - - #include "precompiled.hpp" -+#include "classfile/symbolTable.hpp" - #include "classfile/systemDictionary.hpp" - #include "code/codeCache.hpp" - #include "code/icBuffer.hpp" -@@ -501,8 +502,20 @@ - CompilationPolicy::policy()->do_safepoint_work(); - } - -- TraceTime t4("sweeping nmethods", TraceSafepointCleanupTime); -- NMethodSweeper::scan_stacks(); -+ { -+ TraceTime t4("sweeping nmethods", TraceSafepointCleanupTime); -+ NMethodSweeper::scan_stacks(); -+ } -+ -+ if (SymbolTable::needs_rehashing()) { -+ TraceTime t5("rehashing symbol table", TraceSafepointCleanupTime); -+ SymbolTable::rehash_table(); -+ } -+ -+ if (StringTable::needs_rehashing()) { -+ TraceTime t6("rehashing string table", TraceSafepointCleanupTime); -+ StringTable::rehash_table(); -+ } - } - - -diff --git a/src/share/vm/utilities/hashtable.cpp b/src/share/vm/utilities/hashtable.cpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.cpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.cpp -@@ -1,5 +1,4 @@ --/* -- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+/* * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -23,7 +22,10 @@ - */ - - #include "precompiled.hpp" -+#include "classfile/altHashing.hpp" -+#include "classfile/javaClasses.hpp" - #include "memory/allocation.inline.hpp" -+#include "memory/filemap.hpp" - #include "memory/resourceArea.hpp" - #include "oops/oop.inline.hpp" - #include "runtime/safepoint.hpp" -@@ -69,7 +71,6 @@ - - HashtableEntry* Hashtable::new_entry(unsigned int hashValue, oop obj) { - HashtableEntry* entry; -- - entry = (HashtableEntry*)BasicHashtable::new_entry(hashValue); - entry->set_literal(obj); // clears literal string field - HS_DTRACE_PROBE4(hs_private, hashtable__new_entry, -@@ -85,18 +86,24 @@ - // entries at a safepoint. - assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); - for (int i = 0; i < table_size(); ++i) { -- for (HashtableEntry** p = bucket_addr(i); *p != NULL; ) { -- HashtableEntry* entry = *p; -- if (entry->is_shared()) { -+ HashtableEntry** p = bucket_addr(i); -+ HashtableEntry* entry = bucket(i); -+ while (entry != NULL) { -+ // Shared entries are normally at the end of the bucket and if we run into -+ // a shared entry, then there is nothing more to remove. However, if we -+ // have rehashed the table, then the shared entries are no longer at the -+ // end of the bucket. -+ if (entry->is_shared() && !use_alternate_hashcode()) { - break; - } - assert(entry->literal() != NULL, "just checking"); -- if (is_alive->do_object_b(entry->literal())) { -+ if (entry->is_shared() || is_alive->do_object_b(entry->literal())) { - p = entry->next_addr(); - } else { - *p = entry->next(); - free_entry(entry); - } -+ entry = (HashtableEntry*)HashtableEntry::make_ptr(*p); - } - } - } -@@ -123,6 +130,96 @@ - } - - -+// Check to see if the hashtable is unbalanced. The caller set a flag to -+// rehash at the next safepoint. If this bucket is 60 times greater than the -+// expected average bucket length, it's an unbalanced hashtable. -+// This is somewhat an arbitrary heuristic but if one bucket gets to -+// rehash_count which is currently 100, there's probably something wrong. -+ -+bool BasicHashtable::check_rehash_table(int count) { -+ assert(table_size() != 0, "underflow"); -+ if (count > (((double)number_of_entries()/(double)table_size())*rehash_multiple)) { -+ // Set a flag for the next safepoint, which should be at some guaranteed -+ // safepoint interval. -+ return true; -+ } -+ return false; -+} -+ -+unsigned int Hashtable::new_hash(oop string) { -+ ResourceMark rm; -+ int length; -+ if (java_lang_String::is_instance(string)) { -+ jchar* chars = java_lang_String::as_unicode_string(string, length); -+ // Use alternate hashing algorithm on the string -+ return AltHashing::murmur3_32(seed(), chars, length); -+ } else { -+ // Use alternate hashing algorithm on this symbol. -+ symbolOop symOop = (symbolOop) string; -+ return AltHashing::murmur3_32(seed(), (const jbyte*)symOop->bytes(), symOop->utf8_length()); -+ } -+} -+ -+// Create a new table and using alternate hash code, populate the new table -+// with the existing elements. This can be used to change the hash code -+// and could in the future change the size of the table. -+ -+void Hashtable::move_to(Hashtable* new_table) { -+ // Initialize the global seed for hashing. -+ assert(new_table->seed() == 0, "should be zero"); -+ _seed = AltHashing::compute_seed(); -+ assert(seed() != 0, "shouldn't be zero"); -+ new_table->set_seed(_seed); -+ -+ int saved_entry_count = this->number_of_entries(); -+ -+ // Iterate through the table and create a new entry for the new table -+ for (int i = 0; i < new_table->table_size(); ++i) { -+ for (HashtableEntry* p = bucket(i); p != NULL; ) { -+ HashtableEntry* next = p->next(); -+ oop string = p->literal(); -+ // Use alternate hashing algorithm on the symbol in the first table -+ unsigned int hashValue = new_hash(string); -+ // Get a new index relative to the new table (can also change size) -+ int index = new_table->hash_to_index(hashValue); -+ p->set_hash(hashValue); -+ // Keep the shared bit in the Hashtable entry to indicate that this entry -+ // can't be deleted. The shared bit is the LSB in the _next field so -+ // walking the hashtable past these entries requires -+ // BasicHashtableEntry::make_ptr() call. -+ bool keep_shared = p->is_shared(); -+ unlink_entry(p); -+ new_table->add_entry(index, p); -+ if (keep_shared) { -+ p->set_shared(); -+ } -+ p = next; -+ } -+ } -+ // give the new table the free list as well -+ new_table->copy_freelist(this); -+ assert(new_table->number_of_entries() == saved_entry_count, "lost entry on dictionary copy?"); -+ -+ // Destroy memory used by the buckets in the hashtable. The memory -+ // for the elements has been used in a new table and is not -+ // destroyed. The memory reuse will benefit resizing the SystemDictionary -+ // to avoid a memory allocation spike at safepoint. -+ free_buckets(); -+} -+ -+void BasicHashtable::free_buckets() { -+ if (NULL != _buckets) { -+ // Don't delete the buckets in the shared space. They aren't -+ // allocated by os::malloc -+ if (!UseSharedSpaces || -+ !FileMapInfo::current_info()->is_in_shared_space(_buckets)) { -+ FREE_C_HEAP_ARRAY(HashtableBucket, _buckets); -+ } -+ _buckets = NULL; -+ } -+} -+ -+ - // Reverse the order of elements in the hash buckets. - - void BasicHashtable::reverse() { -diff --git a/src/share/vm/utilities/hashtable.hpp b/src/share/vm/utilities/hashtable.hpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.hpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.hpp -@@ -177,6 +177,11 @@ - void verify_lookup_length(double load); - #endif - -+ enum { -+ rehash_count = 100, -+ rehash_multiple = 60 -+ }; -+ - void initialize(int table_size, int entry_size, int number_of_entries); - - // Accessor -@@ -192,6 +197,29 @@ - // Table entry management - BasicHashtableEntry* new_entry(unsigned int hashValue); - -+ // Check that the table is unbalanced -+ bool check_rehash_table(int count); -+ -+ // Used when moving the entry to another table -+ // Clean up links, but do not add to free_list -+ void unlink_entry(BasicHashtableEntry* entry) { -+ entry->set_next(NULL); -+ --_number_of_entries; -+ } -+ -+ // Move over freelist and free block for allocation -+ void copy_freelist(BasicHashtable* src) { -+ _free_list = src->_free_list; -+ src->_free_list = NULL; -+ _first_free_entry = src->_first_free_entry; -+ src->_first_free_entry = NULL; -+ _end_block = src->_end_block; -+ src->_end_block = NULL; -+ } -+ -+ // Free the buckets in this hashtable -+ void free_buckets(); -+ - public: - void set_entry(int index, BasicHashtableEntry* entry); - -@@ -210,11 +238,11 @@ - - public: - Hashtable(int table_size, int entry_size) -- : BasicHashtable(table_size, entry_size) { } -+ : BasicHashtable(table_size, entry_size), _seed(0) { } - - Hashtable(int table_size, int entry_size, - HashtableBucket* buckets, int number_of_entries) -- : BasicHashtable(table_size, entry_size, buckets, number_of_entries) { } -+ : BasicHashtable(table_size, entry_size, buckets, number_of_entries), _seed(0) { } - - // Invoke "f->do_oop" on the locations of all oops in the table. - void oops_do(OopClosure* f); -@@ -234,8 +262,6 @@ - - protected: - -- static unsigned int hash_symbol(const char* s, int len); -- - unsigned int compute_hash(symbolHandle name) { - return (unsigned int) name->identity_hash(); - } -@@ -256,6 +282,17 @@ - HashtableEntry** bucket_addr(int i) { - return (HashtableEntry**)BasicHashtable::bucket_addr(i); - } -+ -+ // Function to move these elements into the new table. -+ void move_to(Hashtable* new_table); -+ bool use_alternate_hashcode() { return _seed != 0; } -+ jint seed() { return _seed; } -+ void set_seed(jint seed) { _seed = seed; } -+ -+ private: -+ jint _seed; -+ -+ unsigned int new_hash(oop string); - }; - - -diff --git a/src/share/vm/utilities/hashtable.inline.hpp b/src/share/vm/utilities/hashtable.inline.hpp ---- openjdk/hotspot/src/share/vm/utilities/hashtable.inline.hpp -+++ openjdk/hotspot/src/share/vm/utilities/hashtable.inline.hpp -@@ -30,27 +30,6 @@ - - // Inline function definitions for hashtable.hpp. - -- --// -------------------------------------------------------------------------- --// Hash function -- --// We originally used hashpjw, but hash P(31) gives just as good results --// and is slighly faster. We would like a hash function that looks at every --// character, since package names have large common prefixes, and also because --// hash_or_fail does error checking while iterating. -- --// hash P(31) from Kernighan & Ritchie -- --inline unsigned int Hashtable::hash_symbol(const char* s, int len) { -- unsigned int h = 0; -- while (len-- > 0) { -- h = 31*h + (unsigned) *s; -- s++; -- } -- return h; --} -- -- - // -------------------------------------------------------------------------- - - // Initialize a table.
--- a/patches/security/20121016/7158801.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# HG changeset patch -# User kvn -# Date 1337800285 25200 -# Node ID f7493d50b47d3946902e18153bcd912e37589d00 -# Parent 2faa3f7bad65189e69ab2f9a491743786bb8f07f -7158801: Improve VM CompileOnly option -Summary: Fixed buffer overflow during parsing flags -XX:CompileCommand=, -XX:CompileOnly= and command lines in .hotspot_compiler file. -Reviewed-by: never - -diff --git a/src/share/vm/compiler/compilerOracle.cpp b/src/share/vm/compiler/compilerOracle.cpp ---- openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp -@@ -573,7 +573,7 @@ - char token[1024]; - int pos = 0; - int c = getc(stream); -- while(c != EOF) { -+ while(c != EOF && pos < (sizeof(token)-1)) { - if (c == '\n') { - token[pos++] = '\0'; - parse_from_line(token); -@@ -594,7 +594,7 @@ - int pos = 0; - const char* sp = str; - int c = *sp++; -- while (c != '\0') { -+ while (c != '\0' && pos < (sizeof(token)-1)) { - if (c == '\n') { - token[pos++] = '\0'; - parse_line(token);
--- a/patches/security/20121016/7158804.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# HG changeset patch -# User dbuck -# Date 1342799006 25200 -# Node ID fde4cc8479824449b03abedd5357500aec92e990 -# Parent f7493d50b47d3946902e18153bcd912e37589d00 -7158804: Improve config file parsing -Summary: see bugdb 13784108 for details -Reviewed-by: vikram, kamg - -diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp ---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -842,7 +842,7 @@ - bool result = true; - - int c = getc(stream); -- while(c != EOF) { -+ while(c != EOF && pos < (int)(sizeof(token)-1)) { - if (in_white_space) { - if (in_comment) { - if (c == '\n') in_comment = false;
--- a/patches/security/20121016/7167656.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1340139680 -3600 -# Node ID d04575148db287475168da344159e583f7bff02c -# Parent 1e170e3c1b682d0f98a61a47e5049535c5bd4999 -7167656: Multiple Seeders are being created -Reviewed-by: wetmore - -diff --git a/src/share/classes/sun/security/provider/SecureRandom.java b/src/share/classes/sun/security/provider/SecureRandom.java ---- openjdk/jdk/src/share/classes/sun/security/provider/SecureRandom.java -+++ openjdk/jdk/src/share/classes/sun/security/provider/SecureRandom.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -56,12 +56,6 @@ - - private static final long serialVersionUID = 3581829991155417889L; - -- /** -- * This static object will be seeded by SeedGenerator, and used -- * to seed future instances of SecureRandom -- */ -- private static SecureRandom seeder; -- - private static final int DIGEST_SIZE = 20; - private transient MessageDigest digest; - private byte[] state; -@@ -173,6 +167,28 @@ - } - - /** -+ * This static object will be seeded by SeedGenerator, and used -+ * to seed future instances of SHA1PRNG SecureRandoms. -+ * -+ * Bloch, Effective Java Second Edition: Item 71 -+ */ -+ private static class SeederHolder { -+ -+ private static final SecureRandom seeder; -+ -+ static { -+ /* -+ * Call to SeedGenerator.generateSeed() to add additional -+ * seed material (likely from the Native implementation). -+ */ -+ seeder = new SecureRandom(SeedGenerator.getSystemEntropy()); -+ byte [] b = new byte[DIGEST_SIZE]; -+ SeedGenerator.generateSeed(b); -+ seeder.engineSetSeed(b); -+ } -+ } -+ -+ /** - * Generates a user-specified number of random bytes. - * - * @param bytes the array to be filled in with random bytes. -@@ -183,13 +199,8 @@ - byte[] output = remainder; - - if (state == null) { -- if (seeder == null) { -- seeder = new SecureRandom(SeedGenerator.getSystemEntropy()); -- seeder.engineSetSeed(engineGenerateSeed(DIGEST_SIZE)); -- } -- - byte[] seed = new byte[DIGEST_SIZE]; -- seeder.engineNextBytes(seed); -+ SeederHolder.seeder.engineNextBytes(seed); - state = digest.digest(seed); - } -
--- a/patches/security/20121016/7169884.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,349 +0,0 @@ -# HG changeset patch -# User robm -# Date 1347903606 -3600 -# Node ID 47e7c8e33cd82dade3e84af94bff125cdbdae062 -# Parent d04575148db287475168da344159e583f7bff02c -7169884: LogManager checks do not work correctly for sub-types -Reviewed-by: alanb - -diff --git a/src/share/classes/java/util/logging/FileHandler.java b/src/share/classes/java/util/logging/FileHandler.java ---- openjdk/jdk/src/share/classes/java/util/logging/FileHandler.java -+++ openjdk/jdk/src/share/classes/java/util/logging/FileHandler.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -220,7 +220,7 @@ - * @exception NullPointerException if pattern property is an empty String. - */ - public FileHandler() throws IOException, SecurityException { -- checkAccess(); -+ checkPermission(); - configure(); - openFiles(); - } -@@ -246,7 +246,7 @@ - if (pattern.length() < 1 ) { - throw new IllegalArgumentException(); - } -- checkAccess(); -+ checkPermission(); - configure(); - this.pattern = pattern; - this.limit = 0; -@@ -278,7 +278,7 @@ - if (pattern.length() < 1 ) { - throw new IllegalArgumentException(); - } -- checkAccess(); -+ checkPermission(); - configure(); - this.pattern = pattern; - this.limit = 0; -@@ -315,7 +315,7 @@ - if (limit < 0 || count < 1 || pattern.length() < 1) { - throw new IllegalArgumentException(); - } -- checkAccess(); -+ checkPermission(); - configure(); - this.pattern = pattern; - this.limit = limit; -@@ -354,7 +354,7 @@ - if (limit < 0 || count < 1 || pattern.length() < 1) { - throw new IllegalArgumentException(); - } -- checkAccess(); -+ checkPermission(); - configure(); - this.pattern = pattern; - this.limit = limit; -@@ -367,7 +367,7 @@ - // configured instance variables. - private void openFiles() throws IOException { - LogManager manager = LogManager.getLogManager(); -- manager.checkAccess(); -+ manager.checkPermission(); - if (count < 1) { - throw new IllegalArgumentException("file count = " + count); - } -diff --git a/src/share/classes/java/util/logging/Handler.java b/src/share/classes/java/util/logging/Handler.java ---- openjdk/jdk/src/share/classes/java/util/logging/Handler.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Handler.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -111,7 +111,7 @@ - * the caller does not have <tt>LoggingPermission("control")</tt>. - */ - public void setFormatter(Formatter newFormatter) throws SecurityException { -- checkAccess(); -+ checkPermission(); - // Check for a null pointer: - newFormatter.getClass(); - formatter = newFormatter; -@@ -140,7 +140,7 @@ - */ - public void setEncoding(String encoding) - throws SecurityException, java.io.UnsupportedEncodingException { -- checkAccess(); -+ checkPermission(); - if (encoding != null) { - try { - if(!java.nio.charset.Charset.isSupported(encoding)) { -@@ -175,7 +175,7 @@ - * the caller does not have <tt>LoggingPermission("control")</tt>. - */ - public void setFilter(Filter newFilter) throws SecurityException { -- checkAccess(); -+ checkPermission(); - filter = newFilter; - } - -@@ -199,7 +199,7 @@ - * the caller does not have <tt>LoggingPermission("control")</tt>. - */ - public void setErrorManager(ErrorManager em) { -- checkAccess(); -+ checkPermission(); - if (em == null) { - throw new NullPointerException(); - } -@@ -213,7 +213,7 @@ - * the caller does not have <tt>LoggingPermission("control")</tt>. - */ - public ErrorManager getErrorManager() { -- checkAccess(); -+ checkPermission(); - return errorManager; - } - -@@ -253,7 +253,7 @@ - if (newLevel == null) { - throw new NullPointerException(); - } -- checkAccess(); -+ checkPermission(); - logLevel = newLevel; - } - -@@ -296,9 +296,9 @@ - // If "sealed" is true, we check that the caller has - // appropriate security privileges to update Handler - // state and if not throw a SecurityException. -- void checkAccess() throws SecurityException { -+ void checkPermission() throws SecurityException { - if (sealed) { -- manager.checkAccess(); -+ manager.checkPermission(); - } - } - } -diff --git a/src/share/classes/java/util/logging/LogManager.java b/src/share/classes/java/util/logging/LogManager.java ---- openjdk/jdk/src/share/classes/java/util/logging/LogManager.java -+++ openjdk/jdk/src/share/classes/java/util/logging/LogManager.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -303,7 +303,7 @@ - if (l == null) { - throw new NullPointerException(); - } -- checkAccess(); -+ checkPermission(); - changes.addPropertyChangeListener(l); - } - -@@ -322,7 +322,7 @@ - * the caller does not have LoggingPermission("control"). - */ - public void removePropertyChangeListener(PropertyChangeListener l) throws SecurityException { -- checkAccess(); -+ checkPermission(); - changes.removePropertyChangeListener(l); - } - -@@ -740,7 +740,7 @@ - * @exception IOException if there are IO problems reading the configuration. - */ - public void readConfiguration() throws IOException, SecurityException { -- checkAccess(); -+ checkPermission(); - - // if a configuration class is specified, load it and use it. - String cname = System.getProperty("java.util.logging.config.class"); -@@ -798,7 +798,7 @@ - */ - - public void reset() throws SecurityException { -- checkAccess(); -+ checkPermission(); - synchronized (this) { - props = new Properties(); - // Since we are doing a reset we no longer want to initialize -@@ -883,7 +883,7 @@ - * @exception IOException if there are problems reading from the stream. - */ - public void readConfiguration(InputStream ins) throws IOException, SecurityException { -- checkAccess(); -+ checkPermission(); - reset(); - - // Load the properties -@@ -1045,7 +1045,13 @@ - } - - -- private Permission ourPermission = new LoggingPermission("control", null); -+ private final Permission controlPermission = new LoggingPermission("control", null); -+ -+ void checkPermission() { -+ SecurityManager sm = System.getSecurityManager(); -+ if (sm != null) -+ sm.checkPermission(controlPermission); -+ } - - /** - * Check that the current context is trusted to modify the logging -@@ -1058,11 +1064,7 @@ - * the caller does not have LoggingPermission("control"). - */ - public void checkAccess() throws SecurityException { -- SecurityManager sm = System.getSecurityManager(); -- if (sm == null) { -- return; -- } -- sm.checkPermission(ourPermission); -+ checkPermission(); - } - - // Nested class to represent a node in our tree of named loggers. -diff --git a/src/share/classes/java/util/logging/Logger.java b/src/share/classes/java/util/logging/Logger.java ---- openjdk/jdk/src/share/classes/java/util/logging/Logger.java -+++ openjdk/jdk/src/share/classes/java/util/logging/Logger.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -266,13 +266,13 @@ - this.manager = manager; - } - -- private void checkAccess() throws SecurityException { -+ private void checkPermission() throws SecurityException { - if (!anonymous) { - if (manager == null) { - // Complete initialization of the global Logger. - manager = LogManager.getLogManager(); - } -- manager.checkAccess(); -+ manager.checkPermission(); - } - } - -@@ -454,7 +454,7 @@ - * the caller does not have LoggingPermission("control"). - */ - public synchronized void setFilter(Filter newFilter) throws SecurityException { -- checkAccess(); -+ checkPermission(); - filter = newFilter; - } - -@@ -1145,7 +1145,7 @@ - * the caller does not have LoggingPermission("control"). - */ - public void setLevel(Level newLevel) throws SecurityException { -- checkAccess(); -+ checkPermission(); - synchronized (treeLock) { - levelObject = newLevel; - updateEffectiveLevel(); -@@ -1200,7 +1200,7 @@ - public synchronized void addHandler(Handler handler) throws SecurityException { - // Check for null handler - handler.getClass(); -- checkAccess(); -+ checkPermission(); - if (handlers == null) { - handlers = new ArrayList<Handler>(); - } -@@ -1217,7 +1217,7 @@ - * the caller does not have LoggingPermission("control"). - */ - public synchronized void removeHandler(Handler handler) throws SecurityException { -- checkAccess(); -+ checkPermission(); - if (handler == null) { - return; - } -@@ -1251,7 +1251,7 @@ - * the caller does not have LoggingPermission("control"). - */ - public synchronized void setUseParentHandlers(boolean useParentHandlers) { -- checkAccess(); -+ checkPermission(); - this.useParentHandlers = useParentHandlers; - } - -@@ -1388,7 +1388,7 @@ - if (parent == null) { - throw new NullPointerException(); - } -- manager.checkAccess(); -+ manager.checkPermission(); - doSetParent(parent); - } - -diff --git a/src/share/classes/java/util/logging/MemoryHandler.java b/src/share/classes/java/util/logging/MemoryHandler.java ---- openjdk/jdk/src/share/classes/java/util/logging/MemoryHandler.java -+++ openjdk/jdk/src/share/classes/java/util/logging/MemoryHandler.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -238,7 +238,7 @@ - throw new NullPointerException(); - } - LogManager manager = LogManager.getLogManager(); -- checkAccess(); -+ checkPermission(); - pushLevel = newLevel; - } - -diff --git a/src/share/classes/java/util/logging/StreamHandler.java b/src/share/classes/java/util/logging/StreamHandler.java ---- openjdk/jdk/src/share/classes/java/util/logging/StreamHandler.java -+++ openjdk/jdk/src/share/classes/java/util/logging/StreamHandler.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -249,7 +249,7 @@ - } - - private synchronized void flushAndClose() throws SecurityException { -- checkAccess(); -+ checkPermission(); - if (writer != null) { - try { - if (!doneHeader) {
--- a/patches/security/20121016/7169888.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,125 +0,0 @@ -# HG changeset patch -# User dbuck -# Date 1342799616 25200 -# Node ID 39b599e90c7b33435ca42ae96ed673812a8be3d7 -# Parent 47e7c8e33cd82dade3e84af94bff125cdbdae062 -7169888: Narrowing resource definitions in JMX RMI connector -Summary: see bugdb 13932219 for details -Reviewed-by: fparain, vikram - -diff --git a/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java ---- openjdk/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java -+++ openjdk/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -39,11 +39,17 @@ - import java.rmi.MarshalledObject; - import java.rmi.UnmarshalException; - import java.rmi.server.Unreferenced; -+ - import java.security.AccessControlContext; - import java.security.AccessController; -+import java.security.Permission; -+import java.security.PermissionCollection; -+import java.security.Permissions; - import java.security.PrivilegedAction; - import java.security.PrivilegedActionException; - import java.security.PrivilegedExceptionAction; -+import java.security.ProtectionDomain; -+ - import java.util.Arrays; - import java.util.Collections; - import java.util.Map; -@@ -60,6 +66,7 @@ - import javax.management.MBeanException; - import javax.management.MBeanInfo; - import javax.management.MBeanRegistrationException; -+import javax.management.MBeanPermission; - import javax.management.MBeanServer; - import javax.management.NotCompliantMBeanException; - import javax.management.NotificationFilter; -@@ -144,15 +151,20 @@ - this.mbeanServer = rmiServer.getMBeanServer(); - - final ClassLoader dcl = defaultClassLoader; -+ - this.classLoaderWithRepository = - AccessController.doPrivileged( - new PrivilegedAction<ClassLoaderWithRepository>() { - public ClassLoaderWithRepository run() { - return new ClassLoaderWithRepository( -- getClassLoaderRepository(), -+ mbeanServer.getClassLoaderRepository(), - dcl); - } -- }); -+ }, -+ -+ withPermissions( new MBeanPermission("*", "getClassLoaderRepository"), -+ new RuntimePermission("createClassLoader")) -+ ); - - serverCommunicatorAdmin = new - RMIServerCommunicatorAdmin(EnvHelp.getServerConnectionTimeout(env)); -@@ -160,6 +172,17 @@ - this.env = env; - } - -+ private static AccessControlContext withPermissions(Permission ... perms){ -+ Permissions col = new Permissions(); -+ -+ for (Permission thePerm : perms ) { -+ col.add(thePerm); -+ } -+ -+ final ProtectionDomain pd = new ProtectionDomain(null, col); -+ return new AccessControlContext( new ProtectionDomain[] { pd }); -+ } -+ - private synchronized ServerNotifForwarder getServerNotifFwd() { - // Lazily created when first use. Mainly when - // addNotificationListener is first called. -@@ -1314,16 +1337,6 @@ - // private methods - //------------------------------------------------------------------------ - -- private ClassLoaderRepository getClassLoaderRepository() { -- return -- AccessController.doPrivileged( -- new PrivilegedAction<ClassLoaderRepository>() { -- public ClassLoaderRepository run() { -- return mbeanServer.getClassLoaderRepository(); -- } -- }); -- } -- - private ClassLoader getClassLoader(final ObjectName name) - throws InstanceNotFoundException { - try { -@@ -1333,7 +1346,9 @@ - public ClassLoader run() throws InstanceNotFoundException { - return mbeanServer.getClassLoader(name); - } -- }); -+ }, -+ withPermissions(new MBeanPermission("*", "getClassLoader")) -+ ); - } catch (PrivilegedActionException pe) { - throw (InstanceNotFoundException) extractException(pe); - } -@@ -1348,7 +1363,9 @@ - public Object run() throws InstanceNotFoundException { - return mbeanServer.getClassLoaderFor(name); - } -- }); -+ }, -+ withPermissions(new MBeanPermission("*", "getClassLoaderFor")) -+ ); - } catch (PrivilegedActionException pe) { - throw (InstanceNotFoundException) extractException(pe); - }
--- a/patches/security/20121016/7172522.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1340096399 -3600 -# Node ID 88243aa6e67b6b84ff529ccdfd3b476410f60057 -# Parent 39b599e90c7b33435ca42ae96ed673812a8be3d7 -7172522: Improve DomainCombiner checking -Reviewed-by: mullan - -diff --git a/src/share/classes/java/security/AccessController.java b/src/share/classes/java/security/AccessController.java ---- openjdk/jdk/src/share/classes/java/security/AccessController.java -+++ openjdk/jdk/src/share/classes/java/security/AccessController.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -293,7 +293,7 @@ - DomainCombiner dc = null; - AccessControlContext acc = getStackAccessControlContext(); - if (acc == null || (dc = acc.getAssignedCombiner()) == null) { -- return AccessController.doPrivileged(action); -+ return AccessController.doPrivileged(action, acc); - } - return AccessController.doPrivileged(action, preserveCombiner(dc)); - } -@@ -389,7 +389,7 @@ - DomainCombiner dc = null; - AccessControlContext acc = getStackAccessControlContext(); - if (acc == null || (dc = acc.getAssignedCombiner()) == null) { -- return AccessController.doPrivileged(action); -+ return AccessController.doPrivileged(action, acc); - } - return AccessController.doPrivileged(action, preserveCombiner(dc)); - }
--- a/patches/security/20121016/7176337.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1340145914 25200 -# Node ID a148157cd348fe4c251063db7d3973a83cfcf483 -# Parent fde4cc8479824449b03abedd5357500aec92e990 -7176337: Additional changes needed for 7158801 fix -Reviewed-by: kvn - -diff --git a/src/share/vm/compiler/compilerOracle.cpp b/src/share/vm/compiler/compilerOracle.cpp ---- openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp -+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp -@@ -573,7 +573,7 @@ - char token[1024]; - int pos = 0; - int c = getc(stream); -- while(c != EOF && pos < (sizeof(token)-1)) { -+ while(c != EOF && pos < (int)(sizeof(token)-1)) { - if (c == '\n') { - token[pos++] = '\0'; - parse_from_line(token); -@@ -594,7 +594,7 @@ - int pos = 0; - const char* sp = str; - int c = *sp++; -- while (c != '\0' && pos < (sizeof(token)-1)) { -+ while (c != '\0' && pos < (int)(sizeof(token)-1)) { - if (c == '\n') { - token[pos++] = '\0'; - parse_line(token);
--- a/patches/security/20121016/7186286.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,552 +0,0 @@ -# HG changeset patch -# User xuelei -# Date 1343546404 25200 -# Node ID a6294da5a21f609b67a0d4d216028dda9f56e689 -# Parent 88243aa6e67b6b84ff529ccdfd3b476410f60057 -7186286: TLS implementation to better adhere to RFC -Summary: also reviewed by Alexander Fomin <Alexander.Fomin@Oracle.COM>, Andrew Gross<Andrew.Gross@Oracle.COM>, Sean Coffey<Sean.Coffey@Oracle.COM> -Reviewed-by: valeriep, wetmore - -diff --git a/src/share/classes/sun/security/pkcs11/P11Cipher.java b/src/share/classes/sun/security/pkcs11/P11Cipher.java ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -650,7 +650,7 @@ - // see JCE spec - protected int engineGetKeySize(Key key) throws InvalidKeyException { - int n = P11SecretKeyFactory.convertKey -- (token, key, keyAlgorithm).keyLength(); -+ (token, key, keyAlgorithm).length(); - return n; - } - } -diff --git a/src/share/classes/sun/security/pkcs11/P11Key.java b/src/share/classes/sun/security/pkcs11/P11Key.java ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Key.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Key.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -46,6 +46,7 @@ - import static sun.security.pkcs11.wrapper.PKCS11Constants.*; - - import sun.security.util.DerValue; -+import sun.security.util.Length; - - /** - * Key implementation classes. -@@ -61,7 +62,7 @@ - * @author Andreas Sterbenz - * @since 1.5 - */ --abstract class P11Key implements Key { -+abstract class P11Key implements Key, Length { - - private final static String PUBLIC = "public"; - private final static String PRIVATE = "private"; -@@ -212,7 +213,11 @@ - return s1; - } - -- int keyLength() { -+ /** -+ * Return bit length of the key. -+ */ -+ @Override -+ public int length() { - return keyLength; - } - -diff --git a/src/share/classes/sun/security/pkcs11/P11RSACipher.java b/src/share/classes/sun/security/pkcs11/P11RSACipher.java ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -201,7 +201,7 @@ - } else { - throw new InvalidKeyException("Unknown key type: " + p11Key); - } -- int n = (p11Key.keyLength() + 7) >> 3; -+ int n = (p11Key.length() + 7) >> 3; - outputSize = n; - buffer = new byte[n]; - maxInputSize = encrypt ? (n - PKCS1_MIN_PADDING_LENGTH) : n; -@@ -458,7 +458,7 @@ - - // see JCE spec - protected int engineGetKeySize(Key key) throws InvalidKeyException { -- int n = P11KeyFactory.convertKey(token, key, algorithm).keyLength(); -+ int n = P11KeyFactory.convertKey(token, key, algorithm).length(); - return n; - } - } -diff --git a/src/share/classes/sun/security/pkcs11/P11Signature.java b/src/share/classes/sun/security/pkcs11/P11Signature.java ---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -274,7 +274,7 @@ - if (keyAlgorithm.equals("DSA")) { - signature = new byte[40]; - } else { -- signature = new byte[(p11Key.keyLength() + 7) >> 3]; -+ signature = new byte[(p11Key.length() + 7) >> 3]; - } - if (type == T_UPDATE) { - token.p11.C_VerifyFinal(session.id(), signature); -@@ -359,7 +359,7 @@ - if (keyAlgorithm.equals("RSA") && publicKey != p11Key) { - int keyLen; - if (publicKey instanceof P11Key) { -- keyLen = ((P11Key) publicKey).keyLength(); -+ keyLen = ((P11Key) publicKey).length(); - } else { - keyLen = ((RSAKey) publicKey).getModulus().bitLength(); - } -@@ -620,7 +620,7 @@ - - private byte[] pkcs1Pad(byte[] data) { - try { -- int len = (p11Key.keyLength() + 7) >> 3; -+ int len = (p11Key.length() + 7) >> 3; - RSAPadding padding = RSAPadding.getInstance - (RSAPadding.PAD_BLOCKTYPE_1, len); - byte[] padded = padding.pad(data); -diff --git a/src/share/classes/sun/security/ssl/HandshakeInStream.java b/src/share/classes/sun/security/ssl/HandshakeInStream.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -190,6 +190,7 @@ - - byte[] getBytes8() throws IOException { - int len = getInt8(); -+ verifyLength(len); - byte b[] = new byte[len]; - - read(b, 0, len); -@@ -198,6 +199,7 @@ - - byte[] getBytes16() throws IOException { - int len = getInt16(); -+ verifyLength(len); - byte b[] = new byte[len]; - - read(b, 0, len); -@@ -206,10 +208,19 @@ - - byte[] getBytes24() throws IOException { - int len = getInt24(); -+ verifyLength(len); - byte b[] = new byte[len]; - - read(b, 0, len); - return b; - } - -+ // Is a length greater than available bytes in the record? -+ private void verifyLength(int len) throws SSLException { -+ if (len > available()) { -+ throw new SSLException( -+ "Not enough data to fill declared vector size"); -+ } -+ } -+ - } -diff --git a/src/share/classes/sun/security/ssl/Handshaker.java b/src/share/classes/sun/security/ssl/Handshaker.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/Handshaker.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/Handshaker.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -776,9 +776,9 @@ - if (debug != null && Debug.isOn("handshake")) { - System.out.println("RSA master secret generation error:"); - e.printStackTrace(System.out); -- System.out.println("Generating new random premaster secret"); - } -- preMasterSecret = RSAClientKeyExchange.generateDummySecret(protocolVersion); -+ preMasterSecret = -+ RSAClientKeyExchange.generateDummySecret(protocolVersion); - // recursive call with new premaster secret - return calculateMasterSecret(preMasterSecret, null); - } -@@ -821,9 +821,9 @@ - System.out.println("RSA PreMasterSecret version error: expected" - + protocolVersion + " or " + requestedVersion + ", decrypted: " - + premasterVersion); -- System.out.println("Generating new random premaster secret"); - } -- preMasterSecret = RSAClientKeyExchange.generateDummySecret(protocolVersion); -+ preMasterSecret = -+ RSAClientKeyExchange.generateDummySecret(protocolVersion); - // recursive call with new premaster secret - return calculateMasterSecret(preMasterSecret, null); - } -diff --git a/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -36,6 +36,7 @@ - import javax.net.ssl.*; - - import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec; -+import sun.security.util.KeyLength; - - /** - * This is the client key exchange message (CLIENT --> SERVER) used with -@@ -85,7 +86,8 @@ - * it, using its RSA private key. Result is the same size as the - * server's public key, and uses PKCS #1 block format 02. - */ -- RSAClientKeyExchange(ProtocolVersion protocolVersion, ProtocolVersion maxVersion, -+ RSAClientKeyExchange(ProtocolVersion protocolVersion, -+ ProtocolVersion maxVersion, - SecureRandom generator, PublicKey publicKey) throws IOException { - if (publicKey.getAlgorithm().equals("RSA") == false) { - throw new SSLKeyException("Public key not of type RSA"); -@@ -120,7 +122,8 @@ - * Server gets the PKCS #1 (block format 02) data, decrypts - * it with its private key. - */ -- RSAClientKeyExchange(ProtocolVersion currentVersion, HandshakeInStream input, -+ RSAClientKeyExchange(ProtocolVersion currentVersion, -+ ProtocolVersion maxVersion, HandshakeInStream input, - int messageSize, PrivateKey privateKey) throws IOException { - - if (privateKey.getAlgorithm().equals("RSA") == false) { -@@ -143,28 +146,119 @@ - cipher.init(Cipher.UNWRAP_MODE, privateKey); - preMaster = (SecretKey)cipher.unwrap(encrypted, - "TlsRsaPremasterSecret", Cipher.SECRET_KEY); -+ -+ // polish the premaster secret -+ preMaster = polishPreMasterSecretKey( -+ currentVersion, maxVersion, preMaster, null); - } catch (Exception e) { -- /* -- * Bogus decrypted ClientKeyExchange? If so, conjure a -- * a random preMaster secret that will fail later during -- * Finished message processing. This is a countermeasure against -- * the "interactive RSA PKCS#1 encryption envelop attack" reported -- * in June 1998. Preserving the executation path will -- * mitigate timing attacks and force consistent error handling -- * that will prevent an attacking client from differentiating -- * different kinds of decrypted ClientKeyExchange bogosities. -- */ -- if (debug != null && Debug.isOn("handshake")) { -- System.out.println("Error decrypting premaster secret:"); -- e.printStackTrace(System.out); -- System.out.println("Generating random secret"); -+ // polish the premaster secret -+ preMaster = polishPreMasterSecretKey( -+ currentVersion, maxVersion, preMaster, e); -+ } -+ } -+ -+ /** -+ * To avoid vulnerabilities described by section 7.4.7.1, RFC 5246, -+ * treating incorrectly formatted message blocks and/or mismatched -+ * version numbers in a manner indistinguishable from correctly -+ * formatted RSA blocks. -+ * -+ * RFC 5246 describes the approach as : -+ * -+ * 1. Generate a string R of 46 random bytes -+ * -+ * 2. Decrypt the message to recover the plaintext M -+ * -+ * 3. If the PKCS#1 padding is not correct, or the length of message -+ * M is not exactly 48 bytes: -+ * pre_master_secret = ClientHello.client_version || R -+ * else If ClientHello.client_version <= TLS 1.0, and version -+ * number check is explicitly disabled: -+ * pre_master_secret = M -+ * else: -+ * pre_master_secret = ClientHello.client_version || M[2..47] -+ * -+ * Note that although TLS 1.2 is not supported in this release, we still -+ * want to make use of the above approach to provide better protection. -+ */ -+ private SecretKey polishPreMasterSecretKey( -+ ProtocolVersion currentVersion, ProtocolVersion clientHelloVersion, -+ SecretKey secretKey, Exception failoverException) { -+ -+ if (failoverException == null && secretKey != null) { -+ // check the length -+ byte[] encoded = secretKey.getEncoded(); -+ if (encoded == null) { // unable to get the encoded key -+ if (debug != null && Debug.isOn("handshake")) { -+ System.out.println( -+ "unable to get the plaintext of the premaster secret"); -+ } -+ -+ int keySize = KeyLength.getKeySize(secretKey); -+ if (keySize > 0 && keySize != 384) { // 384 = 48 * 8 -+ if (debug != null && Debug.isOn("handshake")) { -+ System.out.println( -+ "incorrect length of premaster secret: " + -+ (keySize/8)); -+ } -+ -+ return generateDummySecret(currentVersion); -+ } -+ -+ // The key size is exactly 48 bytes or not accessible. -+ // -+ // Conservatively, pass the checking to master secret -+ // calculation. -+ return secretKey; -+ } else if (encoded.length == 48) { -+ // check the version -+ if (clientHelloVersion.major == encoded[0] && -+ clientHelloVersion.minor == encoded[1]) { -+ -+ return secretKey; -+ } else if (clientHelloVersion.v <= ProtocolVersion.TLS10.v && -+ currentVersion.major == encoded[0] && -+ currentVersion.minor == encoded[1]) { -+ /* -+ * For compatibility, we maintain the behavior that the -+ * version in pre_master_secret can be the negotiated -+ * version for TLS v1.0 and SSL v3.0. -+ */ -+ return secretKey; -+ } -+ -+ if (debug != null && Debug.isOn("handshake")) { -+ System.out.println("Mismatching Protocol Versions, " + -+ "ClientHello.client_version is " + clientHelloVersion + -+ ", while PreMasterSecret.client_version is " + -+ ProtocolVersion.valueOf(encoded[0], encoded[1])); -+ } -+ return generateDummySecret(currentVersion); -+ } else { -+ if (debug != null && Debug.isOn("handshake")) { -+ System.out.println( -+ "incorrect length of premaster secret: " + -+ encoded.length); -+ } -+ return generateDummySecret(currentVersion); - } -- preMaster = generateDummySecret(currentVersion); - } -+ -+ if (debug != null && Debug.isOn("handshake") && -+ failoverException != null) { -+ System.out.println("Error decrypting premaster secret:"); -+ failoverException.printStackTrace(System.out); -+ } -+ -+ return generateDummySecret(currentVersion); - } - - // generate a premaster secret with the specified version number - static SecretKey generateDummySecret(ProtocolVersion version) { -+ if (debug != null && Debug.isOn("handshake")) { -+ System.out.println("Generating a random fake premaster secret"); -+ } -+ - try { - KeyGenerator kg = - JsseJce.getKeyGenerator("SunTlsRsaPremasterSecret"); -diff --git a/src/share/classes/sun/security/ssl/ServerHandshaker.java b/src/share/classes/sun/security/ssl/ServerHandshaker.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -190,8 +190,9 @@ - * temporary one used for non-export or signing-only - * certificates/keys. - */ -- RSAClientKeyExchange pms = new RSAClientKeyExchange -- (protocolVersion, input, message_len, privateKey); -+ RSAClientKeyExchange pms = new RSAClientKeyExchange( -+ protocolVersion, clientRequestedVersion, -+ input, message_len, privateKey); - preMasterSecret = this.clientKeyExchange(pms); - break; - case K_KRB5: -diff --git a/src/share/classes/sun/security/util/KeyLength.java b/src/share/classes/sun/security/util/KeyLength.java -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/src/share/classes/sun/security/util/KeyLength.java -@@ -0,0 +1,91 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package sun.security.util; -+ -+import java.security.Key; -+import java.security.PrivilegedAction; -+import java.security.AccessController; -+import java.security.interfaces.ECKey; -+import java.security.interfaces.RSAKey; -+import java.security.interfaces.DSAKey; -+import javax.crypto.SecretKey; -+import javax.crypto.interfaces.DHKey; -+ -+/** -+ * A utility class to get key length -+ */ -+public final class KeyLength { -+ -+ /** -+ * Returns the key size of the given key object in bits. -+ * -+ * @param key the key object, cannot be null -+ * @return the key size of the given key object in bits, or -1 if the -+ * key size is not accessible -+ */ -+ final public static int getKeySize(Key key) { -+ int size = -1; -+ -+ if (key instanceof Length) { -+ try { -+ Length ruler = (Length)key; -+ size = ruler.length(); -+ } catch (UnsupportedOperationException usoe) { -+ // ignore the exception -+ } -+ -+ if (size >= 0) { -+ return size; -+ } -+ } -+ -+ // try to parse the length from key specification -+ if (key instanceof SecretKey) { -+ SecretKey sk = (SecretKey)key; -+ String format = sk.getFormat(); -+ if ("RAW".equals(format) && sk.getEncoded() != null) { -+ size = (sk.getEncoded().length * 8); -+ } // Otherwise, it may be a unextractable key of PKCS#11, or -+ // a key we are not able to handle. -+ } else if (key instanceof RSAKey) { -+ RSAKey pubk = (RSAKey)key; -+ size = pubk.getModulus().bitLength(); -+ } else if (key instanceof ECKey) { -+ ECKey pubk = (ECKey)key; -+ size = pubk.getParams().getOrder().bitLength(); -+ } else if (key instanceof DSAKey) { -+ DSAKey pubk = (DSAKey)key; -+ size = pubk.getParams().getP().bitLength(); -+ } else if (key instanceof DHKey) { -+ DHKey pubk = (DHKey)key; -+ size = pubk.getParams().getP().bitLength(); -+ } // Otherwise, it may be a unextractable key of PKCS#11, or -+ // a key we are not able to handle. -+ -+ return size; -+ } -+} -+ -diff --git a/src/share/classes/sun/security/util/Length.java b/src/share/classes/sun/security/util/Length.java -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/src/share/classes/sun/security/util/Length.java -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package sun.security.util; -+ -+/** -+ * The Length interface defines the length of an object -+ */ -+public interface Length { -+ -+ /** -+ * Gets the length of this object -+ * <p> -+ * Note that if a class of java.security.Key implements this interfaces, -+ * the length should be measured in bits. -+ * -+ * @return the length of this object -+ * @throws UnsupportedOperationException if the operation is not supported -+ */ -+ public int length(); -+}
--- a/patches/security/20121016/7189103.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1345121690 -3600 -# Node ID b6a7a661db8a2141ebb2e79ba5739722d1be7bfd -# Parent a6294da5a21f609b67a0d4d216028dda9f56e689 -7189103: Executors needs to maintain state -Reviewed-by: chegar - -diff --git a/src/share/classes/java/util/concurrent/Executors.java b/src/share/classes/java/util/concurrent/Executors.java ---- openjdk/jdk/src/share/classes/java/util/concurrent/Executors.java -+++ openjdk/jdk/src/share/classes/java/util/concurrent/Executors.java -@@ -530,18 +530,17 @@ - return AccessController.doPrivileged( - new PrivilegedExceptionAction<T>() { - public T run() throws Exception { -- ClassLoader savedcl = null; - Thread t = Thread.currentThread(); -- try { -- ClassLoader cl = t.getContextClassLoader(); -- if (ccl != cl) { -- t.setContextClassLoader(ccl); -- savedcl = cl; -+ ClassLoader cl = t.getContextClassLoader(); -+ if (ccl == cl) { -+ return task.call(); -+ } else { -+ t.setContextClassLoader(ccl); -+ try { -+ return task.call(); -+ } finally { -+ t.setContextClassLoader(cl); - } -- return task.call(); -- } finally { -- if (savedcl != null) -- t.setContextClassLoader(savedcl); - } - } - }, acc);
--- a/patches/security/20121016/7189490.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1345121553 -3600 -# Node ID 7fe230af5036c83eb337b3560821b97c6dec08c9 -# Parent b6a7a661db8a2141ebb2e79ba5739722d1be7bfd -7189490: More improvements to DomainCombiner checking -Reviewed-by: mullan - -diff --git a/src/share/classes/java/security/AccessController.java b/src/share/classes/java/security/AccessController.java ---- openjdk/jdk/src/share/classes/java/security/AccessController.java -+++ openjdk/jdk/src/share/classes/java/security/AccessController.java -@@ -290,11 +290,11 @@ - */ - public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) { - -- DomainCombiner dc = null; - AccessControlContext acc = getStackAccessControlContext(); -- if (acc == null || (dc = acc.getAssignedCombiner()) == null) { -- return AccessController.doPrivileged(action, acc); -+ if (acc == null) { -+ return AccessController.doPrivileged(action); - } -+ DomainCombiner dc = acc.getAssignedCombiner(); - return AccessController.doPrivileged(action, preserveCombiner(dc)); - } - -@@ -386,11 +386,11 @@ - public static <T> T doPrivilegedWithCombiner - (PrivilegedExceptionAction<T> action) throws PrivilegedActionException { - -- DomainCombiner dc = null; - AccessControlContext acc = getStackAccessControlContext(); -- if (acc == null || (dc = acc.getAssignedCombiner()) == null) { -- return AccessController.doPrivileged(action, acc); -+ if (acc == null) { -+ return AccessController.doPrivileged(action); - } -+ DomainCombiner dc = acc.getAssignedCombiner(); - return AccessController.doPrivileged(action, preserveCombiner(dc)); - } - -@@ -417,7 +417,12 @@ - // perform 'combine' on the caller of doPrivileged, - // even if the caller is from the bootclasspath - ProtectionDomain[] pds = new ProtectionDomain[] {callerPd}; -- return new AccessControlContext(combiner.combine(pds, null), combiner); -+ if (combiner == null) { -+ return new AccessControlContext(pds); -+ } else { -+ return new AccessControlContext(combiner.combine(pds, null), -+ combiner); -+ } - } - -
--- a/patches/security/20121016/7189567.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -# HG changeset patch -# User robm -# Date 1347900712 -3600 -# Node ID aa1fa3f96d77541a3bafd767001f3100fe6b8a5a -# Parent 7fe230af5036c83eb337b3560821b97c6dec08c9 -7189567: java net obselete protocol -Reviewed-by: chegar - -diff --git a/src/share/classes/java/net/URL.java b/src/share/classes/java/net/URL.java ---- openjdk/jdk/src/share/classes/java/net/URL.java -+++ openjdk/jdk/src/share/classes/java/net/URL.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -28,6 +28,8 @@ - import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStream; -+import java.security.AccessController; -+import java.security.PrivilegedAction; - import java.util.Hashtable; - import java.util.StringTokenizer; - import sun.security.util.SecurityConstants; -@@ -1110,6 +1112,21 @@ - static Hashtable handlers = new Hashtable(); - private static Object streamHandlerLock = new Object(); - -+ // special case the gopher protocol, disabled by default -+ private static final String GOPHER = "gopher"; -+ private static final String ENABLE_GOPHER_PROP = "jdk.net.registerGopherProtocol"; -+ private static final boolean enableGopher = AccessController.doPrivileged( -+ new PrivilegedAction<Boolean>() { -+ public Boolean run() { -+ String prop = System.getProperty(ENABLE_GOPHER_PROP); -+ return prop == null ? false : -+ (prop.equalsIgnoreCase("false") ? false : true); -+ } -+ }); -+ -+ // package name of the JDK implementation protocol handlers -+ private static final String JDK_PACKAGE_PREFIX = "sun.net.www.protocol"; -+ - /** - * Returns the Stream Handler. - * @param protocol the protocol to use -@@ -1141,7 +1158,7 @@ - - // REMIND: decide whether to allow the "null" class prefix - // or not. -- packagePrefixList += "sun.net.www.protocol"; -+ packagePrefixList += JDK_PACKAGE_PREFIX; - - StringTokenizer packagePrefixIter = - new StringTokenizer(packagePrefixList, "|"); -@@ -1151,6 +1168,15 @@ - - String packagePrefix = - packagePrefixIter.nextToken().trim(); -+ -+ // do not try to instantiate the JDK gopher handler -+ // unless the system property had been explicitly set -+ if (protocol.equalsIgnoreCase(GOPHER) && -+ packagePrefix.equals(JDK_PACKAGE_PREFIX) && -+ !enableGopher) { -+ continue; -+ } -+ - try { - String clsName = packagePrefix + "." + protocol + - ".Handler"; -diff --git a/test/java/net/URL/Test.java b/test/java/net/URL/Test.java ---- openjdk/jdk/test/java/net/URL/Test.java -+++ openjdk/jdk/test/java/net/URL/Test.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -322,10 +322,6 @@ - test("ftp://ftp.is.co.za/rfc/rfc1808.txt") - .s("ftp").h("ftp.is.co.za").p("/rfc/rfc1808.txt").z(); - -- test("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles") -- .s("gopher").h("spinaltap.micro.umn.edu") -- .p("/00/Weather/California/Los%20Angeles").z(); -- - test("http://www.math.uio.no/faq/compression-faq/part1.html") - .s("http").h("www.math.uio.no").p("/faq/compression-faq/part1.html").z(); -
--- a/patches/security/20121016/7192975.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1349309813 25200 -# Node ID d77bc9151c1dea1a4a396fb59d58ba7c8d77fd88 -# Parent aa1fa3f96d77541a3bafd767001f3100fe6b8a5a -7192975: Conditional usage check is wrong -Reviewed-by: dsamersoff -Contributed-by: andreas.eriksson@oracle.com - -diff --git a/src/share/classes/javax/management/modelmbean/DescriptorSupport.java b/src/share/classes/javax/management/modelmbean/DescriptorSupport.java ---- openjdk/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java -+++ openjdk/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -1239,13 +1239,12 @@ - return s.substring(1, s.length() - 1); - } - final String className = s.substring(1, slash); -+ - final Constructor<?> constr; - try { -+ ReflectUtil.checkPackageAccess(className); - final ClassLoader contextClassLoader = - Thread.currentThread().getContextClassLoader(); -- if (contextClassLoader == null) { -- ReflectUtil.checkPackageAccess(className); -- } - final Class<?> c = - Class.forName(className, false, contextClassLoader); - constr = c.getConstructor(new Class[] {String.class});
--- a/patches/security/20121016/7195194.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1349974205 -3600 -# Node ID 6a383aef225ab7bb99b723bbb29786e29747a4f0 -# Parent d77bc9151c1dea1a4a396fb59d58ba7c8d77fd88 -7195194: Better data validation for Swing -Reviewed-by: art, ahgross - -diff --git a/src/share/classes/javax/swing/text/DefaultFormatter.java b/src/share/classes/javax/swing/text/DefaultFormatter.java ---- openjdk/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java -+++ openjdk/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java -@@ -24,6 +24,8 @@ - */ - package javax.swing.text; - -+import sun.reflect.misc.ConstructorUtil; -+ - import java.io.Serializable; - import java.lang.reflect.*; - import java.text.ParseException; -@@ -245,7 +247,7 @@ - Constructor cons; - - try { -- cons = vc.getConstructor(new Class[] { String.class }); -+ cons = ConstructorUtil.getConstructor(vc, new Class[]{String.class}); - - } catch (NoSuchMethodException nsme) { - cons = null;
--- a/patches/security/20121016/7195917.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -# HG changeset patch -# User malenkov -# Date 1348148080 -14400 -# Node ID 074f132d65c91231ca989e4c757207e1cf25a476 -# Parent 6a383aef225ab7bb99b723bbb29786e29747a4f0 -7195917: XMLDecoder parsing at close-time should be improved -Reviewed-by: art, ahgross - -diff --git a/src/share/classes/java/beans/XMLDecoder.java b/src/share/classes/java/beans/XMLDecoder.java ---- openjdk/jdk/src/share/classes/java/beans/XMLDecoder.java -+++ openjdk/jdk/src/share/classes/java/beans/XMLDecoder.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -32,6 +32,10 @@ - import java.lang.ref.Reference; - import java.lang.ref.WeakReference; - -+import java.security.AccessControlContext; -+import java.security.AccessController; -+import java.security.PrivilegedAction; -+ - import org.xml.sax.SAXException; - - import javax.xml.parsers.SAXParserFactory; -@@ -66,6 +70,7 @@ - * @author Philip Milne - */ - public class XMLDecoder { -+ private final AccessControlContext acc = AccessController.getContext(); - private InputStream in; - private Object owner; - private ExceptionListener exceptionListener; -@@ -248,25 +253,33 @@ - */ - private ObjectHandler getHandler() { - if ( handler == null ) { -- SAXParserFactory factory = SAXParserFactory.newInstance(); -- try { -- SAXParser parser = factory.newSAXParser(); -- handler = new ObjectHandler( this, getClassLoader() ); -- parser.parse( in, handler ); -+ if ((this.acc == null) && (null != System.getSecurityManager())) { -+ throw new SecurityException("AccessControlContext is not set"); - } -- catch ( ParserConfigurationException e ) { -- getExceptionListener().exceptionThrown( e ); -- } -- catch ( SAXException se ) { -- Exception e = se.getException(); -- if ( e == null ) { -- e = se; -+ handler = AccessController.doPrivileged(new PrivilegedAction<ObjectHandler>() { -+ public ObjectHandler run() { -+ ObjectHandler handler = new ObjectHandler(XMLDecoder.this, getClassLoader()); -+ SAXParserFactory factory = SAXParserFactory.newInstance(); -+ try { -+ SAXParser parser = factory.newSAXParser(); -+ parser.parse( in, handler ); -+ } -+ catch ( ParserConfigurationException e ) { -+ getExceptionListener().exceptionThrown( e ); -+ } -+ catch ( SAXException se ) { -+ Exception e = se.getException(); -+ if ( e == null ) { -+ e = se; -+ } -+ getExceptionListener().exceptionThrown( e ); -+ } -+ catch ( IOException ioe ) { -+ getExceptionListener().exceptionThrown( ioe ); -+ } -+ return handler; - } -- getExceptionListener().exceptionThrown( e ); -- } -- catch ( IOException ioe ) { -- getExceptionListener().exceptionThrown( ioe ); -- } -+ }, this.acc); - } - return handler; - }
--- a/patches/security/20121016/7195919.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -# HG changeset patch -# User dmeetry -# Date 1347313661 -14400 -# Node ID 5352a40bb0ff7e8a6e826478d7687fff695d9805 -# Parent 074f132d65c91231ca989e4c757207e1cf25a476 -7195919: (sl) ServiceLoader can throw CCE without needing to create instance -Reviewed-by: smarks - -diff --git a/src/share/classes/java/util/ServiceLoader.java b/src/share/classes/java/util/ServiceLoader.java ---- openjdk/jdk/src/share/classes/java/util/ServiceLoader.java -+++ openjdk/jdk/src/share/classes/java/util/ServiceLoader.java -@@ -358,14 +358,21 @@ - } - String cn = nextName; - nextName = null; -+ Class<?> c = null; - try { -- S p = service.cast(Class.forName(cn, true, loader) -- .newInstance()); -- providers.put(cn, p); -- return p; -+ c = Class.forName(cn, false, loader); - } catch (ClassNotFoundException x) { - fail(service, - "Provider " + cn + " not found"); -+ } -+ if (!service.isAssignableFrom(c)) { -+ fail(service, -+ "Provider " + cn + " not a subtype"); -+ } -+ try { -+ S p = service.cast(c.newInstance()); -+ providers.put(cn, p); -+ return p; - } catch (Throwable x) { - fail(service, - "Provider " + cn + " could not be instantiated: " + x, -diff --git a/src/share/classes/sun/misc/Service.java b/src/share/classes/sun/misc/Service.java ---- openjdk/jdk/src/share/classes/sun/misc/Service.java -+++ openjdk/jdk/src/share/classes/sun/misc/Service.java -@@ -284,12 +284,20 @@ - } - String cn = nextName; - nextName = null; -+ Class<?> c = null; - try { -- return Class.forName(cn, true, loader).newInstance(); -+ c = Class.forName(cn, false, loader); - } catch (ClassNotFoundException x) { - fail(service, - "Provider " + cn + " not found"); -- } catch (Exception x) { -+ } -+ if (!service.isAssignableFrom(c)) { -+ fail(service, -+ "Provider " + cn + " not a subtype"); -+ } -+ try { -+ return service.cast(c.newInstance()); -+ } catch (Throwable x) { - fail(service, - "Provider " + cn + " could not be instantiated: " + x, - x);
--- a/patches/security/20121016/7198296.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1349309940 25200 -# Node ID a66bba985c2c46743d6780879278092c0fa5cf2b -# Parent 5352a40bb0ff7e8a6e826478d7687fff695d9805 -7198296: Refactor classloader usage -Reviewed-by: dsamersoff -Contributed-by: andreas.eriksson@oracle.com - -diff --git a/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java ---- openjdk/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java -+++ openjdk/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java -@@ -165,9 +165,17 @@ - withPermissions( new MBeanPermission("*", "getClassLoaderRepository"), - new RuntimePermission("createClassLoader")) - ); -- -- serverCommunicatorAdmin = new -- RMIServerCommunicatorAdmin(EnvHelp.getServerConnectionTimeout(env)); -+ this.defaultContextClassLoader = -+ AccessController.doPrivileged( -+ new PrivilegedAction<ClassLoader>() { -+ @Override -+ public ClassLoader run() { -+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(), -+ dcl); -+ } -+ }); -+ serverCommunicatorAdmin = new -+ RMIServerCommunicatorAdmin(EnvHelp.getServerConnectionTimeout(env)); - - this.env = env; - } -@@ -529,7 +537,7 @@ - "connectionId=" + connectionId - +" unwrapping query with defaultClassLoader."); - -- queryValue = unwrap(query, defaultClassLoader, QueryExp.class); -+ queryValue = unwrap(query, defaultContextClassLoader, QueryExp.class); - - try { - final Object params[] = new Object[] { name, queryValue }; -@@ -563,7 +571,7 @@ - "connectionId=" + connectionId - +" unwrapping query with defaultClassLoader."); - -- queryValue = unwrap(query, defaultClassLoader, QueryExp.class); -+ queryValue = unwrap(query, defaultContextClassLoader, QueryExp.class); - - try { - final Object params[] = new Object[] { name, queryValue }; -@@ -1592,7 +1600,8 @@ - ClassLoader orderCL = AccessController.doPrivileged( - new PrivilegedExceptionAction<ClassLoader>() { - public ClassLoader run() throws Exception { -- return new OrderClassLoaders(cl1, cl2); -+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(), -+ new OrderClassLoaders(cl1, cl2)); - } - } - ); -@@ -1684,6 +1693,8 @@ - - private final ClassLoader defaultClassLoader; - -+ private final ClassLoader defaultContextClassLoader; -+ - private final ClassLoaderWithRepository classLoaderWithRepository; - - private boolean terminated = false; -@@ -1768,4 +1779,43 @@ - - private static final ClassLogger logger = - new ClassLogger("javax.management.remote.rmi", "RMIConnectionImpl"); -+ -+ private static final class CombinedClassLoader extends ClassLoader { -+ -+ private final static class ClassLoaderWrapper extends ClassLoader { -+ ClassLoaderWrapper(ClassLoader cl) { -+ super(cl); -+ } -+ -+ @Override -+ protected Class<?> loadClass(String name, boolean resolve) -+ throws ClassNotFoundException { -+ return super.loadClass(name, resolve); -+ } -+ }; -+ -+ final ClassLoaderWrapper defaultCL; -+ -+ private CombinedClassLoader(ClassLoader parent, ClassLoader defaultCL) { -+ super(parent); -+ this.defaultCL = new ClassLoaderWrapper(defaultCL); -+ } -+ -+ @Override -+ protected Class<?> loadClass(String name, boolean resolve) -+ throws ClassNotFoundException { -+ try { -+ super.loadClass(name, resolve); -+ } catch(Exception e) { -+ for(Throwable t = e; t != null; t = t.getCause()) { -+ if(t instanceof SecurityException) { -+ throw t==e?(SecurityException)t:new SecurityException(t.getMessage(), e); -+ } -+ } -+ } -+ final Class<?> cl = defaultCL.loadClass(name, resolve); -+ return cl; -+ } -+ -+ } - }
--- a/patches/security/20121016/7198606.patch Tue Oct 30 20:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1349974451 -3600 -# Node ID 8319efc7c840d099832e06db7a50dcfb95bfd4aa -# Parent a148157cd348fe4c251063db7d3973a83cfcf483 -7198606: Improve VM optimization -Reviewed-by: roland, twisti - -diff --git a/src/share/vm/opto/loopTransform.cpp b/src/share/vm/opto/loopTransform.cpp ---- openjdk/hotspot/src/share/vm/opto/loopTransform.cpp -+++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp -@@ -2721,6 +2721,8 @@ - result_mem = new (C, 1) ProjNode(call,TypeFunc::Memory); - _igvn.register_new_node_with_optimizer(result_mem); - -+/* Disable following optimization until proper fix (add missing checks). -+ - // If this fill is tightly coupled to an allocation and overwrites - // the whole body, allow it to take over the zeroing. - AllocateNode* alloc = AllocateNode::Ideal_allocation(base, this); -@@ -2744,6 +2746,7 @@ - #endif - } - } -+*/ - - // Redirect the old control and memory edges that are outside the loop. - Node* exit = head->loopexit()->proj_out(0);