/hg/release/icedtea7-2.5: Sync with 2.5.1 tag.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 16 00:14:01 UTC 2014
changeset 4e0d6d141661 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=4e0d6d141661
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jul 16 00:52:19 2014 +0100
Sync with 2.5.1 tag.
PR1853: Revert PR729 from minor release
PR1864: PCSC + OpenJDK 1.7 crash on Fedora 20
PR1868: Avoid x86 workaround when running Zero rather than a JIT
S8029755, CVE-2014-4209: Enhance subject class
S8030763: Validate global memory allocation
S8031340, CVE-2014-4264: Better TLS/EC management
S8031346, CVE-2014-4244: Enhance RSA key handling
S8031540: Introduce document horizon
S8032536: JVM resolves wrong method in some unusual cases
S8033055: Issues in 2d
S8033301, CVE-2014-4266: Build more informative InfoBuilder
S8034267: Probabilistic native crash
S8034272: Do not cram data into CRAM arrays
S8034985, CVE-2014-2483: Better form for Lambda Forms
S8035004, CVE-2014-4252: Provider provides less service
S8035009, CVE-2014-4218: Make Proxy representations consistent
S8035119, CVE-2014-4219: Fix exceptions to bytecode verification
S8035699, CVE-2014-4268: File choosers should be choosier
S8035788. CVE-2014-4221: Provide more consistency for lookups
S8035793, CVE-2014-4223: Maximum arity maxed out
S8036571: (process) Process process arguments carefully
S8036800: Attribute OOM to correct part of code
S8037046: Validate libraries to be loaded
S8037076, CVE-2014-2490: Check constant pool constants
S8037157: Verify <init> call
S8037162, CVE-2014-4263: More robust DH exchanges
S8037167, CVE-2014-4216: Better method signature resolution
S8039520, CVE-2014-4262: More atomicity of atomic updates
S8001108: an attempt to use "<init>" as a method name should elicit NoSuchMethodException
S8001109: arity mismatch on a call to spreader method handle should elicit IllegalArgumentException
S8013611: Modal dialog fails to obtain keyboard focus
S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale
S8019990: IM candidate window appears on the South-East corner of the display.
S8023990: Regression: postscript size increase from 6u18
S8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError
S8024616: JSR292: lazily initialize core NamedFunctions used for bootstrapping
S8025030: Enhance stream handling
S8026188: Enhance envelope factory
S8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently
S8028285: RMI Thread can no longer call out to AWT
S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
S8031075: [Regression] focus disappears with shift+tab on dialog having one focus component
S8032585: JSR292: IllegalAccessError when attempting to invoke protected method from different package
S8032686: Issues with method invoke
S8033278: Missed access checks for Lookup.unreflect* after 8032585
S8033618: Correct logging output
S8034926: Attribute classes properly
S8035613: With active Securitymanager JAXBContext.newInstance fails
S8035834: InetAddress.getLocalHost() can hang after JDK-8030731 was fixed
S8035923: Set minor version for hotspot in 7u65 to 65 and build number to b01
S8036786: Update jdk7 testlibrary to match jdk8
S8036794: Manage JavaScript instances
S8039324: Increment hsx 24.65 build to b02 for 7u65-b07
S8040156: Increment hsx 24.65 build to b03 for 7u65-b08
S8041264: Increment hsx 24.65 build to b04 for 7u65-b09
S8042264: 7u65 l10n resource file translation update 1
S8042582: Test java/awt/KeyboardFocusmanager/ChangeKFMTest/ChangeKFMTest.html fails on Windows x64
S8042590: Running form URL throws NPE
S8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader
S8043012: (tz) Support tzdata2014c
2014-07-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 65.
(BUILD_VERSION): Bump to b32.
(CORBA_CHANGESET): Update to icedtea-2.5.1 tag.
(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.
(ICEDTEA_URL): Use PACKAGE_VERSION instead of
branch so old versions from the same branch
aren't overwritten.
* NEWS: Updated.
* configure.ac: Bump to 2.5.1.
* hotspot.map: Update to icedtea-2.5.1 tag.
* patches/boot/ecj-diamond.patch:
Regenerated.
diffstat:
ChangeLog | 26 +
Makefile.am | 30 +-
NEWS | 64 ++
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 1136 +++++++++++++++++++--------------------
6 files changed, 669 insertions(+), 591 deletions(-)
diffs (truncated from 3199 to 500 lines):
diff -r d6f5bb3ba579 -r 4e0d6d141661 ChangeLog
--- a/ChangeLog Wed Jun 25 12:44:45 2014 -0400
+++ b/ChangeLog Wed Jul 16 00:52:19 2014 +0100
@@ -1,3 +1,29 @@
+2014-07-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 65.
+ (BUILD_VERSION): Bump to b32.
+ (CORBA_CHANGESET): Update to icedtea-2.5.1 tag.
+ (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.
+ (ICEDTEA_URL): Use PACKAGE_VERSION instead of
+ branch so old versions from the same branch
+ aren't overwritten.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.5.1.
+ * hotspot.map: Update to icedtea-2.5.1 tag.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated.
+
2014-06-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Set to 2.5.1pre.
diff -r d6f5bb3ba579 -r 4e0d6d141661 Makefile.am
--- a/Makefile.am Wed Jun 25 12:44:45 2014 -0400
+++ b/Makefile.am Wed Jul 16 00:52:19 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
-JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b30
+JDK_UPDATE_VERSION = 65
+BUILD_VERSION = b32
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 32c25f3ecdf6
-JAXP_CHANGESET = 6b28d9218dac
-JAXWS_CHANGESET = f1f1ade53c01
-JDK_CHANGESET = 9705894e1370
-LANGTOOLS_CHANGESET = f70c7b796422
-OPENJDK_CHANGESET = 6a4e58702235
+CORBA_CHANGESET = 895c6b104996
+JAXP_CHANGESET = 59a1a3e44108
+JAXWS_CHANGESET = b5384b2fb987
+JDK_CHANGESET = d6d4b6c9f5b4
+LANGTOOLS_CHANGESET = 4c827dc3de05
+OPENJDK_CHANGESET = 483622a291d7
-CORBA_SHA256SUM = 1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253
-JAXP_SHA256SUM = 59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488
-JAXWS_SHA256SUM = ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028
-JDK_SHA256SUM = 508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83
-LANGTOOLS_SHA256SUM = 0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659
-OPENJDK_SHA256SUM = 9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859
+CORBA_SHA256SUM = d476f22db32e028cc30dda47fec81e5ba0e113f029c3ed7a30edf8fc1404819b
+JAXP_SHA256SUM = d13778e5bbf6cda22a40b9d5186d2a7d1a3f34d998b1ac4d65fe3abd12fffa25
+JAXWS_SHA256SUM = 29c39856af1153620023c3fa0313be2f23dc02208db1a8429ca80d1eebfce06f
+JDK_SHA256SUM = 76194344fca5db4c79e4a2af28efd9fbb2e38e879b5afc59042874519bb5f7fc
+LANGTOOLS_SHA256SUM = 374174ea3b7eb2bb81d9dfae4749d7b3c9037d07004aa59aaa5e8ed5fba922d3
+OPENJDK_SHA256SUM = 0496072760c521aa184f3c26c1f515a89ef6f9a88df14fa888c6ee6cdd9379b7
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -36,7 +36,7 @@
ICEDTEA_BRANCH = 2.5
ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest-$(ICEDTEA_BRANCH)
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
-ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(ICEDTEA_BRANCH)
+ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(PACKAGE_VERSION)
HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
diff -r d6f5bb3ba579 -r 4e0d6d141661 NEWS
--- a/NEWS Wed Jun 25 12:44:45 2014 -0400
+++ b/NEWS Wed Jul 16 00:52:19 2014 +0100
@@ -14,6 +14,70 @@
New in release 2.5.1 (2014-07-XX):
+* Security fixes
+ - S8029755, CVE-2014-4209: Enhance subject class
+ - S8030763: Validate global memory allocation
+ - S8031340, CVE-2014-4264: Better TLS/EC management
+ - S8031346, CVE-2014-4244: Enhance RSA key handling
+ - S8031540: Introduce document horizon
+ - S8032536: JVM resolves wrong method in some unusual cases
+ - S8033055: Issues in 2d
+ - S8033301, CVE-2014-4266: Build more informative InfoBuilder
+ - S8034267: Probabilistic native crash
+ - S8034272: Do not cram data into CRAM arrays
+ - S8034985, CVE-2014-2483: Better form for Lambda Forms
+ - S8035004, CVE-2014-4252: Provider provides less service
+ - S8035009, CVE-2014-4218: Make Proxy representations consistent
+ - S8035119, CVE-2014-4219: Fix exceptions to bytecode verification
+ - S8035699, CVE-2014-4268: File choosers should be choosier
+ - S8035788. CVE-2014-4221: Provide more consistency for lookups
+ - S8035793, CVE-2014-4223: Maximum arity maxed out
+ - S8036571: (process) Process process arguments carefully
+ - S8036800: Attribute OOM to correct part of code
+ - S8037046: Validate libraries to be loaded
+ - S8037076, CVE-2014-2490: Check constant pool constants
+ - S8037157: Verify <init> call
+ - S8037162, CVE-2014-4263: More robust DH exchanges
+ - S8037167, CVE-2014-4216: Better method signature resolution
+ - S8039520, CVE-2014-4262: More atomicity of atomic updates
+* Backports
+ - S8001108: an attempt to use "<init>" as a method name should elicit NoSuchMethodException
+ - S8001109: arity mismatch on a call to spreader method handle should elicit IllegalArgumentException
+ - S8013611: Modal dialog fails to obtain keyboard focus
+ - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale
+ - S8019990: IM candidate window appears on the South-East corner of the display.
+ - S8023990: Regression: postscript size increase from 6u18
+ - S8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError
+ - S8024616: JSR292: lazily initialize core NamedFunctions used for bootstrapping
+ - S8025030: Enhance stream handling
+ - S8026188: Enhance envelope factory
+ - S8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently
+ - S8028285: RMI Thread can no longer call out to AWT
+ - S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
+ - S8031075: [Regression] focus disappears with shift+tab on dialog having one focus component
+ - S8032585: JSR292: IllegalAccessError when attempting to invoke protected method from different package
+ - S8032686: Issues with method invoke
+ - S8033278: Missed access checks for Lookup.unreflect* after 8032585
+ - S8033618: Correct logging output
+ - S8034926: Attribute classes properly
+ - S8035613: With active Securitymanager JAXBContext.newInstance fails
+ - S8035834: InetAddress.getLocalHost() can hang after JDK-8030731 was fixed
+ - S8035923: Set minor version for hotspot in 7u65 to 65 and build number to b01
+ - S8036786: Update jdk7 testlibrary to match jdk8
+ - S8036794: Manage JavaScript instances
+ - S8039324: Increment hsx 24.65 build to b02 for 7u65-b07
+ - S8040156: Increment hsx 24.65 build to b03 for 7u65-b08
+ - S8041264: Increment hsx 24.65 build to b04 for 7u65-b09
+ - S8042264: 7u65 l10n resource file translation update 1
+ - S8042582: Test java/awt/KeyboardFocusmanager/ChangeKFMTest/ChangeKFMTest.html fails on Windows x64
+ - S8042590: Running form URL throws NPE
+ - S8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader
+ - S8043012: (tz) Support tzdata2014c
+* Bug fixes
+ - PR1853: Revert PR729 from minor release
+ - PR1864: PCSC + OpenJDK 1.7 crash on Fedora 20
+ - PR1868: Avoid x86 workaround when running Zero rather than a JIT
+
New in release 2.5.0 (2014-06-13):
* OpenJDK
diff -r d6f5bb3ba579 -r 4e0d6d141661 configure.ac
--- a/configure.ac Wed Jun 25 12:44:45 2014 -0400
+++ b/configure.ac Wed Jul 16 00:52:19 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.1pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5.1], [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 d6f5bb3ba579 -r 4e0d6d141661 hotspot.map
--- a/hotspot.map Wed Jun 25 12:44:45 2014 -0400
+++ b/hotspot.map Wed Jul 16 00:52:19 2014 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/2.5 5dc3dd2819c8 645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26
+default drop http://icedtea.classpath.org/download/drops/icedtea7/2.5 02066294d005 78d57f7c207d8f56bba2ee6aec232a836fd51830d352cfa4804d8077d9a7b32b
aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/2.5 d17532dbc6a7 3ad1f3116d30fb937719c6c462e070d689170dcf99173f785a9b13db074e1938
diff -r d6f5bb3ba579 -r 4e0d6d141661 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Jun 25 12:44:45 2014 -0400
+++ b/patches/boot/ecj-diamond.patch Wed Jul 16 00:52:19 2014 +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 2014-04-17 17:52:18.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-07-15 22:47:38.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-07-15 23:17:03.375226216 +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 2014-04-17 17:52:18.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-07-15 22:47:38.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-07-15 23:17:03.375226216 +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 2014-04-17 17:52:18.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-07-15 22:47:38.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-07-15 23:17:03.375226216 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,8 @@
for (WorkerThread wt : copy) {
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 2014-04-18 05:21:17.197587007 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-07-15 23:15:12.177527771 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-07-15 23:17:03.375226216 +0100
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -67,8 +67,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-07-15 23:17:03.375226216 +0100
@@ -63,9 +63,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -84,8 +84,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-07-15 23:17:03.375226216 +0100
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -105,8 +105,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-04-18 05:22:34.006722160 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-07-15 23:17:03.375226216 +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 +153,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-07-15 23:17:03.375226216 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -226,8 +226,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 2014-04-18 05:21:17.213587245 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-07-15 23:15:12.237528687 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-07-15 23:17:03.375226216 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -290,8 +290,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 2014-04-18 05:21:16.089570632 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-07-15 23:15:12.069526120 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-07-15 23:17:03.375226216 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -302,8 +302,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-07-15 23:17:03.375226216 +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 +340,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-07-15 23:17:03.375226216 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -352,8 +352,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-07-15 23:17:03.375226216 +0100
@@ -921,7 +921,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -382,8 +382,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 2014-04-18 05:21:17.217587303 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-07-15 23:15:12.237528687 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-07-15 23:17:03.375226216 +0100
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -421,8 +421,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-07-15 23:17:03.375226216 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -433,8 +433,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 2014-04-18 05:21:16.093570691 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-07-15 23:15:12.073526180 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-07-15 23:17:03.375226216 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -590,8 +590,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 2014-04-18 05:21:17.217587303 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-07-15 23:15:12.241528748 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-07-15 23:17:03.375226216 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -705,8 +705,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 2014-04-18 05:21:17.217587303 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-07-15 23:15:12.241528748 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-07-15 23:17:03.379226275 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -762,8 +762,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-04-18 05:22:34.010722218 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-07-15 23:17:03.379226275 +0100
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -794,8 +794,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-07-15 23:17:03.379226275 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -806,8 +806,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 2014-04-18 05:21:17.217587303 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-07-15 23:15:12.241528748 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-07-15 23:17:03.379226275 +0100
@@ -48,8 +48,8 @@
*/
@@ -838,8 +838,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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-07-15 23:17:03.379226275 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -860,8 +860,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 2014-04-18 05:21:17.217587303 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-07-15 23:15:12.241528748 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-07-15 23:17:03.379226275 +0100
@@ -233,7 +233,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -872,8 +872,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 2014-04-18 05:21:17.217587303 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-07-15 23:15:12.241528748 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-07-15 23:17:03.379226275 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -884,32 +884,20 @@
// 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 2014-04-11 14:11:25.841801783 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-04-11 14:24:28.078759639 +0100
-@@ -60,9 +60,9 @@
- }
- if (principalsCache == null || accCache == null) {
- principalsCache =
-- new CacheMap<>(PRINCIPALS_CACHE_SIZE);
-+ new CacheMap<Subject, Principal[]>(PRINCIPALS_CACHE_SIZE);
- accCache =
-- new CacheMap<>(ACC_CACHE_SIZE);
-+ new CacheMap<Subject, AccessControlContext>(ACC_CACHE_SIZE);
- }
-
- // Retrieve the principals for the given
-@@ -106,7 +106,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-07-15 23:18:11.116260222 +0100
+@@ -56,7 +56,7 @@
// principal in the delegated subject
//
- final Principal[] dp = delegatedPrincipals;
-- final Collection<Permission> permissions = new ArrayList<>(dp.length);
-+ final Collection<Permission> permissions = new ArrayList<Permission>(dp.length);
- for(Principal p : dp) {
+ Collection<Principal> ps = getSubjectPrincipals(delegatedSubject);
+- final Collection<Permission> permissions = new ArrayList<>(ps.size());
++ final Collection<Permission> permissions = new ArrayList<Permission>(ps.size());
+ for(Principal p : ps) {
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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-07-15 23:17:03.379226275 +0100
@@ -54,7 +54,7 @@
* Contains event dispatcher per thread group.
*/
@@ -919,9 +907,21 @@
/**
* 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 2014-07-15 23:03:29.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-07-15 23:17:03.455227437 +0100
+@@ -102,7 +102,7 @@
+ && !SoundbankReader.class.equals(serviceClass)
+ && !MidiFileWriter.class.equals(serviceClass)
+ && !MidiFileReader.class.equals(serviceClass)) {
+- providers = new ArrayList<>(0);
++ providers = new ArrayList<Object>(0);
+ } else {
+ 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 2014-04-17 22:51:43.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-04-18 05:22:34.014722277 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-07-15 23:03:29.000000000 +0100
More information about the distro-pkg-dev
mailing list