Mercurial > hg > release > icedtea7-2.6

changeset 2991:4c302dfe945e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to 2.6.18. Upstream changes: - Bump to icedtea-2.6.18 - Bump to icedtea-2.6.18pre00 - S8003846: Override mechanism for currency data should not require creating currency.properties in java.home - S8074350: Support ISO 4217 "Current funds codes" table (A.2) - S8129361: ISO 4217 amendment 160 - S8129822: Define "headful" jtreg keyword - S8145952: ISO 4217 amendment 161 - S8151731: Add new jtreg keywords to jdk 8 - S8164784: ISO 4217 amendment 162 - S8202088: Japanese new era implementation - S8204142: AWT hang occurs when sequenced events arrive out of sequence in multiple AppContexts - S8205432: Replace the placeholder Japanese era name - S8206120: Add test cases for lenient Japanese era parsing - S8207152: Placeholder for Japanese new era should be two characters - S8207258: Distrust TLS server certificates anchored by Symantec Root CAs - S8208656: Move java/util/Calendar/CalendarTestScripts tests into OpenJDK - S8211936: Better String parsing - S8216280: Allow later Symantec Policy distrust date for two Apple SubCAs - S8217579: TLS_EMPTY_RENEGOTIATION_INFO_SCSV is disabled after 8211883 - S8217753: Enable HotSpot builds on 5.x Linux kernels - S8218453: More dynamic RMI interactions - S8219066: Fuzzing TrueType fonts: setCurrGlyphID() - S8219635, PR3726: aarch64: missing LoadStore barrier in TemplateTable::fast_storefield - S8219890: [TEST_BUG] Calendar.getDisplayName() returns empty string for new Japanese Era on some locales - S8221220, PR3726: AArch64: Add StoreStore membar explicitly for Volatile Writes in TemplateTable - S8222449: freetypecheck compares versions using lexicographic comparison ChangeLog: 2019-04-29 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump to 2.6.18. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.6.17. (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. * acinclude.m4: (JDK_UPDATE_VERSION): Bump to 221. * configure.ac: Bump to 2.6.18. * hotspot.map.in: Update to icedtea-2.6.18. * patches/boot/ecj-diamond.patch: Add new cases in java.awt.SequencedEvent and sun.security.validator.SymantecTLSPolicy. * patches/boot/ecj-trywithresources.patch: Regenerated due to context change in java.util.Currency.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 30 Apr 2019 15:12:45 +0100
parents 132b423f5a80
children aeb0a2018e59
files ChangeLog Makefile.am NEWS acinclude.m4 configure.ac hotspot.map.in patches/boot/ecj-diamond.patch patches/boot/ecj-trywithresources.patch
diffstat 8 files changed, 202 insertions(+), 116 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 29 21:30:27 2019 +0100
+++ b/ChangeLog	Tue Apr 30 15:12:45 2019 +0100
@@ -1,3 +1,31 @@
+2019-04-29  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to 2.6.18.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.6.17.
+	(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.
+	* acinclude.m4:
+	(JDK_UPDATE_VERSION): Bump to 221.
+	* configure.ac: Bump to 2.6.18.
+	* hotspot.map.in: Update to icedtea-2.6.18.
+	* patches/boot/ecj-diamond.patch:
+	Add new cases in java.awt.SequencedEvent and
+	sun.security.validator.SymantecTLSPolicy.
+	* patches/boot/ecj-trywithresources.patch:
+	Regenerated due to context change in
+	java.util.Currency.
+
 2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3733: Use shortened Java version first in
--- a/Makefile.am	Mon Apr 29 21:30:27 2019 +0100
+++ b/Makefile.am	Tue Apr 30 15:12:45 2019 +0100
@@ -1,18 +1,18 @@
 # Dependencies
 
-CORBA_CHANGESET = 46169649285d
-JAXP_CHANGESET = c05c97839122
-JAXWS_CHANGESET = 238368449487
-JDK_CHANGESET = 6093d128c588
-LANGTOOLS_CHANGESET = 6cdbf382f3e2
-OPENJDK_CHANGESET = 6a588725b8a2
-
-CORBA_SHA256SUM = 808e6120513aa15e6b219899c1189e2d591c3984454d7db4b239556d437cf764
-JAXP_SHA256SUM = 4aa64f80dd103ebece1aaaa6d126f751eafabb2f677537dbb25c0e0c350ad3fb
-JAXWS_SHA256SUM = 0703a48a420932fb62288c211ccb27596db4e3f1cfd0701321abcca259c93e97
-JDK_SHA256SUM = 236180ad395eb5036cc8577aad7c4cdc2a96dc79da717fe37673a43ba26e08ee
-LANGTOOLS_SHA256SUM = b3c9130e6e813d12376cf685f1726988bad04b256390b00a5ef403a5619e6698
-OPENJDK_SHA256SUM = 7627e8483566b1eec4dd52c5f5052a46139529d68335c10d8ac8b0ff11215455
+CORBA_CHANGESET = ffed1dd63843
+JAXP_CHANGESET = bbd9f724d9af
+JAXWS_CHANGESET = 7d942bc39965
+JDK_CHANGESET = f294f336b24d
+LANGTOOLS_CHANGESET = 9f0890e75bcb
+OPENJDK_CHANGESET = ed550afe3dd7
+
+CORBA_SHA256SUM = c115dfa1027c58b1b6444908e26b613c428661fb210e891c30e6a65e77208776
+JAXP_SHA256SUM = 632aa746ebfd8238c64226bf949d20cc2f1d1423eaabfd19897199b13b434e3c
+JAXWS_SHA256SUM = 94fbcc00f3d89b9f3b940af5e7b469d1b945ca99e84b51a7abdadcde33a7be14
+JDK_SHA256SUM = 57b5741ab0807fbc71f15efce11546d943baffeb5f5cf55ec16fed69634abc36
+LANGTOOLS_SHA256SUM = 915f492188b7b214e280532df061adc6c999f0d190ea5f1325bc70b77a2af4f0
+OPENJDK_SHA256SUM = da5fc1846ec80409ad5af870dbeb03d077b4add3ba54c0dde00414bea0376392
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
--- a/NEWS	Mon Apr 29 21:30:27 2019 +0100
+++ b/NEWS	Tue Apr 30 15:12:45 2019 +0100
@@ -14,11 +14,38 @@
 
 New in release 2.6.18 (2019-04-XX):
 
+* Security fixes
+  - S8211936, CVE-2019-2602: Better String parsing
+  - S8218453, CVE-2019-2684: More dynamic RMI interactions
+  - S8219066, CVE-2019-2698: Fuzzing TrueType fonts: setCurrGlyphID()
+* Import of OpenJDK 7 u211 build 1
+  - S8003846: Override mechanism for currency data should not require creating currency.properties in java.home
+  - S8074350: Support ISO 4217 "Current funds codes" table (A.2)
+  - S8129361: ISO 4217 amendment 160
+  - S8129822: Define "headful" jtreg keyword
+  - S8145952: ISO 4217 amendment 161
+  - S8151731: Add new jtreg keywords to jdk 8
+  - S8164784: ISO 4217 amendment 162
+  - S8202088: Japanese new era implementation
+  - S8204142: AWT hang occurs when sequenced events arrive out of sequence in multiple AppContexts
+  - S8205432: Replace the placeholder Japanese era name
+  - S8206120: Add test cases for lenient Japanese era parsing
+  - S8207152: Placeholder for Japanese new era should be two characters
+  - S8207258: Distrust TLS server certificates anchored by Symantec Root CAs
+  - S8208656: Move java/util/Calendar/CalendarTestScripts tests into OpenJDK
+  - S8216280: Allow later Symantec Policy distrust date for two Apple SubCAs
+  - S8217579: TLS_EMPTY_RENEGOTIATION_INFO_SCSV is disabled after 8211883
+  - S8217753: Enable HotSpot builds on 5.x Linux kernels
+  - S8219890: [TEST_BUG] Calendar.getDisplayName() returns empty string for new Japanese Era on some locales
+  - S8222449: freetypecheck compares versions using lexicographic comparison
 * Bug fixes
   - PR3730: Change policytool.desktop.in category Development to Settings
   - PR3731: Use JRE bin directory in policytool.desktop.in
   - PR3732: Use SDK bin directory in jconsole.desktop.in
   - PR3733: Use shortened Java version first in Name field of desktop files
+* AArch64 port
+  - S8219635, PR3726: aarch64: missing LoadStore barrier in TemplateTable::fast_storefield
+  - S8221220, PR3726: AArch64: Add StoreStore membar explicitly for Volatile Writes in TemplateTable
 
 New in release 2.6.17 (2019-03-16):
 
--- a/acinclude.m4	Mon Apr 29 21:30:27 2019 +0100
+++ b/acinclude.m4	Tue Apr 30 15:12:45 2019 +0100
@@ -2948,7 +2948,7 @@
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.7.0
   JAVA_VENDOR=openjdk
-  JDK_UPDATE_VERSION=211
+  JDK_UPDATE_VERSION=221
   BUILD_VERSION=b02
   COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}
   OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
--- a/configure.ac	Mon Apr 29 21:30:27 2019 +0100
+++ b/configure.ac	Tue Apr 30 15:12:45 2019 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.18pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.18], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
--- a/hotspot.map.in	Mon Apr 29 21:30:27 2019 +0100
+++ b/hotspot.map.in	Tue Apr 30 15:12:45 2019 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ d47e668978c8 b22bca4cd64c18750b7e31c0cbf97919f9f5df610916cfa5e01e80832f139496
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6e7512a54bc6 8ce20d0c5a16373fe7bea5437d91a513b861788bd24d79ac04e43e73cb82eb54
--- a/patches/boot/ecj-diamond.patch	Mon Apr 29 21:30:27 2019 +0100
+++ b/patches/boot/ecj-diamond.patch	Tue Apr 30 15:12:45 2019 +0100
@@ -11929,3 +11929,36 @@
          List<Thread> threads = new ArrayList<Thread>();
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/awt/SequencedEvent.java openjdk-boot/jdk/src/share/classes/java/awt/SequencedEvent.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/awt/SequencedEvent.java	2019-04-30 00:44:04.986086797 +0100
++++ openjdk-boot/jdk/src/share/classes/java/awt/SequencedEvent.java	2019-04-30 00:44:29.373711232 +0100
+@@ -55,7 +55,7 @@
+     private final AWTEvent nested;
+     private AppContext appContext;
+     private boolean disposed;
+-    private final LinkedList<AWTEvent> pendingEvents = new LinkedList<>();
++    private final LinkedList<AWTEvent> pendingEvents = new LinkedList<AWTEvent>();
+ 
+     static {
+         AWTAccessor.setSequencedEventAccessor(new AWTAccessor.SequencedEventAccessor() {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java openjdk-boot/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java	2019-04-30 00:44:04.994086673 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/validator/SymantecTLSPolicy.java	2019-04-30 00:45:02.705197935 +0100
+@@ -47,7 +47,7 @@
+     private static final Date APRIL_16_2019;
+ 
+     // SHA-256 certificate fingerprints of subCAs with later distrust dates
+-    private static final Map<String, Date> EXEMPT_SUBCAS = new HashMap<>();
++    private static final Map<String, Date> EXEMPT_SUBCAS = new HashMap<String, Date>();
+     static {
+         /*
+            We need to ensure that a date occurs after these dates.
+@@ -78,7 +78,7 @@
+     }
+ 
+     // SHA-256 certificate fingerprints of distrusted roots
+-    private static final Set<String> FINGERPRINTS = new HashSet<>(Arrays.asList(
++    private static final Set<String> FINGERPRINTS = new HashSet<String>(Arrays.asList(
+         // cacerts alias: geotrustglobalca
+         // DN: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
+         "FF856A2D251DCD88D36656F450126798CFABAADE40799C722DE4D2B5DB36A73A",
--- a/patches/boot/ecj-trywithresources.patch	Mon Apr 29 21:30:27 2019 +0100
+++ b/patches/boot/ecj-trywithresources.patch	Tue Apr 30 15:12:45 2019 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java openjdk-boot/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java	2019-04-30 00:39:01.558759520 +0100
 @@ -77,16 +77,10 @@
              throws IOException, ClassNotFoundException, IllegalBlockSizeException,
              BadPaddingException {
@@ -47,8 +47,8 @@
      }
  
 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	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2019-04-30 00:39:01.558759520 +0100
 @@ -743,7 +743,9 @@
  
          private void dumpBand() throws IOException {
@@ -102,8 +102,8 @@
  
          public void readDataFrom(InputStream in) throws IOException {
 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	2019-03-12 19:49:28.676298353 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2019-04-29 21:42:39.390211986 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2019-04-30 00:39:01.558759520 +0100
 @@ -151,8 +151,13 @@
                  if ("--config-file=".equals(state)) {
                      String propFile = av.remove(0);
@@ -157,8 +157,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	2019-04-30 00:39:01.558759520 +0100
 @@ -245,9 +245,15 @@
      void run(File inFile, JarOutputStream jstream) throws IOException {
          // %%% maybe memory-map the file, and pass it straight into unpacker
@@ -177,8 +177,8 @@
      }
  
 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	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2019-04-30 00:39:01.558759520 +0100
 @@ -540,9 +540,15 @@
              Index index = initCPIndex(tag, cpMap);
  
@@ -222,8 +222,8 @@
          attr_definition_name.doneDisbursing();
          attr_definition_layout.doneDisbursing();
 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	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2019-04-30 00:39:01.558759520 +0100
 @@ -458,9 +458,15 @@
                  Utils.log.info("Writing "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries...");
  
@@ -267,8 +267,8 @@
  
      void writeAttrCounts() throws IOException {
 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	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2019-04-30 00:39:01.558759520 +0100
 @@ -122,8 +122,9 @@
          // Do this after the previous props are put in place,
          // to allow override if necessary.
@@ -297,8 +297,8 @@
          for (Map.Entry<Object, Object> e : props.entrySet()) {
              String key = (String) e.getKey();
 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	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2019-04-30 00:39:01.558759520 +0100
 @@ -160,9 +160,15 @@
          }
          // Use the stream-based implementation.
@@ -317,8 +317,8 @@
              in.delete();
          }
 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	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2019-04-30 00:39:01.558759520 +0100
 @@ -268,18 +268,30 @@
          // 4947205 : Peformance is slow when using pack-effort=0
          out = new BufferedOutputStream(out);
@@ -353,8 +353,8 @@
          // Wrapper to prevent closing of client-supplied stream.
      static private
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java	2019-04-30 00:39:01.558759520 +0100
 @@ -399,7 +399,9 @@
          int minTimeout = 50; // msec after which there are no retries.
  
@@ -376,8 +376,8 @@
          }
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java	2019-04-30 00:39:01.558759520 +0100
 @@ -199,6 +199,10 @@
                  SocketException e = new SocketException(x.getMessage());
                  e.initCause(x);
@@ -399,8 +399,8 @@
          }
          return null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java	2019-04-30 00:39:01.558759520 +0100
 @@ -503,9 +503,13 @@
  
          try {
@@ -441,8 +441,8 @@
              NamingException ne = new NamingException();
              ne.setRootCause(e);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2019-04-30 00:39:01.558759520 +0100
 @@ -912,10 +912,15 @@
                              java.net.URLConnection uconn = tClass.getResource(tResource).openConnection();
                              int len = uconn.getContentLength();
@@ -462,8 +462,8 @@
                          } catch (java.io.IOException ex) {
                              throw newInternalError(ex);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java	2019-04-30 00:39:01.558759520 +0100
 @@ -578,12 +578,23 @@
       * Returns the Manifest for the specified JAR file name.
       */
@@ -492,8 +492,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java
---- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java	2019-04-30 00:39:01.558759520 +0100
 @@ -188,7 +188,7 @@
              } catch (Throwable suppressed) {
                  x.addSuppressed(suppressed);
@@ -504,8 +504,8 @@
          assert sc.isConnected();
          return sc;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java	2019-04-30 00:39:01.558759520 +0100
 @@ -122,9 +122,15 @@
          if (attrs.isDirectory()) {
              Files.createDirectory(target);
@@ -533,8 +533,8 @@
          }
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java
---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java	2019-04-30 00:39:01.562759458 +0100
 @@ -2604,7 +2604,9 @@
           * Create a FileTreeWalker to walk the file tree, invoking the visitor
           * for each event.
@@ -682,10 +682,10 @@
      }
  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java	2019-03-12 19:59:53.330486420 +0000
-@@ -237,9 +237,14 @@
-                                              "currency.properties");
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java	2019-04-30 00:37:25.088245148 +0100
+@@ -241,8 +241,12 @@
+                     File propFile = new File(propsFile);
                      if (propFile.exists()) {
                          Properties props = new Properties();
 -                        try (FileReader fr = new FileReader(propFile)) {
@@ -693,16 +693,14 @@
 +                        try {
 +                            fr = new FileReader(propFile);
                              props.load(fr);
++                        } finally {
++                            fr.close();
                          }
-+                        finally {
-+                            fr.close();
-+                        }
                          Set<String> keys = props.stringPropertyNames();
                          Pattern propertiesPattern =
-                             Pattern.compile("([A-Z]{3})\\s*,\\s*(\\d{3})\\s*,\\s*(\\d+)");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java	2019-04-30 00:39:01.562759458 +0100
 @@ -386,9 +386,14 @@
       * META-INF files.
       */
@@ -721,8 +719,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java	2019-04-30 00:39:01.562759458 +0100
 @@ -144,8 +144,9 @@
          buf = new char[(int)len];
          int read = 0;
@@ -782,8 +780,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java	2019-04-30 00:39:01.562759458 +0100
 @@ -382,9 +382,15 @@
                      // Load user's implementation of SyncProvider
                      // here. -Drowset.properties=/abc/def/pqr.txt
@@ -834,8 +832,8 @@
                  } catch (PrivilegedActionException ex) {
                      Throwable e = ex.getException();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/awt/SunToolkit.java openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/awt/SunToolkit.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/awt/SunToolkit.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java	2019-04-30 00:39:01.562759458 +0100
 @@ -899,10 +899,16 @@
      protected static boolean imageExists(URL url) {
          checkPermissions(url);
@@ -855,8 +853,8 @@
          }
          return false;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2019-03-12 19:49:28.680298290 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2019-03-12 19:59:53.330486420 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2019-04-29 21:42:39.394211924 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2019-04-30 00:39:01.562759458 +0100
 @@ -555,8 +555,9 @@
                  if (parent == null) {
                      parent = new File(".");
@@ -880,8 +878,8 @@
              } else {
                  out.add(a.arg);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java	2019-04-30 00:39:01.562759458 +0100
 @@ -260,8 +260,14 @@
              if (fname == null) {
                  return p;
@@ -948,8 +946,8 @@
                  }
                  TrustManagerFactory tmf = TrustManagerFactory.getInstance(
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java	2019-04-30 00:39:01.562759458 +0100
 @@ -194,7 +194,8 @@
       * Given a URL, retrieves a JAR file, caches it to disk, and creates a
       * cached JAR file object.
@@ -983,8 +981,8 @@
                          }
                      });
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java	2019-04-30 00:39:01.562759458 +0100
 @@ -255,7 +255,9 @@
              this.entries = new HashMap<Path,CacheEntry>();
  
@@ -1008,8 +1006,8 @@
          }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java	2019-04-30 00:39:01.562759458 +0100
 @@ -680,25 +680,38 @@
  
          private void handleProcessFailure(final Process failedProcess,
@@ -1056,8 +1054,8 @@
  
          public Object run() {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java	2019-04-30 00:39:01.562759458 +0100
 @@ -594,10 +594,16 @@
          } else {
              name = versionFile;
@@ -1096,8 +1094,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java	2019-04-30 00:39:01.562759458 +0100
 @@ -1272,13 +1272,16 @@
                      PipeWriter.plugTogetherPair
                          (child.getInputStream(), System.out,
@@ -1119,8 +1117,8 @@
  
                  } catch (IOException e) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2019-03-12 19:49:32.032245641 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2019-04-29 21:42:39.490210446 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2019-04-30 00:39:01.562759458 +0100
 @@ -234,13 +234,14 @@
                          proxyLog.log(Log.BRIEF,
                              "trying with factory: " + factory);
@@ -1150,8 +1148,8 @@
  
                      // factory succeeded, open new socket for caller's use
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2019-04-30 00:39:01.562759458 +0100
 @@ -156,18 +156,33 @@
      synchronized void init(PrincipalName principal, String name)
          throws IOException, KrbException {
@@ -1235,8 +1233,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2019-04-30 00:39:01.562759458 +0100
 @@ -92,9 +92,13 @@
          tabName = filename;
          try {
@@ -1305,8 +1303,8 @@
      }
  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2019-04-30 00:39:01.562759458 +0100
 @@ -369,8 +369,9 @@
  
              for (int i=1; i <= retries; i++) {
@@ -1334,8 +1332,8 @@
  }
 -
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java	2019-03-12 19:49:32.032245641 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java	2019-04-29 21:42:39.494210384 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java	2019-04-30 00:39:01.566759397 +0100
 @@ -280,7 +280,9 @@
                  connection.setIfModifiedSince(lastModified);
              }
@@ -1381,8 +1379,8 @@
          } catch (IOException e) {
              if (debug != null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java	2019-04-30 00:39:01.566759397 +0100
 @@ -179,7 +179,9 @@
                          // The temporary dir
                          File f = new File(p.getProperty("java.io.tmpdir"));
@@ -1406,8 +1404,8 @@
                      } catch (Exception ex) {
                          md.update((byte)ex.hashCode());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java	2019-03-12 20:01:48.180682014 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java	2019-04-30 00:39:01.566759397 +0100
 @@ -635,13 +635,15 @@
              while (entries.hasMoreElements()) {
                  JarEntry je = entries.nextElement();
@@ -1459,8 +1457,8 @@
  
          if (signedjar == null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java	2019-04-30 00:39:01.566759397 +0100
 @@ -114,10 +114,15 @@
              return null;
          }
@@ -1506,8 +1504,8 @@
                  System.err.println(ioe);
                  return null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java	2019-03-12 19:49:32.036245578 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java	2019-04-29 21:42:39.498210322 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java	2019-04-30 00:39:01.566759397 +0100
 @@ -965,10 +965,15 @@
          // Perform the specified command
          if (command == CERTREQ) {
@@ -1680,8 +1678,8 @@
                  printCertFromStream(System.in, out);
              }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java	2019-04-30 00:39:01.566759397 +0100
 @@ -57,7 +57,9 @@
                  KeyStore cacerts;
                  try {
@@ -1707,8 +1705,8 @@
                      if (debug != null) {
                          debug.println("Error parsing cacerts");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2019-04-30 00:39:01.566759397 +0100
 @@ -56,7 +56,9 @@
              public Void run() {
                  File f = new File(System.getProperty("java.home"),
@@ -1738,8 +1736,8 @@
                  return null;
              }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java	2019-04-30 00:39:01.566759397 +0100
 @@ -99,14 +99,19 @@
      }
  
@@ -1769,8 +1767,8 @@
  
      public static void usage() {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java	2019-03-12 19:49:32.036245578 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java	2019-04-29 21:42:39.498210322 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java	2019-04-30 00:39:01.566759397 +0100
 @@ -116,7 +116,7 @@
                              e.printStackTrace();
                          }
@@ -1813,8 +1811,8 @@
  
      private static String getMainClass(VirtualMachineDescriptor vmd)
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java	2019-04-30 00:39:01.566759397 +0100
 @@ -127,9 +127,15 @@
              calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
                  public Object run() throws IOException {
@@ -1833,8 +1831,8 @@
                  }
              });
 diff -Nru openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java
---- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java	2019-03-12 19:59:53.334486356 +0000
+--- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java	2019-04-30 00:39:01.566759397 +0100
 @@ -200,7 +200,7 @@
      }
  
@@ -1845,8 +1843,8 @@
          Character.UnicodeBlock currentBlock = Character.UnicodeBlock.of(0);
          for (int cp = 0x000001; cp < 0x110000; cp++ ) {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2019-04-30 00:39:01.566759397 +0100
 @@ -569,11 +569,11 @@
                  public Void run() throws BackingStoreException {
                      Map<String, String> m = new TreeMap<>();
@@ -1910,8 +1908,8 @@
                  }
              });
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java	2019-04-30 00:39:01.566759397 +0100
 @@ -256,9 +256,16 @@
          String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties";
          Path file = Paths.get(fstypes);
@@ -1931,8 +1929,8 @@
          }
          return result;
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java	2019-02-25 01:45:18.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java	2019-03-12 19:59:53.338486293 +0000
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java	2019-04-16 04:24:16.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java	2019-04-30 00:39:01.566759397 +0100
 @@ -960,25 +960,38 @@
  
          private void handleProcessFailure(final Process failedProcess,