/hg/release/icedtea7-2.5: Bump to icedtea-2.5.5.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Apr 14 20:40:11 UTC 2015
changeset acdf8a8f85cf in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=acdf8a8f85cf
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Apr 14 01:31:49 2015 +0100
Bump to icedtea-2.5.5.
Upstream changes:
- S7090424: TestGlyphVectorLayout failed automately with java.lang.StackOverflowError
- S8040228: TransformerConfigurationException occurs with security manager, FSP and XSLT Ext
- S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh fails to cleanup files after it
- S8041740: Test sun/security/tools/keytool/ListKeychainStore.sh fails on Mac
- S8041979: sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms
- S8043123: Hard crash with access violation exception when blitting to very large image
- S8059064: Better G1 log caching
- S8060072: Increment minor version of HSx for 7u79 and initialize the build number
- S8060461: Fix for JDK-8042609 uncovers additional issue
- S8064454: [TEST_BUG] Test tools/javac/innerClassFile/Driver.sh fails for Mac and Linux
- S8064532: 7u76 build failed with # 8041979
- S8064601: Improve jar file handling
- S8065072: sun/net/www/http/HttpClient/StreamingRetry.java failed intermittently
- S8065286: Fewer subtable substitutions
- S8065291: Improved font lookups
- S8065373: [macosx] jdk8, jdk7u60 Regression in Graphics2D drawing of derived Fonts
- S8065709: Deadlock in awt/logging apparently introduced by 8019623
- S8065991: LogManager unecessarily calls JavaAWTAccess from within a critical section
- S8066479: Better certificate chain validation
- S8067050: Better font consistency checking
- S8067684: Better font substitutions
- S8067699: Better glyph storage
- S8068320: Limit applet requests
- S8068720: Better certificate options checking
- S8069198: Upgrade image library
- S8071591: java/util/logging/LogManagerAppContextDeadlock.java test started to fail due to JDK-8065991
- S8071726: Better RSA optimizations
- S8071818: Better vectorization on SPARC
- S8071931: Return of the phantom menace
- S8072039: jdk7u79 l10n resource file translation update
- S8072042: (tz) Support tzdata2015a
- S8073226: Increment hsx 24.79 build to b02 for 7u79-b10
- S8074662: Update 3rd party readme and license for LibPNG v 1.6.16
- S8075211: [TEST_BUG] Test sun/net/www/http/HttpClient/StreamingRetry.java fails with compilation error
2015-04-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 79.
(BUILD_VERSION): Bump to b14.
(CORBA_CHANGESET): Update to icedtea-2.5.5.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.5.5.
* hotspot.map.in: Update to icedtea-2.5.5.
* patches/boot/ecj-diamond.patch:
Regenerated. Add cases for
sun.security.pkcs12.PKCS12KeyStore and
com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC
diffstat:
ChangeLog | 27 +-
Makefile.am | 28 +-
NEWS | 35 +
configure.ac | 2 +-
hotspot.map.in | 2 +-
patches/boot/ecj-diamond.patch | 1112 ++++++++++++++++++++-------------------
6 files changed, 645 insertions(+), 561 deletions(-)
diffs (truncated from 3171 to 500 lines):
diff -r f8306c9c9a15 -r acdf8a8f85cf ChangeLog
--- a/ChangeLog Fri Apr 03 23:25:48 2015 +0100
+++ b/ChangeLog Tue Apr 14 01:31:49 2015 +0100
@@ -1,3 +1,28 @@
+2015-04-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 79.
+ (BUILD_VERSION): Bump to b14.
+ (CORBA_CHANGESET): Update to icedtea-2.5.5.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.5.5.
+ * hotspot.map.in: Update to icedtea-2.5.5.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add cases for
+ sun.security.pkcs12.PKCS12KeyStore and
+ com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC
+
2015-04-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
@@ -21,7 +46,7 @@
underscored literals.
* configure.ac:
Bump to 2.5.5pre02 and run IT_UNDERSCORE_CHECK.
- * hotspot.map.in: Update to icedtea-2.5.5pre01.
+ * hotspot.map.in: Update to icedtea-2.5.5pre02.
* patches/boot/ecj-underscored_literals.patch:
New patch to remove underscored literals in
sun.security.ssl.ServerHandshaker
diff -r f8306c9c9a15 -r acdf8a8f85cf Makefile.am
--- a/Makefile.am Fri Apr 03 23:25:48 2015 +0100
+++ b/Makefile.am Tue Apr 14 01:31:49 2015 +0100
@@ -1,22 +1,22 @@
# Dependencies
-JDK_UPDATE_VERSION = 75
-BUILD_VERSION = b31
+JDK_UPDATE_VERSION = 79
+BUILD_VERSION = b14
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = e6764ce23dab
-JAXP_CHANGESET = d1d14eb7d6e5
-JAXWS_CHANGESET = a4d2c21355d5
-JDK_CHANGESET = fbace7bbfb81
-LANGTOOLS_CHANGESET = b4aed9cdd65b
-OPENJDK_CHANGESET = 76ca358c79a2
+CORBA_CHANGESET = 52db6f325d61
+JAXP_CHANGESET = 80b5a93b1406
+JAXWS_CHANGESET = 3706d41e1476
+JDK_CHANGESET = fb9961d8dfda
+LANGTOOLS_CHANGESET = 3ffd17553e8c
+OPENJDK_CHANGESET = f8c87dd516ff
-CORBA_SHA256SUM = ef8aa2d8cc01e9902ff2249f1a0d780528aa531fec24a7751d54820c0ea5222f
-JAXP_SHA256SUM = 8d8730b5eca2f9a2765a1c5bfc31545659e017a3e55592fd213cc6937363c17b
-JAXWS_SHA256SUM = dcdc1be3421b932edb1bbb45dfdaf0b2762bb1e45a63d22904ae6981b458f06d
-JDK_SHA256SUM = ff7b00b6fdd26ca7f4e1b8ae1be6fd86d8cc90eae4f7a9cba7a5d4014934e015
-LANGTOOLS_SHA256SUM = 7491f6ec5dddad5892bbbe8dcc4dd9702da0d8b7712c69b4ba614fdb73e32cd7
-OPENJDK_SHA256SUM = 0d364defd2fb313e411042630217fa58b6be7215ecd4d02e448f75b540485d02
+CORBA_SHA256SUM = f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51
+JAXP_SHA256SUM = 293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256
+JAXWS_SHA256SUM = 76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be
+JDK_SHA256SUM = c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483
+LANGTOOLS_SHA256SUM = 71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660
+OPENJDK_SHA256SUM = 5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d
DROP_URL = http://icedtea.classpath.org/download/drops
diff -r f8306c9c9a15 -r acdf8a8f85cf NEWS
--- a/NEWS Fri Apr 03 23:25:48 2015 +0100
+++ b/NEWS Tue Apr 14 01:31:49 2015 +0100
@@ -14,9 +14,26 @@
New in release 2.5.5 (2015-04-XX):
+* Security fixes
+ - S8059064: Better G1 log caching
+ - S8060461: Fix for JDK-8042609 uncovers additional issue
+ - S8064601, CVE-2015-0480: Improve jar file handling
+ - S8065286: Fewer subtable substitutions
+ - S8065291: Improved font lookups
+ - S8066479: Better certificate chain validation
+ - S8067050: Better font consistency checking
+ - S8067684: Better font substitutions
+ - S8067699, CVE-2015-0469: Better glyph storage
+ - S8068320, CVE-2015-0477: Limit applet requests
+ - S8068720, CVE-2015-0488: Better certificate options checking
+ - S8069198: Upgrade image library
+ - S8071726, CVE-2015-0478: Better RSA optimizations
+ - S8071818: Better vectorization on SPARC
+ - S8071931, CVE-2015-0460: Return of the phantom menace
* Backports
- S6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
- S6956398, PR2250: make ephemeral DH key match the length of the certificate key
+ - S7090424: TestGlyphVectorLayout failed automately with java.lang.StackOverflowError
- S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running
- S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called
- S7195480: javax.smartcardio does not detect cards on Mac OS X
@@ -47,9 +64,14 @@
- S8039050: Crash in C2 compiler at Node::rematerialize
- S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR))
- S8039319: (smartcardio) Card.transmitControlCommand() does not work on Mac OS X
+ - S8040228: TransformerConfigurationException occurs with security manager, FSP and XSLT Ext
+ - S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh fails to cleanup files after it
- S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request
+ - S8041740: Test sun/security/tools/keytool/ListKeychainStore.sh fails on Mac
+ - S8041979: sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms
- S8042059: Various fixes to linux/sparc
- S8042857: 14 stuck threads waiting for notification on LDAPRequest
+ - S8043123: Hard crash with access violation exception when blitting to very large image
- S8043200: Decrease the preference mode of RC4 in the enabled cipher suite list
- S8043205: Incorrect system traps.h include path
- S8043206: Fix signed vs. unsigned comparison warning in copy_sparc.hpp
@@ -68,8 +90,21 @@
- S8050167: linux-sparcv9: hs_err file does not show any stack information
- S8055714: Increment hsx 24.72 build to b04 for 7u72-b11
- S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure
+ - S8060072: Increment minor version of HSx for 7u79 and initialize the build number
+ - S8064454: [TEST_BUG] Test tools/javac/innerClassFile/Driver.sh fails for Mac and Linux
+ - S8064532: 7u76 build failed with # 8041979
+ - S8065072: sun/net/www/http/HttpClient/StreamingRetry.java failed intermittently
+ - S8065373: [macosx] jdk8, jdk7u60 Regression in Graphics2D drawing of derived Fonts
+ - S8065709: Deadlock in awt/logging apparently introduced by 8019623
+ - S8065991: LogManager unecessarily calls JavaAWTAccess from within a critical section
- S8068405: GenerateCurrencyData throws RuntimeException for old data
+ - S8071591: java/util/logging/LogManagerAppContextDeadlock.java test started to fail due to JDK-8065991
+ - S8072039: jdk7u79 l10n resource file translation update
+ - S8072042: (tz) Support tzdata2015a
+ - S8073226: Increment hsx 24.79 build to b02 for 7u79-b10
- S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels
+ - S8074662: Update 3rd party readme and license for LibPNG v 1.6.16
+ - S8075211: [TEST_BUG] Test sun/net/www/http/HttpClient/StreamingRetry.java fails with compilation error
* Bug fixes
- PR2196, RH1164762: jhat man page has broken URL
- PR2200: Support giflib 5.1.0
diff -r f8306c9c9a15 -r acdf8a8f85cf configure.ac
--- a/configure.ac Fri Apr 03 23:25:48 2015 +0100
+++ b/configure.ac Tue Apr 14 01:31:49 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.5pre02], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5.5], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
diff -r f8306c9c9a15 -r acdf8a8f85cf hotspot.map.in
--- a/hotspot.map.in Fri Apr 03 23:25:48 2015 +0100
+++ b/hotspot.map.in Tue Apr 14 01:31:49 2015 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4cb6ece5f073 43b37b7276a3c5d3314762a019f73345a7a67bd3cb336b9d631c11725b58e62e
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ cac66550581b d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb
aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef
diff -r f8306c9c9a15 -r acdf8a8f85cf patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Fri Apr 03 23:25:48 2015 +0100
+++ b/patches/boot/ecj-diamond.patch Tue Apr 14 01:31:49 2015 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-06 19:04:18.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-01-21 02:12:45.332175203 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-03-10 22:40:57.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2015-04-06 16:15:01.385763833 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-06 19:04:18.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-01-21 02:12:45.332175203 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-03-10 22:40:57.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-04-06 16:15:01.385763833 +0100
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -23,8 +23,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-06 19:04:18.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-03-10 22:40:57.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2015-04-06 16:15:01.385763833 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -43,9 +43,21 @@
}
for (WorkerThread wt : copy) {
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2015-04-06 16:25:19.808284787 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2015-04-06 16:25:35.244447602 +0100
+@@ -173,7 +173,7 @@
+ _parser = new Parser(this, useServicesMechanism);
+ _featureManager = featureManager;
+ _extensionClassLoader = null;
+- _externalExtensionFunctions = new HashMap<>();
++ _externalExtensionFunctions = new HashMap<String, Class>();
+ }
+
+ /**
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-21 02:08:09.636875446 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-04-06 15:52:38.819569528 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2015-04-06 16:15:01.385763833 +0100
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -67,8 +79,8 @@
final String javaName = (String) keys.nextElement();
final String[] mimes = parseMimeTypes(props.getProperty(javaName));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2015-04-06 16:15:01.385763833 +0100
@@ -63,9 +63,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -84,8 +96,8 @@
private Reference<ClassLoader> loader;
private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2015-04-06 16:15:01.385763833 +0100
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -105,8 +117,8 @@
CACHE.put(actual, map);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2015-04-06 16:15:01.385763833 +0100
@@ -45,7 +45,7 @@
private final Kind keyKind; // a reference kind for the cache keys
private final Kind valueKind; // a reference kind for the cache values
@@ -153,8 +165,8 @@
};
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2015-04-06 16:15:01.385763833 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -226,8 +238,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-21 02:08:09.668875834 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-04-06 15:52:38.875570121 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2015-04-06 16:15:01.389763876 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -290,8 +302,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-21 02:08:09.544874329 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-04-06 15:52:38.707568343 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2015-04-06 16:15:01.389763876 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -302,8 +314,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2015-04-06 16:15:01.389763876 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -340,8 +352,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2015-04-06 16:15:01.389763876 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -352,8 +364,8 @@
Coding x1 = codeMap.get(x0);
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2015-04-06 16:15:01.389763876 +0100
@@ -921,7 +921,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -382,8 +394,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-21 02:08:09.668875834 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-04-06 15:52:38.875570121 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2015-04-06 16:15:01.389763876 +0100
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -421,8 +433,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-01-21 02:12:45.336175251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2015-04-06 16:15:01.389763876 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -433,8 +445,8 @@
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-01-21 02:08:09.544874329 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-04-06 15:52:38.711568384 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2015-04-06 16:15:01.389763876 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -590,8 +602,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-01-21 02:08:09.672875883 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-04-06 15:52:38.875570121 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2015-04-06 16:15:01.389763876 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -705,8 +717,8 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-01-21 02:08:09.672875883 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-04-06 15:52:38.875570121 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2015-04-06 16:15:01.389763876 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -762,8 +774,8 @@
for (Class cls : pkg.classes) {
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2015-04-06 16:15:01.389763876 +0100
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -794,8 +806,8 @@
for (JarEntry je : Collections.list(jf.entries())) {
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2015-04-06 16:15:01.389763876 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -806,8 +818,8 @@
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-01-21 02:08:09.672875883 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-04-06 15:52:38.879570163 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2015-04-06 16:15:01.389763876 +0100
@@ -48,8 +48,8 @@
*/
@@ -838,8 +850,8 @@
while (res.remove(null));
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2015-04-06 16:15:01.393763918 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -860,8 +872,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-01-21 02:08:09.672875883 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-04-06 15:52:38.879570163 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2015-04-06 16:15:01.393763918 +0100
@@ -233,7 +233,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -872,8 +884,8 @@
String name = file.nameString;
JarEntry je = new JarEntry(Utils.getJarEntryName(name));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-01-21 02:08:09.672875883 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-04-06 15:52:38.879570163 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2015-04-06 16:15:01.393763918 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -884,8 +896,8 @@
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2015-04-06 16:15:01.393763918 +0100
@@ -56,7 +56,7 @@
// principal in the delegated subject
//
@@ -896,8 +908,8 @@
final String pname = p.getClass().getName() + "." + p.getName();
permissions.add(new SubjectDelegationPermission(pname));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2015-04-06 16:15:01.393763918 +0100
@@ -54,7 +54,7 @@
* Contains event dispatcher per thread group.
*/
@@ -908,8 +920,8 @@
/**
* Constructs a new AbstractLine.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2015-04-06 16:15:01.393763918 +0100
@@ -102,7 +102,7 @@
&& !SoundbankReader.class.equals(serviceClass)
&& !MidiFileWriter.class.equals(serviceClass)
@@ -920,8 +932,8 @@
providers = JSSecurityManager.getProviders(serviceClass);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2015-04-06 16:15:01.393763918 +0100
@@ -59,7 +59,7 @@
* dispatcher instance with a factory in EventDispatcher
*/
@@ -932,8 +944,8 @@
/**
* All RealTimeSequencers share this info object.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-01-08 20:19:49.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-01-21 02:12:45.340175299 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-04-06 15:23:57.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2015-04-06 16:15:01.393763918 +0100
@@ -231,7 +231,7 @@
* Create an empty ExecOptionPermissionCollection.
*/
@@ -944,8 +956,8 @@
}
More information about the distro-pkg-dev
mailing list