/hg/release/icedtea6-1.11: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 25 07:08:34 PDT 2013
changeset d7eca687b7d2 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=d7eca687b7d2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Jun 22 16:38:24 2013 -0500
Add 2013/06/18 security patches.
2013-06-22 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/idresolver_fix.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 f352f5c79104 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=f352f5c79104
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jun 25 15:07:59 2013 +0100
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.
diffstat:
ChangeLog | 122 +-
Makefile.am | 105 +-
NEWS | 2 +-
patches/ecj/needs-6.patch | 24 +
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/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-restructure.patch | 26851 ++++++++++
patches/openjdk/6888167-medialib_memory_leaks.patch | 134 +
patches/openjdk/6961178-doclet_xml.patch | 1989 +
patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18947 +++++++
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/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.patch | 462 +
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.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/8009554-serialjavaobject.patch | 78 +
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 +
95 files changed, 118864 insertions(+), 320 deletions(-)
diffs (truncated from 120278 to 500 lines):
diff -r 272824be5054 -r f352f5c79104 ChangeLog
--- a/ChangeLog Thu Apr 25 14:16:00 2013 +0100
+++ b/ChangeLog Tue Jun 25 15:07:59 2013 +0100
@@ -1,4 +1,124 @@
-2013-04-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
+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-06-22 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/idresolver_fix.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-04-25 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Bump to 1.11.12pre.
* NEWS: Add section for 1.11.12.
diff -r 272824be5054 -r f352f5c79104 Makefile.am
--- a/Makefile.am Thu Apr 25 14:16:00 2013 +0100
+++ b/Makefile.am Tue Jun 25 15:07:59 2013 +0100
@@ -315,9 +315,99 @@
patches/security/20130416/8009305.patch \
patches/security/20130416/8009699.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/security/20130618/8009554-serialjavaobject.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/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/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 \
+ 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/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
-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) \
@@ -335,13 +425,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 \
@@ -354,6 +445,7 @@
patches/gcc-suffix.patch \
patches/memory-limits.patch \
patches/libraries.patch \
+ $(SPECIAL_SECURITY_PATCH_2) \
patches/jvmtiEnv.patch \
patches/lcms.patch \
patches/print_lsb_release.patch \
@@ -521,7 +613,6 @@
patches/openjdk/7103725-ssl_beast_regression.patch \
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
patches/openjdk/remove-mimpure-option-to-gcc.patch \
- patches/idresolver_fix.patch \
patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \
patches/openjdk/7185678-xmenuitem_peer_npe.patch \
patches/merge_fix.patch \
@@ -529,18 +620,16 @@
patches/openjdk/7177216-native2ascii_changes_file_permissions.patch \
patches/openjdk/7199153-try_with_resources_pushed_to_6.patch \
patches/openjdk/7010849-modernise_sa.patch \
- patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
patches/openjdk/8004341-jck_dialog_failure.patch \
patches/openjdk/8004341-jck_dialog_failure-02.patch \
patches/pr1319-support_giflib_5.patch \
- patches/openjdk/8007393.patch \
- patches/openjdk/8007611.patch \
patches/fix_get_stack_bounds_leak.patch \
patches/openjdk/7197906-handle_32_bit_shifts.patch \
patches/aarch64.patch \
patches/jaxws-tempfiles-ioutils-6.patch \
patches/object-factory-cl-internal.patch \
- patches/openjdk/8009530-icu_kern_table_support_broken.patch
+ patches/openjdk/8009530-icu_kern_table_support_broken.patch \
+ patches/openjdk/7171223-strict_aliasing.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 272824be5054 -r f352f5c79104 NEWS
--- a/NEWS Thu Apr 25 14:16:00 2013 +0100
+++ b/NEWS Tue Jun 25 15:07:59 2013 +0100
@@ -72,7 +72,7 @@
- S7064279: Introspector.getBeanInfo() should release some resources in timely manner
- S8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01
* Bug fixes
- - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7197906)
+ - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7017193)
- PR1362: Fedora 19 / rawhide FTBFS SIGILL
- PR1319: Correct #ifdef to #if
- PR1339: Simplify the rhino class rewriter to avoid use of concurrency
diff -r 272824be5054 -r f352f5c79104 patches/ecj/needs-6.patch
--- a/patches/ecj/needs-6.patch Thu Apr 25 14:16:00 2013 +0100
+++ b/patches/ecj/needs-6.patch Tue Jun 25 15:07:59 2013 +0100
@@ -22,3 +22,27 @@
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 -r 272824be5054 -r f352f5c79104 patches/idresolver_fix.patch
--- a/patches/idresolver_fix.patch Thu Apr 25 14:16:00 2013 +0100
+++ /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;
-+
-+
-+ case Node.ELEMENT_NODE :
-+ Element currentElement = (Element) currentNode;
-+ if (isElement(currentElement, id, els)==1)
-+ return 1;
-+ sibling= currentNode.getFirstChild();
-+ if (sibling==null) {
-+ if (parentNode != null) {
-+ sibling= currentNode.getNextSibling();
-+ }
-+ } else {
-+ parentNode=currentElement;
-+ }
-+ break;
-+ } while (sibling==null && parentNode!=null) {
-+ sibling=parentNode.getNextSibling();
-+ parentNode=parentNode.getParentNode();
-+ if (!(parentNode instanceof Element)) {
-+ parentNode=null;
-+ }
-+ }
-+ if (sibling==null)
-+ return 1;
-+ currentNode=sibling;
-+ sibling=currentNode.getNextSibling();
-+ } while(true);
-
-- }
-- private static int getElementBySearching(Node root,String id,Element []els) {
-- switch (root.getNodeType()) {
-- case Node.ELEMENT_NODE:
-- Element el=(Element)root;
-- if (el.hasAttributes()) {
-- int index=names.indexOf(el.getNamespaceURI());
-- if (index<0) {
-- index=4;
-- }
-- if (el.getAttribute("Id").equals(id)) {
-- els[index]=el;
-- if (index==0) {
-- return 1;
-- }
-- } else if ( el.getAttribute("id").equals(id) ) {
-- if (index!=2) {
-- index=4;
-- }
-- els[index]=el;
-- } else if ( el.getAttribute("ID").equals(id) ) {
-- if (index!=3) {
-- index=4;
-- }
-- els[index]=el;
-- } else if ((index==3)&&(
-- el.getAttribute("OriginalRequestID").equals(id) ||
-- el.getAttribute("RequestID").equals(id) ||
-- el.getAttribute("ResponseID" ).equals(id))) {
-- els[3]=el;
-- }
-- }
-- case Node.DOCUMENT_NODE:
-- Node sibling=root.getFirstChild();
-- while (sibling!=null) {
-- if (getElementBySearching(sibling,id,els)==1)
-+ }
-+ private static int isElement(Element el, String id,Element[] els) {
-+ if (!el.hasAttributes()) {
-+ return 0;
-+ }
-+ NamedNodeMap ns=el.getAttributes();
-+ int elementIndex=names.indexOf(el.getNamespaceURI());
-+ elementIndex=(elementIndex<0) ? namesLength : elementIndex;
-+ for (int length=ns.getLength(), i=0; i<length; i++) {
-+ Attr n=(Attr)ns.item(i);
-+ String s=n.getNamespaceURI();
-+
-+ int index=s==null ? elementIndex : names.indexOf(n.getNamespaceURI());
-+ index=(index<0) ? namesLength : index;
-+ String name=n.getLocalName();
-+ if (name == null)
-+ name = n.getName();
-+ if (name.length()>2)
-+ continue;
-+ String value=n.getNodeValue();
-+ if (name.charAt(0)=='I') {
-+ char ch=name.charAt(1);
-+ if (ch=='d' && value.equals(id)) {
-+ els[index]=el;
-+ if (index==0) {
- return 1;
-- sibling=sibling.getNextSibling();
-+ }
-+ } else if (ch=='D' &&value.endsWith(id)) {
-+ if (index!=3) {
-+ index=namesLength;
-+ }
-+ els[index]=el;
- }
More information about the distro-pkg-dev
mailing list