/hg/icedtea6: 6 new changesets

omajid at icedtea.classpath.org omajid at icedtea.classpath.org
Tue Jul 9 16:25:46 PDT 2013


changeset 809bd0fb849e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=809bd0fb849e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jul 09 12:43:05 2013 -0400

	2013/06/18 Security Patches

	2013-07-09  Omair Majid  <omajid at redhat.com>

		* hotspot.map: Update to latest hs23.
		* Makefile.am (ICEDTEA_PATCHES): Make hotspot-specific patches
		conditional.

	2013-06-22  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* patches/idresolver_fix.patch:
		Removed. Part of 6469266.
		* patches/apache-xml-internal-fix-bug-38655.patch:
		Removed. Part of 6469266.
		* Makefile.am:
		(SECURITY_PATCHES): Add new ones.
		(SPECIAL_SECURITY_PATCH_1): Renamed from
		SPECIAL_SECURITY_PATCH.
		(SPECIAL_SECURITY_PATCH_2): Add 8009071, which
		needs to be applied after some AWT backports.
		(ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}.
		Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES
		as must be applied before 8004584.  Add 7171223 to
		end.
		* patches/openjdk/6307603-xrender-01.patch,
		* patches/openjdk/6469266-xmlsec_1.4.2.patch,
		* patches/openjdk/6656651-windows_lcd_glyphs.patch,
		* patches/openjdk/6786028-wcag_bold_tags.patch,
		* patches/openjdk/6786682-wcag_lang.patch,
		* patches/openjdk/6786688-wcag_table.patch,
		* patches/openjdk/6786690-wcag_dl.patch,
		* patches/openjdk/6802694-no_deprecated.patch,
		* patches/openjdk/6851834-restructure.patch,
		* patches/openjdk/6888167-medialib_memory_leaks.patch,
		* patches/openjdk/6961178-doclet_xml.patch,
		* patches/openjdk/6990754-use_native_memory_for_symboltable.patch,
		* patches/openjdk/7006270-regressions.patch,
		* patches/openjdk/7008809-report_class_in_arraystoreexception.patch,
		* patches/openjdk/7014851-unused_parallel_compaction_code.patch,
		* patches/openjdk/7017732-move_static_fields_to_class.patch,
		* patches/openjdk/7036747-elfstringtable.patch,
		* patches/openjdk/7086585-flexible_field_injection.patch,
		* patches/openjdk/7171223-strict_aliasing.patch,
		* patches/openjdk/7195301-no_instanceof_node.patch,
		* patches/security/20130618/6741606-apache_santuario.patch,
		* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
		* patches/security/20130618/7170730-windows_network_stack.patch,
		* patches/security/20130618/8000638-improve_deserialization.patch,
		* patches/security/20130618/8000642-better_transportation_handling.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-6_fixup.patch,
		* patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
		* patches/security/20130618/8001330-checking_order_improvement.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/8009071-improve_shape_handling.patch,
		* patches/security/20130618/8009235-improve_tsa_data_handling.patch,
		* patches/security/20130618/8009554-serialjavaobject.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/8012375-javadoc_framing.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/8015997-more_javadoc_framing.patch,
		* patches/security/20130618/diamond_fix.patch,
		* patches/security/20130618/handle_npe.patch,
		* patches/security/20130618/hs_merge-01.patch,
		* patches/security/20130618/hs_merge-02.patch,
		* patches/security/20130618/hs_merge-03.patch,
		* patches/security/20130618/hs_merge-04.patch,
		* patches/security/20130618/javac_issue.patch,
		* patches/security/20130618/langtools_generics.patch,
		* patches/security/20130618/langtools_merge-01.patch,
		* patches/security/20130618/langtools_merge-02.patch,
		* patches/security/20130618/langtools_merge-03.patch:
		2013/06/18 security patches.


changeset f8ab99438f3a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f8ab99438f3a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jul 09 13:17:30 2013 -0400

	Correct issues found in building security patches.

	2013-06-24  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Move 8009071 after library patch.
		* NEWS: Correct bug ID referenced for OJ3.
		* patches/ecj/needs-6.patch:
		Add cases for javax.sound and javax.management, due
		to @Override annotations in the security patches.
		* patches/openjdk/6307603-xrender-01.patch:
		Regenerated again as wrong last time.
		* patches/security/20130618/8009071-improve_shape_handling.patch:
		Include sizecalc.h in gif_lib.h.


changeset 9ba5f31e9323 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9ba5f31e9323
author: Omair Majid <omajid at redhat.com>
date: Wed Jun 26 10:47:13 2013 -0400

	Fix patches to work with patch tools that can not handle renames

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

	    * Makefile.am:
	    (SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and
	    patches/openjdk/6851834-handle_renames.patch
	    * patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't
	    rename files using extended-diff-style.
	    * patches/openjdk/6990754-handle_renames.patch: New file. Contains the
	    rename portion of 6990754 since some patch programs can not handle
	    renames.
	    * patches/openjdk/6851834-restructure.patch: Don't rename files using
	    extended-diff-style.
	    * patches/openjdk/6851834-handle_renames.patch: New file. Contains rename
	    porition of 6851834 since some patch programs can not handle renames.


changeset 9accc50c9c1f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9accc50c9c1f
author: Omair Majid <omajid at redhat.com>
date: Wed Jun 26 13:45:20 2013 -0400

	Drop unnecessary patch for S8009554

	2013-06-26  Omair Majid  <omajid at redhat.com>
	            Severin Gehwolf  <sgehwolf at redhat.com>

	       * Makefile.am (SECURITY_PATCHES): Drop
	       patches/security/20130618/8009554-serialjavaobject.patch.
	       * patches/security/20130618/8009554-serialjavaobject.patch: Remove. This
	       was adding redundant permission check


changeset adfdf70ea171 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=adfdf70ea171
author: Chris Phillips <chrisphi at redhat.com>
date: Tue Jul 09 14:11:59 2013 -0400

	Backport 20130618 sec fixes S7158805 and S8001330

	2013-06-26  Chris Phillips  <chrisphi at redhat.com>

		* Makefile.am (SECURITY_PATCHES): Drop
		patches/security/20130618/7158805-nested_subroutine_rewriting.patch
		patches/security/20130618/8001330-checking_order_improvement.patch
		patches/openjdk/7036747-elfstringtable.patch
		patches/openjdk/7017732-move_static_fields_to_class.patch
		patches/openjdk/6990754-use_native_memory_for_symboltable.patch
		patches/openjdk/6990754-handle_renames.patch
		patches/openjdk/7008809-report_class_in_arraystoreexception.patch
		patches/openjdk/7086585-flexible_field_injection.patch
		patches/security/20130618/hs_merge-01.patch
		patches/security/20130618/hs_merge-02.patch
		patches/security/20130618/hs_merge-03.patch
		patches/openjdk/7014851-unused_parallel_compaction_code.patch
		patches/security/20130618/hs_merge-04.patch
		Add:
		patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch
		patches/security/20130618/8001330-checking_order_improvement-it6.patch
		* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
		Backported fix for 7158805.
		* patches/security/20130618/8001330-checking_order_improvement-it6.patch:
		Backported fix for hs portion of 8001330.


changeset 47fc9f561578 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=47fc9f561578
author: Omair Majid <omajid at redhat.com>
date: Tue Jul 09 17:22:26 2013 -0400

	Build additional code using -source 6

	2013-07-09  Omair Majid  <omajid at redhat.com>

	    * patches/ecj/needs-6.patch: Build additional code using -source 6.


diffstat:

 ChangeLog                                                                        |    181 +-
 Makefile.am                                                                      |     98 +-
 hotspot.map                                                                      |      2 +-
 patches/apache-xml-internal-fix-bug-38655.patch                                  |     11 -
 patches/ecj/needs-6.patch                                                        |     36 +
 patches/idresolver_fix.patch                                                     |    194 -
 patches/openjdk/6307603-xrender-01.patch                                         |    239 +-
 patches/openjdk/6469266-xmlsec_1.4.2.patch                                       |  23876 ++++++++
 patches/openjdk/6656651-windows_lcd_glyphs.patch                                 |    938 +
 patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch                      |      4 +-
 patches/openjdk/6786028-wcag_bold_tags.patch                                     |   2914 +
 patches/openjdk/6786682-wcag_lang.patch                                          |    274 +
 patches/openjdk/6786688-wcag_table.patch                                         |   2828 +
 patches/openjdk/6786690-wcag_dl.patch                                            |   3230 +
 patches/openjdk/6802694-no_deprecated.patch                                      |    601 +
 patches/openjdk/6851834-handle_renames.patch                                     |    605 +
 patches/openjdk/6851834-restructure.patch                                        |  26853 ++++++++++
 patches/openjdk/6888167-medialib_memory_leaks.patch                              |    134 +
 patches/openjdk/6961178-doclet_xml.patch                                         |   1989 +
 patches/openjdk/6980681-corba_deadlock.patch                                     |      7 -
 patches/openjdk/6990754-handle_renames.patch                                     |    925 +
 patches/openjdk/6990754-use_native_memory_for_symboltable.patch                  |  18949 +++++++
 patches/openjdk/7006270-regressions.patch                                        |    299 +
 patches/openjdk/7008809-report_class_in_arraystoreexception.patch                |    189 +
 patches/openjdk/7014851-unused_parallel_compaction_code.patch                    |    810 +
 patches/openjdk/7017732-move_static_fields_to_class.patch                        |   3079 +
 patches/openjdk/7036747-elfstringtable.patch                                     |    130 +
 patches/openjdk/7086585-flexible_field_injection.patch                           |   3424 +
 patches/openjdk/7162902-corba_fixes.patch                                        |     21 -
 patches/openjdk/7171223-strict_aliasing.patch                                    |     25 +
 patches/openjdk/7195301-no_instanceof_node.patch                                 |     86 +
 patches/security/20130618/6741606-apache_santuario.patch                         |   8110 +++
 patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch          |    717 +
 patches/security/20130618/7158805-nested_subroutine_rewriting.patch              |    448 +
 patches/security/20130618/7170730-windows_network_stack.patch                    |   1057 +
 patches/security/20130618/8000638-improve_deserialization.patch                  |     26 +
 patches/security/20130618/8000642-better_transportation_handling.patch           |    808 +
 patches/security/20130618/8001032-restrict_object_access-corba.patch             |    544 +
 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-checking_order_improvement-it6.patch           |    500 +
 patches/security/20130618/8001330-checking_order_improvement.patch               |    380 +
 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                   |   6936 ++
 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/8009071-improve_shape_handling.patch                   |   1014 +
 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/8012375-javadoc_framing.patch                          |     61 +
 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/8015997-more_javadoc_framing.patch                     |     21 +
 patches/security/20130618/diamond_fix.patch                                      |     55 +
 patches/security/20130618/handle_npe.patch                                       |     21 +
 patches/security/20130618/hs_merge-01.patch                                      |    284 +
 patches/security/20130618/hs_merge-02.patch                                      |    155 +
 patches/security/20130618/hs_merge-03.patch                                      |     18 +
 patches/security/20130618/hs_merge-04.patch                                      |     44 +
 patches/security/20130618/javac_issue.patch                                      |     60 +
 patches/security/20130618/langtools_generics.patch                               |    600 +
 patches/security/20130618/langtools_merge-01.patch                               |     30 +
 patches/security/20130618/langtools_merge-02.patch                               |     30 +
 patches/security/20130618/langtools_merge-03.patch                               |     18 +
 102 files changed, 121587 insertions(+), 363 deletions(-)

diffs (truncated from 123121 to 500 lines):

diff -r 427412f94dc4 -r 47fc9f561578 ChangeLog
--- a/ChangeLog	Tue May 28 19:56:33 2013 +0200
+++ b/ChangeLog	Tue Jul 09 17:22:26 2013 -0400
@@ -1,3 +1,182 @@
+2013-07-09  Omair Majid  <omajid at redhat.com>
+
+	* patches/ecj/needs-6.patch: Build additional code using -source 6.
+
+2013-06-26  Chris Phillips  <chrisphi at redhat.com>
+
+	* Makefile.am (SECURITY_PATCHES): Drop
+	patches/security/20130618/7158805-nested_subroutine_rewriting.patch
+	patches/security/20130618/8001330-checking_order_improvement.patch
+	patches/openjdk/7036747-elfstringtable.patch
+	patches/openjdk/7017732-move_static_fields_to_class.patch
+	patches/openjdk/6990754-use_native_memory_for_symboltable.patch
+	patches/openjdk/6990754-handle_renames.patch
+	patches/openjdk/7008809-report_class_in_arraystoreexception.patch
+	patches/openjdk/7086585-flexible_field_injection.patch
+	patches/security/20130618/hs_merge-01.patch
+	patches/security/20130618/hs_merge-02.patch
+	patches/security/20130618/hs_merge-03.patch
+	patches/openjdk/7014851-unused_parallel_compaction_code.patch
+	patches/security/20130618/hs_merge-04.patch
+	Add:
+	patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch
+	patches/security/20130618/8001330-checking_order_improvement-it6.patch
+	* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
+	Backported fix for 7158805.
+	* patches/security/20130618/8001330-checking_order_improvement-it6.patch:
+	Backported fix for hs portion of 8001330.
+
+2013-06-26  Omair Majid  <omajid at redhat.com>
+            Severin Gehwolf  <sgehwolf at redhat.com>
+
+	* Makefile.am (SECURITY_PATCHES): Drop
+	patches/security/20130618/8009554-serialjavaobject.patch.
+	* patches/security/20130618/8009554-serialjavaobject.patch: Remove. This
+	was adding redundant permission checking.
+
+2013-06-26  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am:
+	(SECURITY_PATCHES): Add patches/openjdk/6990754-handle_renames.patch and
+	patches/openjdk/6851834-handle_renames.patch
+	* patches/openjdk/6990754-use_native_memory_for_symboltable.patch: Don't
+	rename files using extended-diff-style.
+	* patches/openjdk/6990754-handle_renames.patch: New file. Contains the
+	rename portion of 6990754 since some patch programs can not handle
+	renames.
+	* patches/openjdk/6851834-restructure.patch: Don't rename files using
+	extended-diff-style.
+	* patches/openjdk/6851834-handle_renames.patch: New file. Contains rename
+	porition of 6851834 since some patch programs can not handle renames.
+
+2013-06-24  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Move 8009071 after library patch.
+	* NEWS: Correct bug ID referenced for OJ3.
+	* patches/ecj/needs-6.patch:
+	Add cases for javax.sound and javax.management, due
+	to @Override annotations in the security patches.
+	* patches/openjdk/6307603-xrender-01.patch:
+	Regenerated again as wrong last time.
+	* patches/security/20130618/8009071-improve_shape_handling.patch:
+	Include sizecalc.h in gif_lib.h.
+
+2013-07-09  Omair Majid  <omajid at redhat.com>
+
+	* hotspot.map: Update to latest hs23.
+	* Makefile.am (ICEDTEA_PATCHES): Make hotspot-specific patches
+	conditional.
+
+2013-06-22  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* patches/idresolver_fix.patch:
+	Removed. Part of 6469266.
+	* patches/apache-xml-internal-fix-bug-38655.patch:
+	Removed. Part of 6469266.
+	* Makefile.am:
+	(SECURITY_PATCHES): Add new ones.
+	(SPECIAL_SECURITY_PATCH_1): Renamed from
+	SPECIAL_SECURITY_PATCH.
+	(SPECIAL_SECURITY_PATCH_2): Add 8009071, which
+	needs to be applied after some AWT backports.
+	(ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}.
+	Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES
+	as must be applied before 8004584.  Add 7171223 to
+	end.
+	* patches/openjdk/6307603-xrender-01.patch:
+	Regenerated.
+	* patches/openjdk/6469266-xmlsec_1.4.2.patch,
+	* patches/openjdk/6656651-windows_lcd_glyphs.patch,
+	* patches/openjdk/6786028-wcag_bold_tags.patch,
+	* patches/openjdk/6786682-wcag_lang.patch,
+	* patches/openjdk/6786688-wcag_table.patch,
+	* patches/openjdk/6786690-wcag_dl.patch,
+	* patches/openjdk/6802694-no_deprecated.patch,
+	* patches/openjdk/6851834-restructure.patch,
+	* patches/openjdk/6888167-medialib_memory_leaks.patch,
+	* patches/openjdk/6961178-doclet_xml.patch,
+	* patches/openjdk/6990754-use_native_memory_for_symboltable.patch,
+	* patches/openjdk/7006270-regressions.patch,
+	* patches/openjdk/7008809-report_class_in_arraystoreexception.patch,
+	* patches/openjdk/7014851-unused_parallel_compaction_code.patch,
+	* patches/openjdk/7017732-move_static_fields_to_class.patch,
+	* patches/openjdk/7036747-elfstringtable.patch,
+	* patches/openjdk/7086585-flexible_field_injection.patch,
+	* patches/openjdk/7171223-strict_aliasing.patch,
+	* patches/openjdk/7195301-no_instanceof_node.patch,
+	* patches/security/20130618/6741606-apache_santuario.patch,
+	* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
+	* patches/security/20130618/7170730-windows_network_stack.patch,
+	* patches/security/20130618/8000638-improve_deserialization.patch,
+	* patches/security/20130618/8000642-better_transportation_handling.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-6_fixup.patch,
+	* patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
+	* patches/security/20130618/8001330-checking_order_improvement.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/8009071-improve_shape_handling.patch,
+	* patches/security/20130618/8009235-improve_tsa_data_handling.patch,
+	* patches/security/20130618/8009554-serialjavaobject.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/8012375-javadoc_framing.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/8015997-more_javadoc_framing.patch,
+	* patches/security/20130618/diamond_fix.patch,
+	* patches/security/20130618/handle_npe.patch,
+	* patches/security/20130618/hs_merge-01.patch,
+	* patches/security/20130618/hs_merge-02.patch,
+	* patches/security/20130618/hs_merge-03.patch,
+	* patches/security/20130618/hs_merge-04.patch,
+	* patches/security/20130618/javac_issue.patch,
+	* patches/security/20130618/langtools_generics.patch,
+	* patches/security/20130618/langtools_merge-01.patch,
+	* patches/security/20130618/langtools_merge-02.patch,
+	* patches/security/20130618/langtools_merge-03.patch:
+	2013/06/18 security patches.
+
 2013-05-28  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
@@ -324,7 +503,7 @@
 	* patches/security/20130416/8009857.patch:
 	Add security patches.
 
-2013-04-25  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+2013-04-25  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* Makefile.am:
 	(ICEDTEA_PATCHES): Move aarch64.patch to original
diff -r 427412f94dc4 -r 47fc9f561578 Makefile.am
--- a/Makefile.am	Tue May 28 19:56:33 2013 +0200
+++ b/Makefile.am	Tue Jul 09 17:22:26 2013 -0400
@@ -354,17 +354,97 @@
 	patches/security/20130416/8007918.patch \
 	patches/security/20130416/8009305.patch \
 	patches/security/20130416/8009814.patch \
-	patches/security/20130416/8009857.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 \
+	patches/openjdk/6802694-no_deprecated.patch \
+	patches/openjdk/6786690-wcag_dl.patch \
+	patches/openjdk/6786688-wcag_table.patch \
+	patches/openjdk/6961178-doclet_xml.patch \
+	patches/openjdk/6851834-restructure.patch \
+	patches/openjdk/6851834-handle_renames.patch \
+	patches/openjdk/7006270-regressions.patch \
+	patches/security/20130618/8012375-javadoc_framing.patch \
+	patches/security/20130618/8015997-more_javadoc_framing.patch \
+	patches/security/20130618/langtools_merge-01.patch \
+	patches/security/20130618/langtools_merge-02.patch \
+	patches/security/20130618/langtools_generics.patch \
+	patches/security/20130618/langtools_merge-03.patch
 
 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
+	patches/security/20130416/8009699.patch \
+	patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch \
+	patches/security/20130618/8001330-checking_order_improvement-it6.patch
 endif
 
-SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
+SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch
+SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch
 
 ICEDTEA_PATCHES = \
 	$(DROP_PATCHES) \
@@ -380,13 +460,14 @@
 	patches/openjdk/6725214-direct3d-01.patch \
 	patches/openjdk/6748082-isDisplayLocal.patch \
 	patches/openjdk/6633275-shaped_translucent_windows.patch \
-	$(SPECIAL_SECURITY_PATCH) \
+	$(SPECIAL_SECURITY_PATCH_1) \
 	patches/openjdk/6769607-modal-hangs.patch \
 	patches/openjdk/6791612-opengl-jni-fix.patch \
 	patches/openjdk/6755274-glgetstring-crash.patch \
 	patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
 	patches/openjdk/6693253-security_warning.patch \
 	patches/openjdk/6444769-windowwithwarningtest.patch \
+	patches/openjdk/6656651-windows_lcd_glyphs.patch \
 	patches/notice-safepoints.patch \
 	patches/parisc-opt.patch \
 	patches/lucene-crash.patch \
@@ -396,6 +477,7 @@
 	patches/headers.patch \
 	patches/gcc-suffix.patch \
 	patches/libraries.patch \
+	$(SPECIAL_SECURITY_PATCH_2) \
 	patches/lcms.patch \
 	patches/uname.patch \
 	patches/freetypeversion.patch \
@@ -529,8 +611,6 @@
 	patches/ScriptEngineManager-doc.patch \
 	patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
 	patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \
-	patches/idresolver_fix.patch \
-	patches/apache-xml-internal-fix-bug-38655.patch \
 	patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \
 	patches/openjdk/7088989-ucrypto_tests.patch \
 	patches/generalise_crypto_tests.patch \
@@ -551,11 +631,8 @@
 	patches/openjdk/6980681-corba_deadlock.patch \
 	patches/openjdk/7162902-corba_fixes.patch \
 	patches/traceable.patch \
-	patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
 	patches/openjdk/8004341-jck_dialog_failure.patch \
 	patches/pr1319-support_giflib_5.patch \
-	patches/openjdk/8007393.patch \
-	patches/openjdk/8007611.patch \
 	patches/copy_memory.patch \
 	patches/openjdk/6718364-inference_failure.patch \
 	patches/openjdk/6682380-foreach_crash.patch \
@@ -569,7 +646,8 @@
 	patches/jtreg-LayoutGetCharacterCount.patch \
 	patches/jtreg-LayoutLimits.patch \
 	patches/jtreg-ComponentOrientationTests.patch \
-	patches/jtreg-TextLayoutBoundsChecks.patch
+	patches/jtreg-TextLayoutBoundsChecks.patch \
+	patches/openjdk/7171223-strict_aliasing.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 427412f94dc4 -r 47fc9f561578 hotspot.map
--- a/hotspot.map	Tue May 28 19:56:33 2013 +0200
+++ b/hotspot.map	Tue Jul 09 17:22:26 2013 -0400
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 332f7e24a493 da6f849e2b8c0e8c46de4171b9f14ec9d97bac76dd56006d9c33323b23f54f98
+hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0
diff -r 427412f94dc4 -r 47fc9f561578 patches/apache-xml-internal-fix-bug-38655.patch
--- a/patches/apache-xml-internal-fix-bug-38655.patch	Tue May 28 19:56:33 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -u -r /jck/apache-xml/icedtea6/openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java security/c14n/implementations/NameSpaceSymbTable.java
---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java	2011-11-14 23:11:46.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java	2012-03-16 17:52:37.000000000 +0100
-@@ -370,6 +370,7 @@
-         if (cur == null || (cur.equals( obj))) {
-                         return index;
-         }
-+        length=length-1;
-         do {
-                         index=index==length? 0:++index;
-                         cur = set[index];
diff -r 427412f94dc4 -r 47fc9f561578 patches/ecj/needs-6.patch
--- a/patches/ecj/needs-6.patch	Tue May 28 19:56:33 2013 +0200
+++ b/patches/ecj/needs-6.patch	Tue Jul 09 17:22:26 2013 -0400
@@ -22,6 +22,30 @@
  
  GEN_DIR=$(GENSRCDIR)/sun/awt/X11
  
+diff -Nru openjdk-ecj.orig/jdk/make/javax/sound/Makefile openjdk-ecj/jdk/make/javax/sound/Makefile
+--- openjdk-ecj.orig/jdk/make/javax/sound/Makefile	2013-06-24 00:00:22.031254425 +0100
++++ openjdk-ecj/jdk/make/javax/sound/Makefile	2013-06-24 00:01:27.040288124 +0100
+@@ -28,6 +28,8 @@
+ LIBRARY = jsound
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+ 
+ # include defines for sound
+ include SoundDefs.gmk
+diff -Nru openjdk-ecj.orig/jdk/make/javax/management/Makefile openjdk-ecj/jdk/make/javax/management/Makefile
+--- openjdk-ecj.orig/jdk/make/javax/management/Makefile	2011-11-14 22:11:40.000000000 +0000
++++ openjdk-ecj/jdk/make/javax/management/Makefile	2013-06-24 00:40:59.742001431 +0100
+@@ -31,6 +31,8 @@
+ PACKAGE = javax.management
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+ 
+ #
+ # Files to compile
 diff --git a/make/java/awt/Makefile b/make/java/awt/Makefile
 --- openjdk-ecj/jdk/make/java/awt/Makefile
 +++ openjdk-ecj/jdk/make/java/awt/Makefile
@@ -34,3 +58,15 @@
  
  
  #
+diff -ruN openjdk-ecj.orig/jdk/make/java/java/Makefile openjdk-ecj/jdk/make/java/java/Makefile
+--- openjdk-ecj.orig/jdk/make/java/java/Makefile	2012-10-26 14:25:40.000000000 -0400
++++ openjdk-ecj/jdk/make/java/java/Makefile	2013-07-09 15:46:52.421633685 -0400
+@@ -33,6 +33,8 @@
+ LIBRARY = java
+ PRODUCT = java
+ include $(BUILDDIR)/common/Defs.gmk
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+ 
+ # windows compiler flags
+ ifeq ($(PLATFORM),windows)
diff -r 427412f94dc4 -r 47fc9f561578 patches/idresolver_fix.patch
--- a/patches/idresolver_fix.patch	Tue May 28 19:56:33 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
---- openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java	2012-03-20 20:29:30.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java	2012-03-20 22:18:41.094309861 +0100
-@@ -26,6 +26,7 @@
- import org.w3c.dom.Attr;
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
-+import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- 
- import java.util.Arrays;
-@@ -175,69 +176,124 @@
-        return null;
-    }
- 
-+    private static java.util.List names;
-+    private static int namesLength;
-+    static {
-+        String namespaces[]={
-+            Constants.SignatureSpecNS,
-+            EncryptionConstants.EncryptionSpecNS,
-+            "http://schemas.xmlsoap.org/soap/security/2000-12",
-+            "http://www.w3.org/2002/03/xkms#",
-+            "urn:oasis:names:tc:SAML:1.0:assertion",
-+            "urn:oasis:names:tc:SAML:1.0:protocol"
-+        };
-+        names = Arrays.asList(namespaces);
-+        namesLength = names.size();
-+    }
- 
--   static java.util.List names;
--   static {
--           String namespaces[]={ Constants.SignatureSpecNS,
--                           EncryptionConstants.EncryptionSpecNS,
--                           "http://schemas.xmlsoap.org/soap/security/2000-12",
--                           "http://www.w3.org/2002/03/xkms#"
--                   };
--           names=Arrays.asList(namespaces);
--   }
- 
-+    private static Element getElementBySearching(Node root,String id) {
-+            Element []els=new Element[namesLength + 1];
-+            getEl(root,id,els);
-+            for (int i=0;i<els.length;i++) {
-+                    if (els[i]!=null) {
-+                            return els[i];
-+                    }
-+            }
-+            return null;
-+    }
- 
--   private static Element getElementBySearching(Node root,String id) {
--           Element []els=new Element[5];
--           getElementBySearching(root,id,els);
--           for (int i=0;i<els.length;i++) {
--                   if (els[i]!=null) {
--                           return els[i];
--                   }
--           }
--           return null;
-+    private static int getEl(Node currentNode,String id,Element []els) {
-+        Node sibling=null;
-+        Node parentNode=null;
-+        do {
-+                switch (currentNode.getNodeType()) {
-+                case Node.DOCUMENT_FRAGMENT_NODE :
-+                case Node.DOCUMENT_NODE :
-+                        sibling= currentNode.getFirstChild();
-+                        break;
-+
-+



More information about the distro-pkg-dev mailing list