/hg/release/icedtea6-1.12: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 10 07:42:50 PDT 2013
changeset ce5dbd04cea5 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=ce5dbd04cea5
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 13:59:14 2013 +0100
Backport additional fixes.
Additional fixes were applied to jdk7u as part of the security release.
This patch includes a subset of them.
2013-07-01 Omair Majid <omajid at redhat.com>
* patches/openjdk/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch,
* patches/openjdk/8009217-fix_test_compile.patch,
* patches/openjdk/8009463-space_and_final_backslash.patch,
* patches/openjdk/8009610-blacklist_malware_certificate.patch,
* patches/openjdk/8010213-set_socketoptions_windows.patch,
* patches/openjdk/8010714-xml_dsig_retrievalmethod.patch,
* patches/openjdk/8011154-awt_regresssion.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011992-MlibOpsTest_failed.patch,
* patches/openjdk/8012112-MlibOpsTest_fails.patch,
* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
* patches/openjdk/8012933-appcontext_disposed_too_early.patch,
* patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014427-raster_regresssion.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch: New file.
Backport from icedtea/openjdk 7.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* patches/ecj/override.patch: Add new hunk for BufferedImage.
* NEWS: Update with backports.
changeset 079a280bf354 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=079a280bf354
author: Omair Majid <omajid at redhat.com>
date: Wed Jul 03 23:28:46 2013 -0400
Additional fixes that go along with the security update
Backport additional fixes from 7 that went along with the security
update.
2013-07-03 Omair Majid <omajid at redhat.com>
* patches/openjdk/6541350-tz_display_names_l10n.patch,
* patches/openjdk/6821191-tz_display_names_l10n.patch,
* patches/openjdk/6977550-tzdata2010l.patch,
* patches/openjdk/6996686-tzdata2010o.patch,
* patches/openjdk/7017800-tzdata2011b.patch,
* patches/openjdk/7027387-tzdata2011d.patch,
* patches/openjdk/7033174-tzdata2011e.patch,
* patches/openjdk/7039469-tzdata2011g.patch,
* patches/openjdk/7090843-tzdata2011j.patch,
* patches/openjdk/7103108-tzdata2011l.patch,
* patches/openjdk/7103405-correct_display_names.patch,
* patches/openjdk/7104126-headers_tzdata.patch,
* patches/openjdk/7158483-tzdata2012c.patch,
* patches/openjdk/7198570-tzdata2012f.patch,
* patches/openjdk/8002070-remove_logger_stack_search.patch,
* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
* patches/openjdk/8002225-tzdata2012i.patch,
* patches/openjdk/8009987-tzdata2013b.patch,
* patches/openjdk/8009996-emitter_bean.patch,
* patches/openjdk/8010118-caller_sensitive.patch,
* patches/openjdk/8010727-empty_logger_name.patch,
* patches/openjdk/8010939-logmanager_deadlock.patch,
* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
* patches/openjdk/8011990-logger_test_urls.patch,
* patches/openjdk/8012243-serial_regression.patch,
* patches/openjdk/8013380-handle_renames.patch,
* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
* patches/openjdk/8014718-remove_logging_suntoolkit.patch,
* patches/openjdk/8014745-logger_stack_walk_switch.patch:
New file. Backport from icedtea/openjdk 7.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* NEWS: Update with fixes.
changeset 736ee5b3272b in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=736ee5b3272b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 14:09:21 2013 +0100
Remove unused patches and those which need more testing in HEAD.
2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
Readd parts of patch removed without note in
an earlier backport and fix copyright headers to
apply (2011 instead of 2010).
2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/ecj/ant.patch,
* patches/openjdk/6990754-handle_renames.patch,
* patches/openjdk/6990754-use_native_memory_for_symboltable.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/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8002070-remove_logger_stack_search.patch,
* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009463-space_and_final_backslash.patch,
* patches/openjdk/8010118-caller_sensitive.patch,
* patches/openjdk/8010213-set_socketoptions_windows.patch,
* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011990-logger_test_urls.patch,
* patches/openjdk/8012243-serial_regression.patch,
* patches/openjdk/8013380-handle_renames.patch,
* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014745-logger_stack_walk_switch.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch,
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch,
* patches/security/20130618/8001330-checking_order_improvement-it6.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/sparc.patch:
Remove unused patches.
* Makefile.am:
(ICEDTEA_PATCHES): Remove patches which need more testing before
release.
* patches/ecj/override.patch: Drop recent addition. In accordance with
PR1397, we should avoid extending this patch in favour of either not
including @Override additions or setting source/target correctly.
* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
* patches/security/20130618/8001330-checking_order_improvement.patch:
Replace with Chris' patches, regenerated as unified diffs.
changeset 80e8d9771395 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=80e8d9771395
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 14:12:46 2013 +0100
Set version to 1.12.6 and fix NEWS file.
2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Bump to 1.12.6.
2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Sync with patches now included
and add release date.
changeset 410b4993d8df in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=410b4993d8df
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 14:25:35 2013 +0100
Avoid referring to the bootstrap runtime library when compiling the JDK, so as to avoid version conflicts.
2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_ECJ_PATCHES): Add new patch.
* patches/ecj/jcp-importsources.patch:
Include imported JAXP sources in sourcepath
when building org.jcp code.
2013-07-09 Omair Majid <omajid at redhat.com>
* patches/ecj/needs-6.patch: Build additional code
using -source 6.
2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException
if any of the constructors are missing.
* javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
and -Xbootclasspath/a by prepending, setting or appending
its value to the bootclasspath option used to ecj,
respectively.
* configure.ac: Test for the java.sql.SQLException
constructors.
* patches/ecj/icedtea.patch:
Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK
altogether.
* patches/ecj/needs-6.patch:
Add java.awt Makefile.
changeset 72801116cb84 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=72801116cb84
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 15:13:09 2013 +0100
Make 7158805 patch apply again.
2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
Make patch apply again.
diffstat:
ChangeLog | 167 +-
Makefile.am | 62 +-
NEWS | 102 +-
configure.ac | 8 +-
javac.in | 24 +-
patches/ecj/ant.patch | 20 -
patches/ecj/icedtea.patch | 12 -
patches/ecj/jcp-importsources.patch | 10 +
patches/ecj/needs-6.patch | 24 +
patches/openjdk/6541350-tz_display_names_l10n.patch | 300 +
patches/openjdk/6821191-tz_display_names_l10n.patch | 125 +
patches/openjdk/6977550-tzdata2010l.patch | 1208 +
patches/openjdk/6990754-handle_renames.patch | 925 -
patches/openjdk/6990754-use_native_memory_for_symboltable.patch | 18949 ----------
patches/openjdk/6996686-tzdata2010o.patch | 93 +
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/7017800-tzdata2011b.patch | 254 +
patches/openjdk/7027387-tzdata2011d.patch | 502 +
patches/openjdk/7033174-tzdata2011e.patch | 117 +
patches/openjdk/7036747-elfstringtable.patch | 130 -
patches/openjdk/7039469-tzdata2011g.patch | 116 +
patches/openjdk/7086585-flexible_field_injection.patch | 3424 -
patches/openjdk/7090843-tzdata2011j.patch | 1228 +
patches/openjdk/7103108-tzdata2011l.patch | 1593 +
patches/openjdk/7103405-correct_display_names.patch | 118 +
patches/openjdk/7104126-headers_tzdata.patch | 530 +
patches/openjdk/7158483-tzdata2012c.patch | 1436 +
patches/openjdk/7198570-tzdata2012f.patch | 841 +
patches/openjdk/8002225-tzdata2012i.patch | 261 +
patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch | 68 +
patches/openjdk/8009217-fix_test_compile.patch | 91 +
patches/openjdk/8009610-blacklist_malware_certificate.patch | 64 +
patches/openjdk/8009987-tzdata2013b.patch | 2165 +
patches/openjdk/8009996-emitter_bean.patch | 27 +
patches/openjdk/8010714-xml_dsig_retrievalmethod.patch | 345 +
patches/openjdk/8010727-empty_logger_name.patch | 99 +
patches/openjdk/8010939-logmanager_deadlock.patch | 264 +
patches/openjdk/8011154-awt_regression.patch | 20 +
patches/openjdk/8011992-MlibOpsTest_failed.patch | 89 +
patches/openjdk/8012112-MlibOpsTest_fails.patch | 51 +
patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch | 480 +
patches/openjdk/8012933-appcontext_disposed_too_early.patch | 153 +
patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 +
patches/openjdk/8014427-raster_regression.patch | 20 +
patches/openjdk/8014718-remove_logging_suntoolkit.patch | 112 +
patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch | 743 -
patches/security/20130618/7158805-nested_subroutine_rewriting.patch | 53 +-
patches/security/20130618/8001330-checking_order_improvement-it6.patch | 500 -
patches/security/20130618/8001330-checking_order_improvement.patch | 37 +-
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/sparc.patch | 1808 -
56 files changed, 13285 insertions(+), 31120 deletions(-)
diffs (truncated from 44796 to 500 lines):
diff -r a6de0621a57b -r 72801116cb84 ChangeLog
--- a/ChangeLog Wed Jun 26 15:10:59 2013 -0400
+++ b/ChangeLog Wed Jul 10 15:13:09 2013 +0100
@@ -1,5 +1,170 @@
+2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
+ Make patch apply again.
+
+2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_ECJ_PATCHES): Add new patch.
+ * patches/ecj/jcp-importsources.patch:
+ Include imported JAXP sources in sourcepath
+ when building org.jcp code.
+
+2013-07-09 Omair Majid <omajid at redhat.com>
+
+ * patches/ecj/needs-6.patch: Build additional code
+ using -source 6.
+
+2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException
+ if any of the constructors are missing.
+ * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
+ and -Xbootclasspath/a by prepending, setting or appending
+ its value to the bootclasspath option used to ecj,
+ respectively.
+ * configure.ac: Test for the java.sql.SQLException
+ constructors.
+ * patches/ecj/icedtea.patch:
+ Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK
+ altogether.
+ * patches/ecj/needs-6.patch:
+ Add java.awt Makefile.
+
+2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * configure.ac: Bump to 1.12.6.
+
+2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Sync with patches now included
+ and add release date.
+
+2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch:
+ Readd parts of patch removed without note in
+ an earlier backport and fix copyright headers to
+ apply (2011 instead of 2010).
+
+2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/ecj/ant.patch,
+ * patches/openjdk/6990754-handle_renames.patch,
+ * patches/openjdk/6990754-use_native_memory_for_symboltable.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/7188114-alternate_command_line_parser.patch,
+ * patches/openjdk/7199143-OCSP_timeout.patch,
+ * patches/openjdk/8002070-remove_logger_stack_search.patch,
+ * patches/openjdk/8002070-remove_logger_stack_search_2.patch,
+ * patches/openjdk/8006120-server_jre.patch,
+ * patches/openjdk/8006536-remove_trailing_slashes.patch,
+ * patches/openjdk/8009463-space_and_final_backslash.patch,
+ * patches/openjdk/8010118-caller_sensitive.patch,
+ * patches/openjdk/8010213-set_socketoptions_windows.patch,
+ * patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
+ * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
+ * patches/openjdk/8011990-logger_test_urls.patch,
+ * patches/openjdk/8012243-serial_regression.patch,
+ * patches/openjdk/8013380-handle_renames.patch,
+ * patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
+ * patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
+ * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
+ * patches/openjdk/8014676-javadebugger_space_in_paths.patch,
+ * patches/openjdk/8014745-logger_stack_walk_switch.patch,
+ * patches/openjdk/8014968-OCSP_timeout_default.patch,
+ * patches/security/20130618/7158805-nested_subroutine_rewriting-it6.patch,
+ * patches/security/20130618/8001330-checking_order_improvement-it6.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/sparc.patch:
+ Remove unused patches.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove patches which need more testing before
+ release.
+ * patches/ecj/override.patch: Drop recent addition. In accordance with
+ PR1397, we should avoid extending this patch in favour of either not
+ including @Override additions or setting source/target correctly.
+ * patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
+ * patches/security/20130618/8001330-checking_order_improvement.patch:
+ Replace with Chris' patches, regenerated as unified diffs.
+
+2013-07-03 Omair Majid <omajid at redhat.com>
+
+ * patches/openjdk/6541350-tz_display_names_l10n.patch,
+ * patches/openjdk/6821191-tz_display_names_l10n.patch,
+ * patches/openjdk/6977550-tzdata2010l.patch,
+ * patches/openjdk/6996686-tzdata2010o.patch,
+ * patches/openjdk/7017800-tzdata2011b.patch,
+ * patches/openjdk/7027387-tzdata2011d.patch,
+ * patches/openjdk/7033174-tzdata2011e.patch,
+ * patches/openjdk/7039469-tzdata2011g.patch,
+ * patches/openjdk/7090843-tzdata2011j.patch,
+ * patches/openjdk/7103108-tzdata2011l.patch,
+ * patches/openjdk/7103405-correct_display_names.patch,
+ * patches/openjdk/7104126-headers_tzdata.patch,
+ * patches/openjdk/7158483-tzdata2012c.patch,
+ * patches/openjdk/7198570-tzdata2012f.patch,
+ * patches/openjdk/8002070-remove_logger_stack_search.patch,
+ * patches/openjdk/8002070-remove_logger_stack_search_2.patch,
+ * patches/openjdk/8002225-tzdata2012i.patch,
+ * patches/openjdk/8009987-tzdata2013b.patch,
+ * patches/openjdk/8009996-emitter_bean.patch,
+ * patches/openjdk/8010118-caller_sensitive.patch,
+ * patches/openjdk/8010727-empty_logger_name.patch,
+ * patches/openjdk/8010939-logmanager_deadlock.patch,
+ * patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
+ * patches/openjdk/8011990-logger_test_urls.patch,
+ * patches/openjdk/8012243-serial_regression.patch,
+ * patches/openjdk/8013380-handle_renames.patch,
+ * patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
+ * patches/openjdk/8014718-remove_logging_suntoolkit.patch,
+ * patches/openjdk/8014745-logger_stack_walk_switch.patch:
+ New file. Backport from icedtea/openjdk 7.
+ * Makefile.am (ICEDTEA_PATCHES): Apply the above.
+ * NEWS: Update with fixes.
+
+2013-07-01 Omair Majid <omajid at redhat.com>
+
+ * patches/openjdk/7188114-alternate_command_line_parser.patch,
+ * patches/openjdk/7199143-OCSP_timeout.patch,
+ * patches/openjdk/8006120-server_jre.patch,
+ * patches/openjdk/8006536-remove_trailing_slashes.patch,
+ * patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch,
+ * patches/openjdk/8009217-fix_test_compile.patch,
+ * patches/openjdk/8009463-space_and_final_backslash.patch,
+ * patches/openjdk/8009610-blacklist_malware_certificate.patch,
+ * patches/openjdk/8010213-set_socketoptions_windows.patch,
+ * patches/openjdk/8010714-xml_dsig_retrievalmethod.patch,
+ * patches/openjdk/8011154-awt_regresssion.patch,
+ * patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
+ * patches/openjdk/8011992-MlibOpsTest_failed.patch,
+ * patches/openjdk/8012112-MlibOpsTest_fails.patch,
+ * patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
+ * patches/openjdk/8012933-appcontext_disposed_too_early.patch,
+ * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch,
+ * patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
+ * patches/openjdk/8014427-raster_regresssion.patch,
+ * patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
+ * patches/openjdk/8014676-javadebugger_space_in_paths.patch,
+ * patches/openjdk/8014968-OCSP_timeout_default.patch: New file.
+ Backport from icedtea/openjdk 7.
+ * Makefile.am (ICEDTEA_PATCHES): Apply the above.
+ * patches/ecj/override.patch: Add new hunk for BufferedImage.
+ * NEWS: Update with backports.
+
2013-06-26 Chris Phillips <chrisphi at redhat.com>
- * Makefile.am (SECURITY_PATCHES): Drop
+
+ * 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
diff -r a6de0621a57b -r 72801116cb84 Makefile.am
--- a/Makefile.am Wed Jun 26 15:10:59 2013 -0400
+++ b/Makefile.am Wed Jul 10 15:13:09 2013 +0100
@@ -140,6 +140,27 @@
$(SHARE)/javax/net/ssl/KeyStoreBuilderParameters.java
endif
+#PR57420 - java.sql.SQLException
+if LACKS_JAVA_SQL_EXCEPTION_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+endif
+endif
+endif
+endif
+
# Flags
MEMORY_LIMIT = -J-Xmx1024m
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -398,8 +419,8 @@
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-it6.patch \
- patches/security/20130618/8001330-checking_order_improvement-it6.patch \
+ patches/security/20130618/7158805-nested_subroutine_rewriting.patch \
+ patches/security/20130618/8001330-checking_order_improvement.patch \
patches/security/20130618/8000642-better_transportation_handling.patch \
patches/openjdk/6786028-wcag_bold_tags.patch \
patches/openjdk/6786682-wcag_lang.patch \
@@ -652,7 +673,39 @@
patches/jaxws-tempfiles-ioutils-6.patch \
patches/object-factory-cl-internal.patch \
patches/openjdk/8009530-icu_kern_table_support_broken.patch \
- patches/openjdk/7171223-strict_aliasing.patch
+ patches/openjdk/7171223-strict_aliasing.patch \
+ patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \
+ patches/openjdk/8009217-fix_test_compile.patch \
+ patches/openjdk/8009610-blacklist_malware_certificate.patch \
+ patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \
+ patches/openjdk/8011154-awt_regression.patch \
+ patches/openjdk/8011992-MlibOpsTest_failed.patch \
+ patches/openjdk/8012112-MlibOpsTest_fails.patch \
+ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \
+ patches/openjdk/8012933-appcontext_disposed_too_early.patch \
+ patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \
+ patches/openjdk/8014427-raster_regression.patch \
+ patches/openjdk/8010727-empty_logger_name.patch \
+ patches/openjdk/8010939-logmanager_deadlock.patch \
+ patches/openjdk/8014718-remove_logging_suntoolkit.patch \
+ patches/openjdk/8009996-emitter_bean.patch \
+ patches/openjdk/6541350-tz_display_names_l10n.patch \
+ patches/openjdk/6821191-tz_display_names_l10n.patch \
+ patches/openjdk/6977550-tzdata2010l.patch \
+ patches/openjdk/6996686-tzdata2010o.patch \
+ patches/openjdk/7017800-tzdata2011b.patch \
+ patches/openjdk/7027387-tzdata2011d.patch \
+ patches/openjdk/7033174-tzdata2011e.patch \
+ patches/openjdk/7039469-tzdata2011g.patch \
+ patches/openjdk/7090843-tzdata2011j.patch \
+ patches/openjdk/7103108-tzdata2011l.patch \
+ patches/openjdk/7104126-headers_tzdata.patch \
+ patches/openjdk/7103405-correct_display_names.patch \
+ patches/openjdk/7158483-tzdata2012c.patch \
+ patches/openjdk/7198570-tzdata2012f.patch \
+ patches/openjdk/8002225-tzdata2012i.patch \
+ patches/openjdk/8009987-tzdata2013b.patch
+
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -721,7 +774,8 @@
patches/ecj/corba-dependencies.patch \
patches/ecj/jaxws-langtools-dependency.patch \
patches/ecj/jaxws-jdk-dependency.patch \
- patches/ecj/hotspot-jdk-dependency.patch
+ patches/ecj/hotspot-jdk-dependency.patch \
+ patches/ecj/jcp-importsources.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
diff -r a6de0621a57b -r 72801116cb84 NEWS
--- a/NEWS Wed Jun 26 15:10:59 2013 -0400
+++ b/NEWS Wed Jul 10 15:13:09 2013 +0100
@@ -11,7 +11,107 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.12.6 (2013-06-XX):
+New in release 1.12.6 (2013-07-10):
+
+* Security fixes
+ - S6741606, CVE-2013-2407: Integrate Apache Santuario
+ - S7158805, CVE-2013-2445: Better rewriting of nested subroutine calls
+ - S7170730, CVE-2013-2451: Improve Windows network stack support.
+ - S8000638, CVE-2013-2450: Improve deserialization
+ - S8000642, CVE-2013-2446: Better handling of objects for transportation
+ - S8001032: Restrict object access
+ - S8001033, CVE-2013-2452: Refactor network address handling in virtual machine identifiers
+ - S8001034, CVE-2013-1500: Memory management improvements
+ - S8001038, CVE-2013-2444: Resourcefully handle resources
+ - S8001043: Clarify definition restrictions
+ - S8001309: Better handling of annotation interfaces
+ - S8001318, CVE-2013-2447: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
+ - S8001330, CVE-2013-2443: Improve on checking order
+ - S8003703, CVE-2013-2412: Update RMI connection dialog box
+ - S8004584: Augment applet contextualization
+ - S8005007: Better glyph processing
+ - S8006328, CVE-2013-2448: Improve robustness of sound classes
+ - S8006611: Improve scripting
+ - S8007467: Improve robustness of JMX internal APIs
+ - S8007471: Improve MBean notifications
+ - S8007812, CVE-2013-2455: (reflect) Class.getEnclosingMethod problematic for some classes
+ - S8008120, CVE-2013-2457: Improve JMX class checking
+ - S8008124, CVE-2013-2453: Better compliance testing
+ - S8008128: Better API coherence for JMX
+ - S8008132, CVE-2013-2456: Better serialization support
+ - S8008585: Better JMX data handling
+ - S8008593: Better URLClassLoader resource management
+ - S8008603: Improve provision of JMX providers
+ - S8008611: Better handling of annotations in JMX
+ - S8008615: Improve robustness of JMX internal APIs
+ - S8008623: Better handling of MBeanServers
+ - S8008744, CVE-2013-2407: Rework part of fix for JDK-6741606
+ - S8008982: Adjust JMX for underlying interface changes
+ - S8009004: Better implementation of RMI connections
+ - S8009013: Better handling of T2K glyphs
+ - S8009034: Improve resulting notifications in JMX
+ - S8009038: Improve JMX notification support
+ - S8009067: Improve storing keys in KeyStore
+ - S8009071, CVE-2013-2459: Improve shape handling
+ - S8009235: Improve handling of TSA data
+ - S8011243, CVE-2013-2470: Improve ImagingLib
+ - S8011248, CVE-2013-2471: Better Component Rasters
+ - S8011253, CVE-2013-2472: Better Short Component Rasters
+ - S8011257, CVE-2013-2473: Better Byte Component Rasters
+ - S8012375, CVE-2013-1571: Improve Javadoc framing
+ - S8012421: Better positioning of PairPositioning
+ - S8012438, CVE-2013-2463: Better image validation
+ - S8012597, CVE-2013-2465: Better image channel verification
+ - S8012601, CVE-2013-2469: Better validation of image layouts
+ - S8014281, CVE-2013-2461: Better checking of XML signature
+ - S8015997: Additional improvement in Javadoc framing
+* Backports
+ - S6469266: Integrate Apache XMLSec 1.4.2 into JDK 7
+ - S6541350: TimeZone display names localization
+ - S6656651: Windows Look and Feel LCD glyph images have some differences from native applications.
+ - S6786028: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Bold tags should be strong
+ - S6786682: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - HTML tag should have lang attribute
+ - S6786688: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - Table must have captions and headers
+ - S6786690: Javadoc HTML WCAG 2.0 accessibility issues in standard doclet - DL tag and nesting issue
+ - S6802694: Javadoc doclet does not display deprecated information with -nocomment option for serialized form
+ - S6821191: Timezone display name localization
+ - S6851834: Javadoc doclet needs a structured approach to generate the output HTML.
+ - S6888167: memory leaks in the medialib glue code
+ - S6961178: Allow doclet.xml to contain XML attributes
+ - S6977550: (tz) Support tzdata2010l
+ - S6996686: (tz) Support tzdata2010o
+ - S7006270: Several javadoc regression tests are failing on windows
+ - S7017800: (tz) Support tzdata2011b
+ - S7027387: (tz) Support tzdata2011d
+ - S7033174: (tz) Support tzdata2011e
+ - S7039469: (tz) Support tzdata2011g
+ - S7090843: (tz) Support tzdata2011j
+ - S7103108: (tz) Support tzdata2011l
+ - S7103405: Correct display names for Pacific/Apia timezone
+ - S7104126: Insert openjdk copyright header back into TZdata files
+ - S7158483: (tz) Support tzdata2012c
+ - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
+ - S7198570: (tz) Support tzdata2012f
+ - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
+ - S8002225: (tz) Support tzdata2012i
+ - S8009165: Fix for 8006435 needs revision
+ - S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
+ - S8009530: ICU Kern table support broken
+ - S8009610: Blacklist certificate used with malware.
+ - S8009987: (tz) Support tzdata2013b
+ - S8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
+ - S8010714: XML DSig API allows a RetrievalMethod to reference another RetrievalMethod
+ - S8010727: WLS fails to add a logger with "" in its own LogManager subclass instance
+ - S8010939: Deadlock in LogManager
+ - S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
+ - S8011557: Improve reflection utility classes
+ - S8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05
+ - S8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris
+ - S8012617: ArrayIndexOutOfBoundsException with some fonts using LineBreakMeasurer
+ - S8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07
+ - S8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext()
+ - S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
+ - S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
New in release 1.12.5 (2013-04-24):
diff -r a6de0621a57b -r 72801116cb84 configure.ac
--- a/configure.ac Wed Jun 26 15:10:59 2013 -0400
+++ b/configure.ac Wed Jul 10 15:13:09 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.12.6pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.12.6],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -154,6 +154,12 @@
[new javax.net.ssl.KeyStoreBuilderParameters(new java.util.ArrayList<java.security.KeyStore.Builder>()).getParameters()]
)
+dnl PR57420 - java.sql.SQLException
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_THROWABLE],[java.sql.SQLException],[Throwable.class],[new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_THROWABLE],[java.sql.SQLException],[String.class,Throwable.class],["Something went wrong",new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()])
+
# Use xvfb-run if found to run gui tests (check-jdk).
AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
AC_SUBST(XVFB_RUN_CMD)
diff -r a6de0621a57b -r 72801116cb84 javac.in
--- a/javac.in Wed Jun 26 15:10:59 2013 -0400
+++ b/javac.in Wed Jul 10 15:13:09 2013 +0100
@@ -7,7 +7,29 @@
my $JAVAC_WARNINGS="-nowarn";
my @bcoption;
-push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
+my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV;
+my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV;
+my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV;
+my $bcp = $bcoptionsp[0];
+my $bc = $bcoptions[0];
+my $bca = $bcoptionsa[0];
+my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar';
+if ($bcp)
+{
+ $bcp =~ s/^[^:]*://;
+ $systembc = join ":", $bcp, $systembc;
+}
+if ($bc)
+{
+ $bc =~ s/^[^:]*://;
+ $systembc = $bc;
+}
+if ($bca)
+{
+ $bca =~ s/^[^:]*://;
+ $systembc = join ":", $systembc, $bca;
+}
+push @bcoption, '-bootclasspath', $systembc
unless grep {$_ eq '-bootclasspath'} @ARGV;
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', '-XDignore.symbol.file=true');
diff -r a6de0621a57b -r 72801116cb84 patches/ecj/ant.patch
--- a/patches/ecj/ant.patch Wed Jun 26 15:10:59 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400
-+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500
-@@ -80,6 +80,7 @@
- endif
-
- ifdef ALT_BOOTDIR
-+ ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
- endif
-
---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400
-+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500
-@@ -109,6 +109,7 @@
- memoryMaximumSize="${javac.memoryMaximumSize}"
- target="${javac.target}"
- excludes="com/sun/tools/internal/txw2/**">
-+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
- <compilerarg line="${javac.version.opt}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
diff -r a6de0621a57b -r 72801116cb84 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Wed Jun 26 15:10:59 2013 -0400
+++ b/patches/ecj/icedtea.patch Wed Jul 10 15:13:09 2013 +0100
@@ -602,18 +602,6 @@
diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2011-01-07 21:32:51.000000000 +0000
+++ openjdk-ecj/jdk/make/common/Rules.gmk 2012-01-18 21:43:04.150185964 +0000
-@@ -235,8 +235,9 @@
- $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- $(CAT) $(JAVA_SOURCE_LIST); \
- $(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
-+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
@@ -302,6 +303,8 @@
$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
diff -r a6de0621a57b -r 72801116cb84 patches/ecj/jcp-importsources.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/jcp-importsources.patch Wed Jul 10 15:13:09 2013 +0100
@@ -0,0 +1,10 @@
+--- 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
+ PRODUCT = jcp
+ include $(BUILDDIR)/common/Defs.gmk
++SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java)
+
+ #
+ # Files to compile
diff -r a6de0621a57b -r 72801116cb84 patches/ecj/needs-6.patch
--- a/patches/ecj/needs-6.patch Wed Jun 26 15:10:59 2013 -0400
+++ b/patches/ecj/needs-6.patch Wed Jul 10 15:13:09 2013 +0100
@@ -46,3 +46,27 @@
More information about the distro-pkg-dev
mailing list