/hg/release/icedtea7-2.6: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Jul 21 18:18:33 UTC 2015


changeset b8d84923480c in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=b8d84923480c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 21 11:22:20 2015 +0100

	Bump to icedtea-2.6.1

	Upstream changes:
	  - Bump to icedtea-2.6.1
	  - OPENJDK7-01: Allow OpenJDK to build on PaX-enabled kernels
	  - OPENJDK7-02: Fix build where PAX_COMMAND is not specified
	  - OPENJDK7-03: Only apply PaX-marking when needed by a running PaX kernel
	  - OPENJDK7-04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit
	  - OPENJDK7-05: Fix mistake in 8075374 backport
	  - PR2487: Make jdk8 mode the default for jdk.tls.ephemeralDHKeySize
	  - PR2501: libjavasctp.so doesn't need to link against libdl when linking against libsctp
	  - PR2502: Remove -fno-tree-vectorize workaround now http://gcc.gnu.org/PR63341 is fixed
	  - PR2503: Add existence check for all optional dependencies in jdk_generic_profile.sh
	  - PR2521: Systems with a GLib without libgio segfault when obtaining proxy information
	  - S7124253: [macosx] Flavor change notification not coming
	  - S8007219: [macosx] Frame size reverts meaning of maximized attribute if frame size close to display
	  - S8013581: [macosx] Key Bindings break with awt GraphicsEnvironment setFullScreenWindow
	  - S8014464: Update jcheck for OpenJDK 7
	  - S8020210: [macosx] JVM crashes in CWrapper$NSWindow.screen(long)
	  - S8027058: sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Failed to initialize connector
	  - S8027561: [macosx] Cleanup "may not respond to selector" warnings in native code
	  - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed
	  - S8029868: Fix KSS issues in sun.lwawt.macosx
	  - S8042205: javax/management/monitor/*: some tests didn't  get all the notifications
	  - S8043201: Deprecate RC4 in SunJSSE provider
	  - S8043202: Prohibit RC4 cipher suites
	  - S8046817: JDK 8 schemagen tool does not generate xsd files for enum types
	  - S8048194: GSSContext.acceptSecContext fails when a supported mech is not initiator preferred
	  - S8048214: Linker error when compiling G1SATBCardTableModRefBS after include order changes
	  - S8064546: CipherInputStream throws BadPaddingException if stream is not fully read
	  - S8065764: javax/management/monitor/CounterMonitorTest.java hangs
	  - S8066952: [TEST-BUG] javax/management/monitor/CounterMonitorTest.java hangs
	  - S8067694: Improved certification checking
	  - S8068674: Increment minor version of HSx for 7u85 and initialize the build number
	  - S8071668: [macosx] Clipboard does not work with 3rd parties Clipboard Managers
	  - S8071715: Tune font layout engine
	  - S8071731: Better scaling for C1
	  - S8072490: Better font morphing redux
	  - S8072887: Better font handling improvements
	  - S8073334: Improved font substitutions
	  - S8073357: schema1.xsd has wrong content. Sequence of the enum values has been changed
	  - S8073385: Bad error message on parsing illegal character in XML attribute
	  - S8073773: Presume path preparedness
	  - S8073894: Getting to the root of certificate chains
	  - S8074098: 2D_Font/Bug8067699 test fails with SIGBUS crash on Solaris Sparc
	  - S8074297: substring in XSLT returns wrong character if string contains supplementary chars
	  - S8074312: Enable hotspot builds on 4.x Linux kernels
	  - S8074330: Set font anchors more solidly
	  - S8074335: Substitute for substitution formats
	  - S8074865: General crypto resilience changes
	  - S8074871: Adjust device table handling
	  - S8075374: Responding to OCSP responses
	  - S8075378: JNDI DnsClient Exception Handling
	  - S8075575: com/sun/security/auth/login/ConfigFile/InconsistentError.java failed in certain env.
	  - S8075576: com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java failed in certain env.
	  - S8075667: (tz) Support tzdata2015b
	  - S8075738: Better multi-JVM sharing
	  - S8075833: Straighter Elliptic Curves
	  - S8075838: Method for typing MethodTypes
	  - S8075853: Proxy for MBean proxies
	  - S8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297
	  - S8076328: Enforce key exchange constraints
	  - S8076376: Enhance IIOP operations
	  - S8076397: Better MBean connections
	  - S8076401: Serialize OIS data
	  - S8076405: Improve serial serialization
	  - S8076409: Reinforce RMI framework
	  - S8077520: Morph tables into improved form
	  - S8077685: (tz) Support tzdata2015d
	  - S8078348: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with BindException
	  - S8078439: SPNEGO auth fails if client proposes MS krb5 OID
	  - S8078529: Increment the build value to b02 for hs24.85 in 8u85
	  - S8078562: Add modified dates
	  - S8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
	  - S8080318: jdk8u51 l10n resource file translation update
	  - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
	  - S8081622: Increment the build value to b03 for hs24.85 in 8u51
	  - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12
	  - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.

	2015-07-21  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		(JDK_UPDATE_VERSION): Set to 85.
		(BUILD_VERSION): Set to b01.
		(CORBA_CHANGESET): Update to icedtea-2.6.1.
		(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_BRANCH): Split out branch version ('2.6')
		(ICEDTEA_PREFIX): Use ICEDTEA_MAJOR and ICEDTEA_BRANCH.
		(ICEDTEA_HG_URL): Use release branch.
		* NEWS: Add 2.6.1 section and update with fixes.
		* configure.ac: Bump to 2.6.1.
		* hotspot.map.in: Update to icedtea-2.6.1.
		* patches/boot/ecj-diamond.patch:
		Regenerated without SSLAlgorithmConstraints
		patch. Added new cases in
		sun.security.util.AlgorithmDecomposer,
		sun.security.ssl.SSLAlgorithmDecomposer and
		sun.security.util.LegacyAlgorithmConstraints.
		* patches/boot/ecj-multicatch.patch:
		Add cases in com.apple.laf.AquaUtils,
		sun.security.ssl.ECDHCrypt and Notepad.java
		demo code. Update CipherInputStream case.


changeset 6f3dd5093b13 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=6f3dd5093b13
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 21 18:21:57 2015 +0100

	Added tag icedtea-2.6.1 for changeset b8d84923480c


diffstat:

 .hgtags                           |     1 +
 ChangeLog                         |    34 +
 Makefile.am                       |    35 +-
 NEWS                              |    79 ++
 configure.ac                      |     2 +-
 hotspot.map.in                    |     2 +-
 patches/boot/ecj-diamond.patch    |  1228 ++++++++++++++++++------------------
 patches/boot/ecj-multicatch.patch |   388 ++++++-----
 8 files changed, 972 insertions(+), 797 deletions(-)

diffs (truncated from 3968 to 500 lines):

diff -r 8fafdbf094eb -r 6f3dd5093b13 .hgtags
--- a/.hgtags	Sun Jul 19 18:11:09 2015 +0100
+++ b/.hgtags	Tue Jul 21 18:21:57 2015 +0100
@@ -58,3 +58,4 @@
 3e3f044261cd82b41738f5dcc39b5edff40302e6 icedtea-2.6.0pre24
 04264787379db3f91a819d38094c31e722dbb592 icedtea-2.6.0
 a72975789761e157c95faacd8ce44f6f8322a85d icedtea-2.6-branchpoint
+b8d84923480c04deac3d2d34bed05e74a23c8759 icedtea-2.6.1
diff -r 8fafdbf094eb -r 6f3dd5093b13 ChangeLog
--- a/ChangeLog	Sun Jul 19 18:11:09 2015 +0100
+++ b/ChangeLog	Tue Jul 21 18:21:57 2015 +0100
@@ -1,3 +1,37 @@
+2015-07-21  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Set to 85.
+	(BUILD_VERSION): Set to b01.
+	(CORBA_CHANGESET): Update to icedtea-2.6.1.
+	(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_BRANCH): Split out branch version ('2.6')
+	(ICEDTEA_PREFIX): Use ICEDTEA_MAJOR and ICEDTEA_BRANCH.
+	(ICEDTEA_HG_URL): Use release branch.
+	* NEWS: Add 2.6.1 section and update with fixes.
+	* configure.ac: Bump to 2.6.1.
+	* hotspot.map.in: Update to icedtea-2.6.1.
+	* patches/boot/ecj-diamond.patch:
+	Regenerated without SSLAlgorithmConstraints
+	patch. Added new cases in
+	sun.security.util.AlgorithmDecomposer,
+	sun.security.ssl.SSLAlgorithmDecomposer and
+	sun.security.util.LegacyAlgorithmConstraints.
+	* patches/boot/ecj-multicatch.patch:
+	Add cases in com.apple.laf.AquaUtils,
+	sun.security.ssl.ECDHCrypt and Notepad.java
+	demo code. Update CipherInputStream case.
+
 2015-07-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* NEWS: Fix placement of CACAO and
diff -r 8fafdbf094eb -r 6f3dd5093b13 Makefile.am
--- a/Makefile.am	Sun Jul 19 18:11:09 2015 +0100
+++ b/Makefile.am	Tue Jul 21 18:21:57 2015 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 80
-BUILD_VERSION = b32
+JDK_UPDATE_VERSION = 85
+BUILD_VERSION = b01
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = e3445769412d
-JAXP_CHANGESET = e3b08dc13807
-JAXWS_CHANGESET = 299588405837
-JDK_CHANGESET = 2db5e90a399b
-LANGTOOLS_CHANGESET = bc95d2472055
-OPENJDK_CHANGESET = dbfa75121aca
-
-CORBA_SHA256SUM = 5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb
-JAXP_SHA256SUM = 8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07
-JAXWS_SHA256SUM = 816a6d7a4bd302871d73f5681f6b35459000d76bfb9fa04b3479ffb630dc39f5
-JDK_SHA256SUM = 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c
-LANGTOOLS_SHA256SUM = 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661
-OPENJDK_SHA256SUM = 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b
+CORBA_CHANGESET = 2545636482d6
+JAXP_CHANGESET = ffbe529eeac7
+JAXWS_CHANGESET = b9776fab65b8
+JDK_CHANGESET = 61d3e001dee6
+LANGTOOLS_CHANGESET = 9c6e1de67d7d
+OPENJDK_CHANGESET = 39b2c4354d0a
+
+CORBA_SHA256SUM = cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8
+JAXP_SHA256SUM = c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb
+JAXWS_SHA256SUM = 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f
+JDK_SHA256SUM = a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363
+LANGTOOLS_SHA256SUM = 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43
+OPENJDK_SHA256SUM = 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -33,8 +33,9 @@
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
 
 ICEDTEA_MAJOR = icedtea7
-ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest
-ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
+ICEDTEA_BRANCH = 2.6
+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_RELEASE)
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
diff -r 8fafdbf094eb -r 6f3dd5093b13 NEWS
--- a/NEWS	Sun Jul 19 18:11:09 2015 +0100
+++ b/NEWS	Tue Jul 21 18:21:57 2015 +0100
@@ -9,9 +9,88 @@
 LPX - https://bugs.launchpad.net/bugs/X
 JSRX - http://jcp.org/en/jsr/detail?id=X
 JEPX - http://openjdk.java.net/jeps/X
+OJX - http://java.net/jira/browse/OPENJDK7-X
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 2.6.1 (2015-07-21):
+
+* Security fixes
+  - S8043202, CVE-2015-2808: Prohibit RC4 cipher suites
+  - S8067694, CVE-2015-2625: Improved certification checking
+  - S8071715, CVE-2015-4760: Tune font layout engine
+  - S8071731: Better scaling for C1
+  - S8072490: Better font morphing redux
+  - S8072887: Better font handling improvements
+  - S8073334: Improved font substitutions
+  - S8073773: Presume path preparedness
+  - S8073894: Getting to the root of certificate chains
+  - S8074330: Set font anchors more solidly
+  - S8074335: Substitute for substitution formats
+  - S8074865, CVE-2015-2601: General crypto resilience changes
+  - S8074871: Adjust device table handling
+  - S8075374, CVE-2015-4748: Responding to OCSP responses
+  - S8075378, CVE-2015-4749: JNDI DnsClient Exception Handling
+  - S8075738: Better multi-JVM sharing
+  - S8075833, CVE-2015-2613: Straighter Elliptic Curves
+  - S8075838: Method for typing MethodTypes
+  - S8075853, CVE-2015-2621: Proxy for MBean proxies
+  - S8076328, CVE-2015-4000: Enforce key exchange constraints
+  - S8076376, CVE-2015-2628: Enhance IIOP operations
+  - S8076397, CVE-2015-4731: Better MBean connections
+  - S8076401, CVE-2015-2590: Serialize OIS data
+  - S8076405, CVE-2015-4732: Improve serial serialization
+  - S8076409, CVE-2015-4733: Reinforce RMI framework
+  - S8077520, CVE-2015-2632: Morph tables into improved form
+  - PR2487, CVE-2015-4000: Make jdk8 mode the default for jdk.tls.ephemeralDHKeySize
+* OpenJDK
+  - S7124253: [macosx] Flavor change notification not coming
+  - S8007219: [macosx] Frame size reverts meaning of maximized attribute if frame size close to display
+  - S8013581: [macosx] Key Bindings break with awt GraphicsEnvironment setFullScreenWindow
+  - S8014464: Update jcheck for OpenJDK 7
+  - S8020210: [macosx] JVM crashes in CWrapper$NSWindow.screen(long)
+  - S8027058: sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Failed to initialize connector
+  - S8027561: [macosx] Cleanup "may not respond to selector" warnings in native code
+  - S8029868: Fix KSS issues in sun.lwawt.macosx
+  - S8042205: javax/management/monitor/*: some tests didn't  get all the notifications
+  - S8043201: Deprecate RC4 in SunJSSE provider
+  - S8046817: JDK 8 schemagen tool does not generate xsd files for enum types
+  - S8048194: GSSContext.acceptSecContext fails when a supported mech is not initiator preferred
+  - S8064546: CipherInputStream throws BadPaddingException if stream is not fully read
+  - S8065764: javax/management/monitor/CounterMonitorTest.java hangs
+  - S8066952: [TEST-BUG] javax/management/monitor/CounterMonitorTest.java hangs
+  - S8068674: Increment minor version of HSx for 7u85 and initialize the build number
+  - S8071668: [macosx] Clipboard does not work with 3rd parties Clipboard Managers
+  - S8073357: schema1.xsd has wrong content. Sequence of the enum values has been changed
+  - S8073385: Bad error message on parsing illegal character in XML attribute
+  - S8074098: 2D_Font/Bug8067699 test fails with SIGBUS crash on Solaris Sparc
+  - S8074297: substring in XSLT returns wrong character if string contains supplementary chars
+  - S8075575: com/sun/security/auth/login/ConfigFile/InconsistentError.java failed in certain env.
+  - S8075576: com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java failed in certain env.
+  - S8075667: (tz) Support tzdata2015b
+  - S8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297
+  - S8077685: (tz) Support tzdata2015d
+  - S8078348: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with BindException
+  - S8078439: SPNEGO auth fails if client proposes MS krb5 OID
+  - S8078529: Increment the build value to b02 for hs24.85 in 7u85
+  - S8078562: Add modified dates
+  - S8080318: jdk8u51 l10n resource file translation update
+  - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
+  - S8081622: Increment the build value to b03 for hs24.85 in 7u85
+  - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12
+  - OJ01: Allow OpenJDK to build on PaX-enabled kernels
+  - OJ02: Fix build where PAX_COMMAND is not specified
+  - OJ03: Only apply PaX-marking when needed by a running PaX kernel
+  - OJ04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit
+  - OJ05: Fix mistake in 8075374 backport
+* Backports
+  - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
+* Bug fixes
+  - PR2501: libjavasctp.so doesn't need to link against libdl when linking against libsctp
+  - PR2502: Remove -fno-tree-vectorize workaround now http://gcc.gnu.org/PR63341 is fixed
+  - PR2503: Add existence check for all optional dependencies in jdk_generic_profile.sh
+  - PR2521: Systems with a GLib without libgio segfault when obtaining proxy information
+
 New in release 2.6.0 (2015-07-17):
 
 * OpenJDK
diff -r 8fafdbf094eb -r 6f3dd5093b13 configure.ac
--- a/configure.ac	Sun Jul 19 18:11:09 2015 +0100
+++ b/configure.ac	Tue Jul 21 18:21:57 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.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 8fafdbf094eb -r 6f3dd5093b13 hotspot.map.in
--- a/hotspot.map.in	Sun Jul 19 18:11:09 2015 +0100
+++ b/hotspot.map.in	Tue Jul 21 18:21:57 2015 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 94f15794d5e7 8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ b19bc5aeaa09 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3
diff -r 8fafdbf094eb -r 6f3dd5093b13 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch	Sun Jul 19 18:11:09 2015 +0100
+++ b/patches/boot/ecj-diamond.patch	Tue Jul 21 18:21:57 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-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-06-12 23:34:39.974231621 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-07-21 02:17:38.248674954 +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/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-07-21 02:17:38.248674954 +0100
 @@ -50,7 +50,7 @@
       */
      private class HookPutFields extends ObjectOutputStream.PutField
@@ -23,8 +23,8 @@
          /**
           * Put the value of the named boolean field into the persistent field.
 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-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-07-21 02:17:38.248674954 +0100
 @@ -1315,7 +1315,7 @@
      protected void shutdownServants(boolean wait_for_completion) {
          Set<ObjectAdapterFactory> oaset;
@@ -35,8 +35,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-06-12 17:38:31.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-07-21 02:17:38.248674954 +0100
 @@ -108,7 +108,7 @@
      private ThreadGroup threadGroup;
  
@@ -56,8 +56,8 @@
  
          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-06-12 17:38:32.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-07-19 18:19:26.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-07-21 02:17:38.248674954 +0100
 @@ -173,7 +173,7 @@
          _parser = new Parser(this, useServicesMechanism);
          _featureManager = featureManager;
@@ -68,8 +68,8 @@
  
      /**
 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-06-12 23:14:47.187405507 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-07-21 02:15:51.110542469 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-07-21 02:17:38.248674954 +0100
 @@ -297,8 +297,8 @@
      //
      private final static class EncodingInfos {
@@ -91,8 +91,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-07-21 02:17:38.248674954 +0100
 @@ -63,9 +63,10 @@
   */
  public final class DocumentHandler extends DefaultHandler {
@@ -108,8 +108,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-07-21 02:17:38.248674954 +0100
 @@ -46,7 +46,7 @@
   */
  public final class TypeResolver {
@@ -129,8 +129,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-07-21 02:17:38.248674954 +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
@@ -177,8 +177,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-07-21 02:17:38.248674954 +0100
 @@ -104,9 +104,9 @@
          return this.def.compareTo(that.def);
      }
@@ -250,8 +250,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-07-21 02:15:51.194541005 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-07-21 02:17:38.252674884 +0100
 @@ -257,7 +257,7 @@
          assert(basicCodings[_meta_default] == null);
          assert(basicCodings[_meta_canon_min] != null);
@@ -314,8 +314,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-06-12 23:14:47.135406443 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-07-21 02:15:51.038543724 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-07-21 02:17:38.252674884 +0100
 @@ -466,7 +466,7 @@
  
      void readInnerClasses(Class cls) throws IOException {
@@ -326,8 +326,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-07-21 02:17:38.252674884 +0100
 @@ -743,9 +743,9 @@
          // Steps 1/2/3 are interdependent, and may be iterated.
          // Steps 4 and 5 may be decided independently afterward.
@@ -364,8 +364,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-06-12 23:34:39.978231551 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-07-21 02:17:38.252674884 +0100
 @@ -402,7 +402,7 @@
      private static Map<Coding, Coding> codeMap;
  
@@ -376,8 +376,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-07-21 02:17:38.252674884 +0100
 @@ -921,7 +921,7 @@
      public static
      Index[] partition(Index ix, int[] keys) {
@@ -406,8 +406,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-07-21 02:15:51.194541005 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-07-21 02:17:38.252674884 +0100
 @@ -61,7 +61,7 @@
                  ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
  
@@ -445,8 +445,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-07-21 02:17:38.252674884 +0100
 @@ -45,7 +45,7 @@
      private final ArrayList<E> flist;
  
@@ -457,8 +457,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-06-12 23:14:47.135406443 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-07-21 02:15:51.038543724 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-07-21 02:17:38.252674884 +0100
 @@ -112,7 +112,7 @@
      public static final Attribute.Layout attrSourceFileSpecial;
      public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -614,8 +614,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-07-21 02:15:51.194541005 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-07-21 02:17:38.252674884 +0100
 @@ -686,7 +686,7 @@
          cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
          cp_Signature_classes.readFrom(in);
@@ -729,8 +729,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-07-21 02:15:51.198540936 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-07-21 02:17:38.252674884 +0100
 @@ -116,7 +116,7 @@
      int[][]     attrCounts;       // count attr. occurences
  
@@ -786,8 +786,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-07-21 02:17:38.252674884 +0100
 @@ -183,8 +183,8 @@
          final Map<Attribute.Layout, Attribute> attrDefs;
          final Map<Attribute.Layout, String> attrCommands;
@@ -818,8 +818,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2015-07-21 02:17:38.252674884 +0100
 @@ -309,7 +309,7 @@
          // As each new value is added, we assert that the value
          // was not already in the set.
@@ -830,8 +830,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2015-07-21 02:15:51.198540936 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2015-07-21 02:17:38.252674884 +0100
 @@ -48,8 +48,8 @@
   */
  
@@ -862,8 +862,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-06-12 18:17:17.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2015-07-21 01:32:24.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2015-07-21 02:17:38.252674884 +0100
 @@ -58,12 +58,12 @@
      private final Map<String, MemberEntry> memberEntries;
  
@@ -884,8 +884,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2015-07-21 02:15:51.198540936 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2015-07-21 02:17:38.256674814 +0100
 @@ -233,7 +233,7 @@
              props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
              pkg.ensureAllClassFiles();
@@ -896,8 +896,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-06-12 23:14:47.231404715 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2015-06-12 23:34:39.982231481 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2015-07-21 02:15:51.198540936 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2015-07-21 02:17:38.256674814 +0100
 @@ -132,7 +132,7 @@
      // Keep a TLS point to the global data and environment.
      // This makes it simpler to supply environmental options
@@ -908,8 +908,8 @@
      // convenience methods to access the TL globals
      static TLGlobals getTLGlobals() {


More information about the distro-pkg-dev mailing list