/hg/icedtea6-hg: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Aug 5 04:15:13 PDT 2013


changeset 868201fa37c4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=868201fa37c4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 05 11:47:08 2013 +0100

	Sync hs23 with icedtea-2.3.12 tag.

	2013-08-02  Andrew John Hughes  <gnu.andrew at redhat.com>

		* hotspot.map: Bring in hs23 changes to ARM32
		port, syncing with 2.3.12 tag.


changeset c56469bd12cb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c56469bd12cb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Aug 05 12:14:35 2013 +0100

	Merge


diffstat:

 ChangeLog                                                                        |     211 +
 Makefile.am                                                                      |     141 +-
 hotspot.map                                                                      |       2 +-
 patches/copy_memory.patch                                                        |      36 -
 patches/ecj/jcp-importsources.patch                                              |      10 -
 patches/ecj/override.patch                                                       |      51 +
 patches/hotspot/original/7197906-handle_32_bit_shifts.patch                      |      33 -
 patches/hotspot/original/fix_get_stack_bounds_leak.patch                         |      12 -
 patches/openjdk/5102804-memory_leak.patch                                        |     429 -
 patches/openjdk/6469266-xmlsec_1.4.2.patch                                       |   23876 -
 patches/openjdk/6501644-icu_sync.patch                                           |    8066 -
 patches/openjdk/6669869-queries_per_appcontext.patch                             |     355 -
 patches/openjdk/6886358-layout_update.patch                                      |   13847 -
 patches/openjdk/6888167-medialib_memory_leaks.patch                              |     134 -
 patches/openjdk/6963811-deadlock_fix.patch                                       |      42 -
 patches/openjdk/7017324-kerning_crash.patch                                      |     101 -
 patches/openjdk/7036559-concurrenthashmap_improvements.patch                     |    1436 -
 patches/openjdk/7064279-fixup.patch                                              |      71 -
 patches/openjdk/7064279-resource_release.patch                                   |     436 -
 patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch   |     298 -
 patches/openjdk/7195301-no_instanceof_node.patch                                 |      86 -
 patches/openjdk/8004302-soap_test_failure.patch                                  |      75 -
 patches/openjdk/8004341-jck_dialog_failure.patch                                 |      26 -
 patches/openjdk/8005615-failure_to_load_logger_implementation.patch              |     542 -
 patches/openjdk/8007393.patch                                                    |      78 -
 patches/openjdk/8007611.patch                                                    |      24 -
 patches/openjdk/8009641-8007675_build_fix.patch                                  |      49 -
 patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch                              |  449213 -------
 patches/openjdk/jaxp144_05.patch                                                 |  595589 ----------
 patches/security/20130201/6563318.patch                                          |      36 -
 patches/security/20130201/6664509.patch                                          |    1322 -
 patches/security/20130201/6776941.patch                                          |     272 -
 patches/security/20130201/7141694.patch                                          |      87 -
 patches/security/20130201/7173145.patch                                          |      22 -
 patches/security/20130201/7186945.patch                                          |   10819 -
 patches/security/20130201/7186948.patch                                          |      20 -
 patches/security/20130201/7186952.patch                                          |     127 -
 patches/security/20130201/7186954.patch                                          |      81 -
 patches/security/20130201/7192392.patch                                          |     695 -
 patches/security/20130201/7192393.patch                                          |      60 -
 patches/security/20130201/7192977.patch                                          |     444 -
 patches/security/20130201/7197546.patch                                          |     479 -
 patches/security/20130201/7200491.patch                                          |      49 -
 patches/security/20130201/7200500.patch                                          |      60 -
 patches/security/20130201/7201064.patch                                          |     125 -
 patches/security/20130201/7201066.patch                                          |      66 -
 patches/security/20130201/7201068.patch                                          |      83 -
 patches/security/20130201/7201070.patch                                          |      31 -
 patches/security/20130201/7201071.patch                                          |     553 -
 patches/security/20130201/8000210.patch                                          |     104 -
 patches/security/20130201/8000537.patch                                          |     334 -
 patches/security/20130201/8000540.patch                                          |     187 -
 patches/security/20130201/8000631.patch                                          |    3964 -
 patches/security/20130201/8001242.patch                                          |      61 -
 patches/security/20130201/8001307.patch                                          |      27 -
 patches/security/20130201/8001972.patch                                          |     438 -
 patches/security/20130201/8002325.patch                                          |      59 -
 patches/security/20130219/8006446.patch                                          |     395 -
 patches/security/20130219/8006777.patch                                          |    1036 -
 patches/security/20130219/8007688.patch                                          |     130 -
 patches/security/20130304/8007014.patch                                          |     477 -
 patches/security/20130304/8007675.patch                                          |     416 -
 patches/security/20130416/6657673-factory_finder.patch                           |      54 -
 patches/security/20130416/6657673-fixup.patch                                    |     229 -
 patches/security/20130416/6657673.patch                                          |    9494 -
 patches/security/20130416/7200507.patch                                          |     230 -
 patches/security/20130416/8000724.patch                                          |    1368 -
 patches/security/20130416/8001031.patch                                          |    5457 -
 patches/security/20130416/8001040.patch                                          |     113 -
 patches/security/20130416/8001322.patch                                          |      61 -
 patches/security/20130416/8001329.patch                                          |      32 -
 patches/security/20130416/8003335.patch                                          |      63 -
 patches/security/20130416/8003445.patch                                          |      77 -
 patches/security/20130416/8003543.patch                                          |     236 -
 patches/security/20130416/8004261.patch                                          |     142 -
 patches/security/20130416/8004336.patch                                          |      29 -
 patches/security/20130416/8004986.patch                                          |     374 -
 patches/security/20130416/8005432.patch                                          |     518 -
 patches/security/20130416/8005943.patch                                          |     202 -
 patches/security/20130416/8006309.patch                                          |      22 -
 patches/security/20130416/8006435.patch                                          |      76 -
 patches/security/20130416/8006790.patch                                          |     166 -
 patches/security/20130416/8006795.patch                                          |      35 -
 patches/security/20130416/8007406.patch                                          |      31 -
 patches/security/20130416/8007617.patch                                          |     376 -
 patches/security/20130416/8007667.patch                                          |     579 -
 patches/security/20130416/8007918.patch                                          |     357 -
 patches/security/20130416/8009063.patch                                          |      67 -
 patches/security/20130416/8009305.patch                                          |      68 -
 patches/security/20130416/8009699.patch                                          |      25 -
 patches/security/20130416/8009814.patch                                          |      27 -
 patches/security/20130416/8009857.patch                                          |      66 -
 patches/security/20130618/6741606-apache_santuario.patch                         |    8110 -
 patches/security/20130618/7170730-windows_network_stack.patch                    |    1057 -
 patches/security/20130618/8000638-improve_deserialization.patch                  |      26 -
 patches/security/20130618/8001032-restrict_object_access-jdk.patch               |      21 -
 patches/security/20130618/8001033-refactor_address_handling.patch                |     119 -
 patches/security/20130618/8001034-memory_management.patch                        |      78 -
 patches/security/20130618/8001038-resourcefully_handle_resources.patch           |     236 -
 patches/security/20130618/8001043-clarify_definition_restrictions.patch          |      92 -
 patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch |      36 -
 patches/security/20130618/8001318-6_fixup.patch                                  |     114 -
 patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch       |     470 -
 patches/security/20130618/8001330-improve_checking_order.patch                   |      97 -
 patches/security/20130618/8003703-update_rmi_connection_dialog.patch             |     131 -
 patches/security/20130618/8004584-augment_applet_contextualization.patch         |     322 -
 patches/security/20130618/8005007-better_glyph_processing.patch                  |     118 -
 patches/security/20130618/8006328-6_fixup.patch                                  |      31 -
 patches/security/20130618/8006328-sound_class_robustness.patch                   |    6937 -
 patches/security/20130618/8006611-improve_scripting.patch                        |      78 -
 patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch      |     108 -
 patches/security/20130618/8007471-6_fixup.patch                                  |      25 -
 patches/security/20130618/8007471-improve_mbean_notifications.patch              |      89 -
 patches/security/20130618/8007812-getenclosingmethod.patch                       |      89 -
 patches/security/20130618/8008120-improve_jmx_class_checking.patch               |     332 -
 patches/security/20130618/8008124-better_compliance_testing.patch                |      20 -
 patches/security/20130618/8008128-better_jmx_api_coherence.patch                 |     110 -
 patches/security/20130618/8008132-better_serialization.patch                     |     121 -
 patches/security/20130618/8008585-jmx_data_handling.patch                        |      69 -
 patches/security/20130618/8008593-better_urlclassloader.patch                    |     270 -
 patches/security/20130618/8008603-jmx_provider_provision.patch                   |      29 -
 patches/security/20130618/8008611-6_fixup.patch                                  |      20 -
 patches/security/20130618/8008611-jmx_annotations.patch                          |      32 -
 patches/security/20130618/8008615-jmx_internal_api_robustness.patch              |      70 -
 patches/security/20130618/8008623-mbeanserver_handling.patch                     |     121 -
 patches/security/20130618/8008744-6741606_rework.patch                           |     882 -
 patches/security/20130618/8008982-jmx_interface_changes.patch                    |     168 -
 patches/security/20130618/8009004-rmi_connection_improvement.patch               |      54 -
 patches/security/20130618/8009013-t2k_glyphs.patch                               |      39 -
 patches/security/20130618/8009034-jmx_notification_improvement.patch             |      30 -
 patches/security/20130618/8009038-jmx_notification_support_improvement.patch     |      89 -
 patches/security/20130618/8009067-improve_key_storing.patch                      |      20 -
 patches/security/20130618/8009235-improve_tsa_data_handling.patch                |      80 -
 patches/security/20130618/8011243-improve_imaginglib.patch                       |     618 -
 patches/security/20130618/8011248-better_component_rasters.patch                 |      51 -
 patches/security/20130618/8011253-better_short_component_rasters.patch           |     140 -
 patches/security/20130618/8011257-better_byte_component_rasters.patch            |     157 -
 patches/security/20130618/8011557-improve_reflection.patch                       |     132 -
 patches/security/20130618/8012421-better_positioning.patch                       |     100 -
 patches/security/20130618/8012438-better_image_validation.patch                  |     283 -
 patches/security/20130618/8012597-better_image_channel_validation.patch          |     597 -
 patches/security/20130618/8012601-better_layout_validation.patch                 |     125 -
 patches/security/20130618/8014281-better_xml_signature_checking.patch            |      49 -
 patches/security/20130618/diamond_fix.patch                                      |      55 -
 patches/security/20130618/javac_issue.patch                                      |      60 -
 145 files changed, 265 insertions(+), 1161944 deletions(-)

diffs (truncated from 1162878 to 500 lines):

diff -r df51aa5a4270 -r c56469bd12cb ChangeLog
--- a/ChangeLog	Tue Jul 23 00:18:28 2013 +0100
+++ b/ChangeLog	Mon Aug 05 12:14:35 2013 +0100
@@ -1,3 +1,119 @@
+2013-08-02  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* hotspot.map: Bring in hs23 changes to ARM32
+	port, syncing with 2.3.12 tag.
+
+2013-08-02  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/6469266-xmlsec_1.4.2.patch,
+	* patches/openjdk/6888167-medialib_memory_leaks.patch,
+	* patches/openjdk/7195301-no_instanceof_node.patch,
+	* patches/security/20130618/6741606-apache_santuario.patch,
+	* patches/security/20130618/7170730-windows_network_stack.patch,
+	* patches/security/20130618/8000638-improve_deserialization.patch,
+	* patches/security/20130618/8001032-restrict_object_access-jdk.patch,
+	* patches/security/20130618/8001033-refactor_address_handling.patch,
+	* patches/security/20130618/8001034-memory_management.patch,
+	* patches/security/20130618/8001038-resourcefully_handle_resources.patch,
+	* patches/security/20130618/8001043-clarify_definition_restrictions.patch,
+	* patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch,
+	* patches/security/20130618/8001318-6_fixup.patch,
+	* patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
+	* patches/security/20130618/8001330-improve_checking_order.patch,
+	* patches/security/20130618/8003703-update_rmi_connection_dialog.patch,
+	* patches/security/20130618/8004584-augment_applet_contextualization.patch,
+	* patches/security/20130618/8005007-better_glyph_processing.patch,
+	* patches/security/20130618/8006328-6_fixup.patch,
+	* patches/security/20130618/8006328-sound_class_robustness.patch,
+	* patches/security/20130618/8006611-improve_scripting.patch,
+	* patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch,
+	* patches/security/20130618/8007471-6_fixup.patch,
+	* patches/security/20130618/8007471-improve_mbean_notifications.patch,
+	* patches/security/20130618/8007812-getenclosingmethod.patch,
+	* patches/security/20130618/8008120-improve_jmx_class_checking.patch,
+	* patches/security/20130618/8008124-better_compliance_testing.patch,
+	* patches/security/20130618/8008128-better_jmx_api_coherence.patch,
+	* patches/security/20130618/8008132-better_serialization.patch,
+	* patches/security/20130618/8008585-jmx_data_handling.patch,
+	* patches/security/20130618/8008593-better_urlclassloader.patch,
+	* patches/security/20130618/8008603-jmx_provider_provision.patch,
+	* patches/security/20130618/8008611-6_fixup.patch,
+	* patches/security/20130618/8008611-jmx_annotations.patch,
+	* patches/security/20130618/8008615-jmx_internal_api_robustness.patch,
+	* patches/security/20130618/8008623-mbeanserver_handling.patch,
+	* patches/security/20130618/8008744-6741606_rework.patch,
+	* patches/security/20130618/8008982-jmx_interface_changes.patch,
+	* patches/security/20130618/8009004-rmi_connection_improvement.patch,
+	* patches/security/20130618/8009013-t2k_glyphs.patch,
+	* patches/security/20130618/8009034-jmx_notification_improvement.patch,
+	* patches/security/20130618/8009038-jmx_notification_support_improvement.patch,
+	* patches/security/20130618/8009067-improve_key_storing.patch,
+	* patches/security/20130618/8009235-improve_tsa_data_handling.patch,
+	* patches/security/20130618/8011243-improve_imaginglib.patch,
+	* patches/security/20130618/8011248-better_component_rasters.patch,
+	* patches/security/20130618/8011253-better_short_component_rasters.patch,
+	* patches/security/20130618/8011257-better_byte_component_rasters.patch,
+	* patches/security/20130618/8011557-improve_reflection.patch,
+	* patches/security/20130618/8012421-better_positioning.patch,
+	* patches/security/20130618/8012438-better_image_validation.patch,
+	* patches/security/20130618/8012597-better_image_channel_validation.patch,
+	* patches/security/20130618/8012601-better_layout_validation.patch,
+	* patches/security/20130618/8014281-better_xml_signature_checking.patch,
+	* patches/security/20130618/diamond_fix.patch,
+	* patches/security/20130618/javac_issue.patch,
+	* Makefile.am:
+	Remove unused patches.
+	* Makefile.am:
+	(SECURITY_PATCHES): Remove upstreamed security
+	patches.
+
+2013-07-31  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/ecj/jcp-importsources.patch,
+	* patches/openjdk/5102804-memory_leak.patch,
+	* patches/openjdk/6501644-icu_sync.patch,
+	* patches/openjdk/6669869-queries_per_appcontext.patch,
+	* patches/openjdk/6886358-layout_update.patch,
+	* patches/openjdk/6963811-deadlock_fix.patch,
+	* patches/openjdk/7017324-kerning_crash.patch,
+	* patches/openjdk/7064279-fixup.patch,
+	* patches/openjdk/7064279-resource_release.patch,
+	* patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch,
+	* patches/security/20130416/6657673-factory_finder.patch,
+	* patches/security/20130416/6657673-fixup.patch,
+	* patches/security/20130416/6657673.patch,
+	* patches/security/20130416/7200507.patch,
+	* patches/security/20130416/8000724.patch,
+	* patches/security/20130416/8001031.patch,
+	* patches/security/20130416/8001040.patch,
+	* patches/security/20130416/8001322.patch,
+	* patches/security/20130416/8001329.patch,
+	* patches/security/20130416/8003335.patch,
+	* patches/security/20130416/8003445.patch,
+	* patches/security/20130416/8003543.patch,
+	* patches/security/20130416/8004261.patch,
+	* patches/security/20130416/8004336.patch,
+	* patches/security/20130416/8004986.patch,
+	* patches/security/20130416/8005432.patch,
+	* patches/security/20130416/8005943.patch,
+	* patches/security/20130416/8006309.patch,
+	* patches/security/20130416/8006435.patch,
+	* patches/security/20130416/8006790.patch,
+	* patches/security/20130416/8006795.patch,
+	* patches/security/20130416/8007406.patch,
+	* patches/security/20130416/8007617.patch,
+	* patches/security/20130416/8007667.patch,
+	* patches/security/20130416/8007918.patch,
+	* patches/security/20130416/8009063.patch,
+	* patches/security/20130416/8009305.patch,
+	* patches/security/20130416/8009699.patch,
+	* patches/security/20130416/8009814.patch,
+	* patches/security/20130416/8009857.patch:
+	Remove unused patches.
+	* Makefile.am:
+	(SECURITY_PATCHES): Remove upstreamed security
+	patches.
+
 2013-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* Makefile.am:
@@ -58,6 +174,13 @@
 
 2013-07-11  Andrew John Hughes  <gnu.andrew at redhat.com>
 
+	* patches/openjdk/7036559-concurrenthashmap_improvements.patch:
+	Remove upstreamed patch.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Drop upstreamed patches.
+
+2013-07-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
 	* NEWS:
 	Add 1.11.12 and 1.12.6 release notes.
 
@@ -353,6 +476,15 @@
 	* patches/security/20130618/langtools_merge-03.patch:
 	2013/06/18 security patches.
 
+2013-05-31  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* patches/copy_memory.patch,
+	* patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch:
+	Drop upstreamed patches.
+	* Makefile.am:
+	(DROP_PATCHES): Remove JAXP patch.
+	(ICEDTEA_PATCHES): Remove OpenJDK6-4 patch.
+
 2013-05-28  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
@@ -418,6 +550,18 @@
 	* patches/jtreg-TextLayoutBoundsChecks.patch:
 	Fixed wrong JTreg test name in @run annotation.
 
+2013-05-17  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/hotspot/original/7197906-handle_32_bit_shifts.patch,
+	* patches/hotspot/original/fix_get_stack_bounds_leak.patch,
+	* patches/openjdk/8004302-soap_test_failure.patch,
+	* patches/openjdk/jaxp144_05.patch:
+	Removed as available upstream.
+	* Makefile.am: Remove patches.
+	* patches/security/20130416/6657673.patch,
+	* patches/security/20130416/8005432.patch:
+	Regenerated against upstream.
+
 2013-05-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* patches/componentOrientationTests.patch:
@@ -435,6 +579,12 @@
 	* Makefile.am:
 	Renamed three patches to be more consistent with other JTreg-related patches.
 
+2013-05-15  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove reference to removed
+	patch patches/openjdk/8009641-8007675_build_fix.patch.
+
 2013-05-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am:
@@ -811,6 +961,62 @@
 	* patches/jvmtiEnv.patch: Moved to...
 	* patches/hotspot/original/jvmtiEnv.patch: here.
 
+2013-03-19  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/8004341-jck_dialog_failure.patch,
+	* patches/openjdk/8005615-failure_to_load_logger_implementation.patch,
+	* patches/openjdk/8007393.patch,
+	* patches/openjdk/8007611.patch,
+	* patches/openjdk/8009641-8007675_build_fix.patch,
+	* patches/security/20130201/6563318.patch,
+	* patches/security/20130201/6664509.patch,
+	* patches/security/20130201/6776941.patch,
+	* patches/security/20130201/7141694.patch,
+	* patches/security/20130201/7173145.patch,
+	* patches/security/20130201/7186945.patch,
+	* patches/security/20130201/7186948.patch,
+	* patches/security/20130201/7186952.patch,
+	* patches/security/20130201/7186954.patch,
+	* patches/security/20130201/7192392.patch,
+	* patches/security/20130201/7192393.patch,
+	* patches/security/20130201/7192977.patch,
+	* patches/security/20130201/7197546.patch,
+	* patches/security/20130201/7200491.patch,
+	* patches/security/20130201/7200500.patch,
+	* patches/security/20130201/7201064.patch,
+	* patches/security/20130201/7201066.patch,
+	* patches/security/20130201/7201068.patch,
+	* patches/security/20130201/7201070.patch,
+	* patches/security/20130201/7201071.patch,
+	* patches/security/20130201/8000210.patch,
+	* patches/security/20130201/8000537.patch,
+	* patches/security/20130201/8000540.patch,
+	* patches/security/20130201/8000631.patch,
+	* patches/security/20130201/8001235.patch,
+	* patches/security/20130201/8001242.patch,
+	* patches/security/20130201/8001307.patch,
+	* patches/security/20130201/8001972.patch,
+	* patches/security/20130201/8002325.patch,
+	* patches/security/20130219/8006446.patch,
+	* patches/security/20130219/8006777.patch,
+	* patches/security/20130219/8007688.patch,
+	* patches/security/20130304/8007014.patch,
+	* patches/security/20130304/8007675.patch:
+	Remove patches available upstream.
+	* Makefile.am:
+	(JAXP_DROP_ZIP): Update to jaxp144_05.zip
+	with latest security fix included.
+	(JAXP_DROP_SHA256SUM): Likewise.
+	(SECURITY_PATCHES): Remove ones available
+	upstream (all from 2013/02/01, 2013/02/19
+	and 2013/03/04).
+	(ICEDTEA_PATCHES): Remove patches for
+	8005615, 8004341, 8007393 & 8007611
+	available upstream.
+	* patches/ecj/override.patch:
+	Add new case introduced by upstream version
+	of security patches (sigh...)
+
 2013-03-18  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* Makefile.am:
@@ -1412,6 +1618,11 @@
 
 2012-10-31  Andrew John Hughes  <gnu.andrew at redhat.com>
 
+	* Makefile.am:
+	(OPENJDK_VERSION): Bump to next release, b28.
+
+2012-10-31  Andrew John Hughes  <gnu.andrew at redhat.com>
+
 	* generated/com/sun/corba/se/impl/logging/ActivationSystemException.java,
 	* generated/com/sun/corba/se/impl/logging/IORSystemException.java,
 	* generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java,
diff -r df51aa5a4270 -r c56469bd12cb Makefile.am
--- a/Makefile.am	Tue Jul 23 00:18:28 2013 +0100
+++ b/Makefile.am	Mon Aug 05 12:14:35 2013 +0100
@@ -2,7 +2,7 @@
 
 OPENJDK_DATE = 26_oct_2012
 OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-OPENJDK_VERSION = b27
+OPENJDK_VERSION = b28
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
 CACAO_VERSION = 68fe50ac34ec
@@ -278,144 +278,12 @@
 
 ICEDTEA_FSG_PATCHES =
 
-DROP_PATCHES = \
-	patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \
-	patches/openjdk/jaxp144_05.patch
+DROP_PATCHES =
 
 SECURITY_PATCHES = \
 	patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
-	patches/security/20130201/7201068.patch \
-	patches/security/20130201/6563318.patch \
-	patches/security/20130201/6664509.patch \
-	patches/security/20130201/6776941.patch \
-	patches/security/20130201/7141694.patch \
-	patches/security/20130201/7173145.patch \
-	patches/security/20130201/7186945.patch \
-	patches/security/20130201/7186948.patch \
-	patches/security/20130201/7186952.patch \
-	patches/security/20130201/7186954.patch \
-	patches/security/20130201/7192392.patch \
-	patches/security/20130201/7192393.patch \
-	patches/security/20130201/7192977.patch \
-	patches/security/20130201/7197546.patch \
-	patches/security/20130201/7200491.patch \
-	patches/security/20130201/7200500.patch \
-	patches/security/20130201/7201064.patch \
-	patches/security/20130201/7201066.patch \
-	patches/security/20130201/7201070.patch \
-	patches/security/20130201/7201071.patch \
-	patches/security/20130201/8000210.patch \
-	patches/security/20130201/8000537.patch \
-	patches/security/20130201/8000540.patch \
-	patches/security/20130201/8000631.patch \
-	patches/security/20130201/8001242.patch \
-	patches/security/20130201/8001972.patch \
-	patches/security/20130201/8002325.patch \
-	patches/security/20130219/8006446.patch \
-	patches/security/20130219/8006777.patch \
-	patches/security/20130219/8007688.patch \
-	patches/security/20130304/8007014.patch \
-	patches/security/20130304/8007675.patch \
-	patches/openjdk/8009641-8007675_build_fix.patch \
-	patches/openjdk/7036559-concurrenthashmap_improvements.patch \
-	patches/security/20130416/8009063.patch \
-	patches/openjdk/8004302-soap_test_failure.patch \
-	patches/security/20130416/6657673.patch \
-	patches/security/20130416/6657673-fixup.patch \
-	patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \
-	patches/security/20130416/6657673-factory_finder.patch \
-	patches/openjdk/6669869-queries_per_appcontext.patch \
-	patches/openjdk/5102804-memory_leak.patch \
-	patches/openjdk/6963811-deadlock_fix.patch \
-	patches/openjdk/7064279-resource_release.patch \
-	patches/openjdk/7064279-fixup.patch \
-	patches/security/20130416/7200507.patch \
-	patches/security/20130416/8000724.patch \
-	patches/security/20130416/8004986.patch \
-	patches/openjdk/6501644-icu_sync.patch \
-	patches/openjdk/6886358-layout_update.patch \
-	patches/security/20130416/8001031.patch \
-	patches/openjdk/7017324-kerning_crash.patch \
-	patches/security/20130416/8001040.patch \
-	patches/security/20130416/8001322.patch \
-	patches/security/20130416/8001329.patch \
-	patches/security/20130416/8003335.patch \
-	patches/security/20130416/8003445.patch \
-	patches/security/20130416/8003543.patch \
-	patches/security/20130416/8004261.patch \
-	patches/security/20130416/8005432.patch \
-	patches/security/20130416/8005943.patch \
-	patches/security/20130416/8006435.patch \
-	patches/security/20130416/8006790.patch \
-	patches/security/20130416/8006795.patch \
-	patches/security/20130416/8007406.patch \
-	patches/security/20130416/8007617.patch \
-	patches/security/20130416/8007667.patch \
-	patches/security/20130416/8007918.patch \
-	patches/security/20130416/8009305.patch \
-	patches/security/20130416/8009814.patch \
-	patches/security/20130416/8009857.patch \
-	patches/openjdk/7195301-no_instanceof_node.patch \
-	patches/openjdk/6469266-xmlsec_1.4.2.patch \
-	patches/security/20130618/6741606-apache_santuario.patch \
-	patches/security/20130618/7170730-windows_network_stack.patch \
-	patches/security/20130618/8000638-improve_deserialization.patch \
 	patches/security/20130618/8001032-restrict_object_access-corba.patch \
-	patches/security/20130618/8001032-restrict_object_access-jdk.patch \
-	patches/security/20130618/8001033-refactor_address_handling.patch \
-	patches/security/20130618/8001034-memory_management.patch \
-	patches/security/20130618/8001038-resourcefully_handle_resources.patch \
-	patches/security/20130618/8001043-clarify_definition_restrictions.patch \
-	patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch \
-	patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch \
-	patches/security/20130618/8001318-6_fixup.patch \
-	patches/security/20130618/8001330-improve_checking_order.patch \
-	patches/security/20130618/8003703-update_rmi_connection_dialog.patch \
-	patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
-	patches/openjdk/8007393.patch \
-	patches/openjdk/8007611.patch \
-	patches/security/20130618/8004584-augment_applet_contextualization.patch \
-	patches/security/20130618/8005007-better_glyph_processing.patch \
-	patches/security/20130618/8006328-sound_class_robustness.patch \
-	patches/security/20130618/8006328-6_fixup.patch \
-	patches/security/20130618/8006611-improve_scripting.patch \
-	patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch \
-	patches/security/20130618/8007471-improve_mbean_notifications.patch \
-	patches/security/20130618/8007471-6_fixup.patch \
-	patches/security/20130618/8007812-getenclosingmethod.patch \
-	patches/security/20130618/8008120-improve_jmx_class_checking.patch \
-	patches/security/20130618/8008124-better_compliance_testing.patch \
-	patches/security/20130618/8008128-better_jmx_api_coherence.patch \
-	patches/security/20130618/8008132-better_serialization.patch \
-	patches/security/20130618/8008585-jmx_data_handling.patch \
-	patches/security/20130618/8008593-better_urlclassloader.patch \
-	patches/security/20130618/8008603-jmx_provider_provision.patch \
-	patches/security/20130618/8008611-jmx_annotations.patch \
-	patches/security/20130618/8008611-6_fixup.patch \
-	patches/security/20130618/8008615-jmx_internal_api_robustness.patch \
-	patches/security/20130618/8008623-mbeanserver_handling.patch \
-	patches/security/20130618/8008744-6741606_rework.patch \
-	patches/security/20130618/8008982-jmx_interface_changes.patch \
-	patches/security/20130618/8009004-rmi_connection_improvement.patch \
-	patches/security/20130618/8009013-t2k_glyphs.patch \
-	patches/security/20130618/8009034-jmx_notification_improvement.patch \
-	patches/security/20130618/8009038-jmx_notification_support_improvement.patch \
-	patches/security/20130618/8009067-improve_key_storing.patch \
-	patches/security/20130618/8009235-improve_tsa_data_handling.patch \
-	patches/openjdk/6888167-medialib_memory_leaks.patch \
-	patches/security/20130618/8011243-improve_imaginglib.patch \
-	patches/security/20130618/8011248-better_component_rasters.patch \
-	patches/security/20130618/8011253-better_short_component_rasters.patch \
-	patches/security/20130618/8011257-better_byte_component_rasters.patch \
-	patches/security/20130618/8011557-improve_reflection.patch \
-	patches/security/20130618/8012421-better_positioning.patch \
-	patches/security/20130618/8012438-better_image_validation.patch \
-	patches/security/20130618/8012597-better_image_channel_validation.patch \
-	patches/security/20130618/8012601-better_layout_validation.patch \
-	patches/security/20130618/8014281-better_xml_signature_checking.patch \
-	patches/security/20130618/diamond_fix.patch \
 	patches/security/20130618/handle_npe.patch \
-	patches/security/20130618/javac_issue.patch \
 	patches/security/20130618/8000642-better_transportation_handling.patch \
 	patches/openjdk/6786028-wcag_bold_tags.patch \
 	patches/openjdk/6786682-wcag_lang.patch \
@@ -435,7 +303,6 @@
 
 if !WITH_ALT_HSBUILD
 SECURITY_PATCHES += \
-	patches/security/20130201/8001307.patch \
 	patches/security/20130416/8004336.patch \
 	patches/security/20130416/8006309.patch \
 	patches/security/20130416/8009699.patch \
@@ -648,9 +515,7 @@
 	patches/openjdk/6980681-corba_deadlock.patch \
 	patches/openjdk/7162902-corba_fixes.patch \
 	patches/traceable.patch \
-	patches/openjdk/8004341-jck_dialog_failure.patch \
 	patches/pr1319-support_giflib_5.patch \
-	patches/copy_memory.patch \
 	patches/openjdk/6718364-inference_failure.patch \
 	patches/openjdk/6682380-foreach_crash.patch \
 	patches/openjdk/7046929-fix_t6397104_test_failure.patch \
@@ -763,8 +628,6 @@
 	patches/pr696-zero-fast_aldc-hs20.patch \
 	patches/arm-debug.patch \
 	patches/openjdk/7010849-modernise_sa.patch \
-	patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
-	patches/hotspot/original/fix_get_stack_bounds_leak.patch \
 	patches/hotspot/original/jvmtiEnv.patch \
 	patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
 	patches/hotspot/original/aarch64.patch \
diff -r df51aa5a4270 -r c56469bd12cb hotspot.map
--- a/hotspot.map	Tue Jul 23 00:18:28 2013 +0100
+++ b/hotspot.map	Mon Aug 05 12:14:35 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305
+hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e
diff -r df51aa5a4270 -r c56469bd12cb patches/copy_memory.patch
--- a/patches/copy_memory.patch	Tue Jul 23 00:18:28 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-diff --git a/src/share/classes/sun/misc/Unsafe.java b/src/share/classes/sun/misc/Unsafe.java
---- openjdk/jdk/src/share/classes/sun/misc/Unsafe.java
-+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java
-@@ -504,9 +504,31 @@
-     /**
-      * Sets all bytes in a given block of memory to a copy of another
-      * block.
-+     *
-+     * <p>This method determines each block's base address by means of two parameters,
-+     * and so it provides (in effect) a <em>double-register</em> addressing mode,
-+     * as discussed in {@link #getInt(Object,long)}.  When the object reference is null,
-+     * the offset supplies an absolute base address.
-+     *
-+     * <p>The transfers are in coherent (atomic) units of a size determined
-+     * by the address and length parameters.  If the effective addresses and
-+     * length are all even modulo 8, the transfer takes place in 'long' units.
-+     * If the effective addresses and length are (resp.) even modulo 4 or 2,
-+     * the transfer takes place in units of 'int' or 'short'.
-      */
--    public native void copyMemory(long srcAddress, long destAddress,
-+    public native void copyMemory(Object srcBase, long srcOffset,
-+                                  Object destBase, long destOffset,
-                                   long bytes);
-+    /**
-+     * Sets all bytes in a given block of memory to a copy of another
-+     * block.  This provides a <em>single-register</em> addressing mode,
-+     * as discussed in {@link #getInt(Object,long)}.
-+     *
-+     * Equivalent to <code>copyMemory(null, srcAddress, null, destAddress, bytes)</code>.
-+     */
-+    public void copyMemory(long srcAddress, long destAddress, long bytes) {
-+        copyMemory(null, srcAddress, null, destAddress, bytes);
-+    }
- 
-     /**
-      * Disposes of a block of native memory, as obtained from {@link
diff -r df51aa5a4270 -r c56469bd12cb patches/ecj/jcp-importsources.patch
--- a/patches/ecj/jcp-importsources.patch	Tue Jul 23 00:18:28 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk-ecj/jdk/make/org/jcp/Makefile.orig	2013-07-10 10:02:13.715336690 +0100
-+++ openjdk-ecj/jdk/make/org/jcp/Makefile	2013-07-10 10:02:55.359996584 +0100
-@@ -31,6 +31,7 @@
- PACKAGE = org.jcp



More information about the distro-pkg-dev mailing list