/hg/release/icedtea6-1.11: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 10 05:41:52 PDT 2013
changeset 8ccc2d062ef2 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=8ccc2d062ef2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jul 09 19:32:39 2013 +0100
Set version to 1.11.12 and fix NEWS file.
2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Bump to 1.11.12.
* NEWS: Sync with patches now included
and add release date.
changeset ebb668a814fc in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ebb668a814fc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 12:31:16 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.
(ICEDTEA_ECJ_PATCHES): Split out fphexconstants,
no-sun-classes, bootstrap-tools and xbootclasspath
patches from icedtea.patch. Make the latter two
conditional.
* javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
and -Xbootclasspath/a by prepending, setting or appending
its value to the bootclasspath option used to ecj,
respectively.
* 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 eca411657872 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=eca411657872
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 12:33:47 2013 +0100
Bump release date.
2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Bump release date.
changeset b8d450756cc9 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=b8d450756cc9
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 10 13:40:03 2013 +0100
Added tag icedtea6-1.11.12 for changeset eca411657872
diffstat:
.hgtags | 1 +
ChangeLog | 41 +++++++++++++++++
Makefile.am | 6 +-
NEWS | 86 ++++++++++++++++++++++++++++--------
configure.ac | 2 +-
javac.in | 24 +++++++++-
patches/ecj/icedtea.patch | 12 -----
patches/ecj/jcp-importsources.patch | 10 ++++
patches/ecj/needs-6.patch | 24 ++++++++++
9 files changed, 171 insertions(+), 35 deletions(-)
diffs (317 lines):
diff -r 49e2fd0a8dfd -r b8d450756cc9 .hgtags
--- a/.hgtags Tue Jul 09 16:29:08 2013 +0100
+++ b/.hgtags Wed Jul 10 13:40:03 2013 +0100
@@ -34,3 +34,4 @@
4892e006b2951600c9131e595096f8eceae5ffe8 icedtea6-1.11.9
f25e5db9397688f7268bb62aca5c63520b4bd08e icedtea6-1.11.10
d3fed928b8b9d76d6153789ac6daec5dd02aab4d icedtea6-1.11.11
+eca41165787238e9d088af88d5a35e417cff21b7 icedtea6-1.11.12
diff -r 49e2fd0a8dfd -r b8d450756cc9 ChangeLog
--- a/ChangeLog Tue Jul 09 16:29:08 2013 +0100
+++ b/ChangeLog Wed Jul 10 13:40:03 2013 +0100
@@ -1,3 +1,44 @@
+2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Bump release date.
+
+2013-07-10 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.
+ (ICEDTEA_ECJ_PATCHES): Split out fphexconstants,
+ no-sun-classes, bootstrap-tools and xbootclasspath
+ patches from icedtea.patch. Make the latter two
+ conditional.
+ * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
+ and -Xbootclasspath/a by prepending, setting or appending
+ its value to the bootclasspath option used to ecj,
+ respectively.
+ * 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-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * configure.ac: Bump to 1.11.12.
+ * NEWS: Sync with patches now included
+ and add release date.
+
2013-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/ecj/ant.patch,
diff -r 49e2fd0a8dfd -r b8d450756cc9 Makefile.am
--- a/Makefile.am Tue Jul 09 16:29:08 2013 +0100
+++ b/Makefile.am Wed Jul 10 13:40:03 2013 +0100
@@ -77,7 +77,8 @@
ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
$(SHARE)/javax/management/StandardMBean.java \
- $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
+ $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java \
+ $(SHARE)/java/sql/SQLException.java
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -710,7 +711,8 @@
patches/ecj/bootver.patch \
patches/ecj/getannotation-cast.patch \
patches/ecj/override.patch \
- patches/ecj/xsltproc.patch
+ patches/ecj/xsltproc.patch \
+ patches/ecj/jcp-importsources.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
diff -r 49e2fd0a8dfd -r b8d450756cc9 NEWS
--- a/NEWS Tue Jul 09 16:29:08 2013 +0100
+++ b/NEWS Wed Jul 10 13:40:03 2013 +0100
@@ -11,13 +11,76 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.11.12 (2013-07-XX):
+New in release 1.11.12 (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
@@ -27,43 +90,28 @@
- 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
- - S7188114: (launcher) need an alternate command line parser for Windows
- S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
- - S7199143: RFE: OCSP revocation checker should provide possibility to specify connection timeout
- - S8002070: Remove the stack search for a resource bundle for Logger to use
- S8002225: (tz) Support tzdata2012i
- - S8006120: Provide "Server JRE" for 7u train
- - S8006536: [launcher] removes trailing slashes on arguments
- S8009165: Fix for 8006435 needs revision
- S8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03
- - S8009463: Regression test test\java\lang\Runtime\exec\ArgWithSpaceAndFinalBackslash.java failing.
+ - 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
- - S8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
- - S8010213: Some api/javax_net/SocketFactory tests fail in 7u25 nightly build
- 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
- - S8011139: (reflect) Revise checking in getEnclosingClass
- S8011154: java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java failed since 7u25b03 on windows
- - S8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined
- - S8011990: TEST_BUG: java/util/logging/bundlesearch/ResourceBundleSearchTest.java fails 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
- - S8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
- 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()
- - S8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
- - S8014205: Most of the Swing dialogs are blank on one win7 MUI
- S8014427: REGRESSION: closed/javax/imageio/plugins/bmp/Write3ByteBgrTest.java fails since 7u25 b09
- - S8014618, RH868136: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
- - S8014676: Java debugger may fail to run
- S8014718: Netbeans IDE begins to throw a lot exceptions since 7u25 b10
- - S8014745: Provide a switch to allow stack walk search of resource bundle
- - S8014968: OCSP and CRL connection timeout is set to four hours by default
New in release 1.11.11 (2013-04-24):
diff -r 49e2fd0a8dfd -r b8d450756cc9 configure.ac
--- a/configure.ac Tue Jul 09 16:29:08 2013 +0100
+++ b/configure.ac Wed Jul 10 13:40:03 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.11.12pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.11.12],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 49e2fd0a8dfd -r b8d450756cc9 javac.in
--- a/javac.in Tue Jul 09 16:29:08 2013 +0100
+++ b/javac.in Wed Jul 10 13:40:03 2013 +0100
@@ -6,7 +6,29 @@
my $ECJ_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);
diff -r 49e2fd0a8dfd -r b8d450756cc9 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Tue Jul 09 16:29:08 2013 +0100
+++ b/patches/ecj/icedtea.patch Wed Jul 10 13:40:03 2013 +0100
@@ -613,18 +613,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 2010-05-26 09:32:35.000000000 +0100
+++ openjdk-ecj/jdk/make/common/Rules.gmk 2010-05-26 15:02:51.000000000 +0100
-@@ -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 49e2fd0a8dfd -r b8d450756cc9 patches/ecj/jcp-importsources.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/jcp-importsources.patch Wed Jul 10 13:40:03 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 49e2fd0a8dfd -r b8d450756cc9 patches/ecj/needs-6.patch
--- a/patches/ecj/needs-6.patch Tue Jul 09 16:29:08 2013 +0100
+++ b/patches/ecj/needs-6.patch Wed Jul 10 13:40:03 2013 +0100
@@ -46,3 +46,27 @@
#
# 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
+@@ -27,6 +27,8 @@
+ PACKAGE = java.awt
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+
+
+ #
+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)
More information about the distro-pkg-dev
mailing list