# HG changeset patch # User Andrew John Hughes # Date 1587009373 -3600 # Node ID 9c3802d6213182a2587ea2d0c02cb51b2a66f7d9 # Parent 96a808eb9ecad159da882946f4aaa51cf197a5a7 Bump to 2.6.22. Upstream changes: - Bump to icedtea-2.6.22 - S7065233: To interpret case-insensitive string locale independently - S8036543, PR3777: [parfait] JNI pending exceptions for j2secmod.c, j2secmod_md.c, and p11_md.c - S8195607, PR3777: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1 - S8219597: (bf) Heap buffer state changes could provoke unexpected exceptions - S8224541: Better mapping of serial ENUMs - S8224549: Less Blocking Array Queues - S8225603: Enhancement for big integers - S8227542: Manifest improved jar headers - S8231415: Better signatures in XML - S8233250: Better X11 rendering - S8233410: Better Build Scripting - S8234027: Better JCEKS key support - S8234408: Improve TLS session handling - S8234825: Better Headings for HTTP Servers - S8234841: Enhance buffering of byte buffers - S8235274: Enhance typing of methods - S8236201: Better Scanner conversions - S8238960: linux-i586 builds are inconsistent as the newly build jdk is not able to reserve enough space for object heap - S8240621: Build failure on Windows after JDK-8044500 ChangeLog: 2020-04-15 Andrew John Hughes Bump to 2.6.22. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.6.22. (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 261. * configure.ac: Bump to 2.6.22. * hotspot.map.in: Update to icedtea-2.6.22. * patches/boot/ecj-trywithresources.patch: Regenerated. Update case for com.sun.crypto.provider.SealedObjectForKeyProtector. diff -r 96a808eb9eca -r 9c3802d62131 ChangeLog --- a/ChangeLog Thu Mar 05 19:54:57 2020 +0000 +++ b/ChangeLog Thu Apr 16 04:56:13 2020 +0100 @@ -1,3 +1,28 @@ +2020-04-15 Andrew John Hughes + + Bump to 2.6.22. + * Makefile.am: + (CORBA_CHANGESET): Update to icedtea-2.6.22. + (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 261. + * configure.ac: Bump to 2.6.22. + * hotspot.map.in: Update to icedtea-2.6.22. + * patches/boot/ecj-trywithresources.patch: + Regenerated. Update case for + com.sun.crypto.provider.SealedObjectForKeyProtector. + 2020-03-05 Andrew John Hughes Start 2.6.22 release cycle. @@ -1299,7 +1324,7 @@ Temporary copy of fix removed with upgrade to 7u251, where it's available upstream. * Makefile.am: - (CORBA_CHANGESET): Update to icedtea-2.6.20. + (CORBA_CHANGESET): Update to icedtea-2.6.21. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. diff -r 96a808eb9eca -r 9c3802d62131 Makefile.am --- a/Makefile.am Thu Mar 05 19:54:57 2020 +0000 +++ b/Makefile.am Thu Apr 16 04:56:13 2020 +0100 @@ -1,18 +1,18 @@ # Dependencies -CORBA_CHANGESET = e3f769a410e4 -JAXP_CHANGESET = 099ed3ab6415 -JAXWS_CHANGESET = c4230372ddc0 -JDK_CHANGESET = 5cfb0b2d8b78 -LANGTOOLS_CHANGESET = 0581b1282c3e -OPENJDK_CHANGESET = de70c40573f2 - -CORBA_SHA256SUM = 2675a6c3f151b4af73f8edca328d36e6a9fe0ae8d3c048c5e884ccdb57765584 -JAXP_SHA256SUM = 7873f5f596e32643dd5c0642cb4a6a6d8adbd4dfe36a3fc4e198f772aa3ae9ee -JAXWS_SHA256SUM = 75db9f2c90a49fc9eda32bbff83c978a6b032859270c55aee8fcf053cfbcec73 -JDK_SHA256SUM = b8d99a271e5f946a70267bc1f174720d1c9584aa77dd454a0a87ec05259cc280 -LANGTOOLS_SHA256SUM = 3645b8e3cd5be93c5efbac8421da3159958e817ddb4db2cc82673ac3887b55d2 -OPENJDK_SHA256SUM = d649cec806eb0d12b24f0554fecf1382138a4fbab7cea62172f2aae3866cfd18 +CORBA_CHANGESET = 3036b975b867 +JAXP_CHANGESET = e99cfdaca0e1 +JAXWS_CHANGESET = 7041c22afd47 +JDK_CHANGESET = 53f1c67ed417 +LANGTOOLS_CHANGESET = 5f9f9ff676c1 +OPENJDK_CHANGESET = 6bd1d52b8df6 + +CORBA_SHA256SUM = a07a927a03e1e4199c77ef352aaaf6067101d076a1448a930e1ef2654e9185db +JAXP_SHA256SUM = 988ee7a724385e482137f3962db151c3e522a94dd6ae7285941a07929868557a +JAXWS_SHA256SUM = 8cae72b86bcf782506580ab0efa5c1221cb80b967ea432d1ea081e0d557637da +JDK_SHA256SUM = 3719a0a6394e4674008fb2c62f428bcae2e8695a2462cf49efec5d5711f8d112 +LANGTOOLS_SHA256SUM = 9625754a76451e32f6df941c375102cb876737ae607fd76893cb83cfc3657021 +OPENJDK_SHA256SUM = 65fe3b8d22e1bceaf374402346ad4649e149d3b3329c3b0fa2ed0ad9669a1818 DROP_URL = https://icedtea.classpath.org/download/drops diff -r 96a808eb9eca -r 9c3802d62131 NEWS --- a/NEWS Thu Mar 05 19:54:57 2020 +0000 +++ b/NEWS Thu Apr 16 04:56:13 2020 +0100 @@ -12,7 +12,31 @@ CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.6.22 (2020-04-XX): +New in release 2.6.22 (2020-04-15): + +* Security fixes + - S8224541, CVE-2020-2756: Better mapping of serial ENUMs + - S8224549, CVE-2020-2757: Less Blocking Array Queues + - S8225603: Enhancement for big integers + - S8227542: Manifest improved jar headers + - S8231415, CVE-2020-2773: Better signatures in XML + - S8233250: Better X11 rendering + - S8233410: Better Build Scripting + - S8234027: Better JCEKS key support + - S8234408, CVE-2020-2781: Improve TLS session handling + - S8234825, CVE-2020-2800: Better Headings for HTTP Servers + - S8234841, CVE-2020-2803: Enhance buffering of byte buffers + - S8235274, CVE-2020-2805: Enhance typing of methods + - S8236201, CVE-2020-2830: Better Scanner conversions + - S8238960: linux-i586 builds are inconsistent as the newly build jdk is not able to reserve enough space for object heap +* Import of OpenJDK 7 u261 build 1 + - S8240621: Build failure on Windows after JDK-8044500 +* Import of OpenJDK 7 u261 build 2 + - S7065233: To interpret case-insensitive string locale independently + - S8219597: (bf) Heap buffer state changes could provoke unexpected exceptions +* Bug fixes + - S8036543, PR3777: [parfait] JNI pending exceptions for j2secmod.c, j2secmod_md.c, and p11_md.c + - S8195607, PR3777: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1 New in release 2.6.21 (2020-02-26): diff -r 96a808eb9eca -r 9c3802d62131 acinclude.m4 --- a/acinclude.m4 Thu Mar 05 19:54:57 2020 +0000 +++ b/acinclude.m4 Thu Apr 16 04:56:13 2020 +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=251 + JDK_UPDATE_VERSION=261 BUILD_VERSION=b02 MILESTONE=fcs if test "x${MILESTONE}" = "xfcs"; then diff -r 96a808eb9eca -r 9c3802d62131 configure.ac --- a/configure.ac Thu Mar 05 19:54:57 2020 +0000 +++ b/configure.ac Thu Apr 16 04:56:13 2020 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.22pre00], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.6.22], [distro-pkg-dev@openjdk.java.net]) AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) diff -r 96a808eb9eca -r 9c3802d62131 hotspot.map.in --- a/hotspot.map.in Thu Mar 05 19:54:57 2020 +0000 +++ b/hotspot.map.in Thu Apr 16 04:56:13 2020 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop https://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ d89441a9ce98 25eab5aef4e2219d54e593cc0bdced274bbdd66ec69e46dc6e92d46e74ecccb9 +default drop https://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 13031adeeef5 dad4c549767780314f27558873eb12689fecf17aa1ae3792e77924c4350dca43 diff -r 96a808eb9eca -r 9c3802d62131 patches/boot/ecj-trywithresources.patch --- a/patches/boot/ecj-trywithresources.patch Thu Mar 05 19:54:57 2020 +0000 +++ b/patches/boot/ecj-trywithresources.patch Thu Apr 16 04:56:13 2020 +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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java 2020-02-23 05:03:20.181484070 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java 2020-04-15 19:47:15.548079669 +0100 @@ -77,16 +77,10 @@ throws IOException, ClassNotFoundException, IllegalBlockSizeException, BadPaddingException { @@ -11,18 +11,18 @@ - @Override - public Void run() { - ObjectInputFilter.Config.setObjectInputFilter(ois, -- DeserializationChecker.ONE_FILTER); +- new DeserializationChecker(maxLength)); - return null; - } - }); + ObjectInputStream ois = null; + try { + ois = SharedSecrets.getJavaxCryptoSealedObjectAccess().getExtObjectInputStream(this, c); -+ AccessController.doPrivileged(new FilterSetter(ois)); ++ AccessController.doPrivileged(new FilterSetter(ois, maxLength)); try { @SuppressWarnings("unchecked") Key t = (Key) ois.readObject(); -@@ -101,6 +95,23 @@ +@@ -101,6 +95,25 @@ throw ice; } } @@ -34,21 +34,23 @@ + } + + private static class FilterSetter implements PrivilegedAction { -+ private ObjectInputStream ois; -+ public FilterSetter(ObjectInputStream ois) { ++ private final ObjectInputStream ois; ++ private final int maxLength; ++ public FilterSetter(ObjectInputStream ois, int maxLength) { + this.ois = ois; ++ this.maxLength = maxLength; + } + @Override + public Void run() { + ObjectInputFilter.Config.setObjectInputFilter(ois, -+ DeserializationChecker.ONE_FILTER); ++ new DeserializationChecker(maxLength)); + return null; } } 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2020-02-23 05:03:20.181484070 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2020-04-15 19:44:01.483035319 +0100 @@ -743,7 +743,9 @@ private void dumpBand() throws IOException { @@ -102,8 +104,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 2020-02-23 04:45:31.673776931 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2020-04-15 17:53:07.608473227 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2020-04-15 19:44:01.483035319 +0100 @@ -151,8 +151,13 @@ if ("--config-file=".equals(state)) { String propFile = av.remove(0); @@ -157,8 +159,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java 2020-04-15 19:44:01.483035319 +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 +179,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2020-04-15 19:44:01.483035319 +0100 @@ -540,9 +540,15 @@ Index index = initCPIndex(tag, cpMap); @@ -222,8 +224,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2020-04-15 19:44:01.483035319 +0100 @@ -458,9 +458,15 @@ Utils.log.info("Writing "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries..."); @@ -267,8 +269,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2020-04-15 19:44:01.483035319 +0100 @@ -122,8 +122,9 @@ // Do this after the previous props are put in place, // to allow override if necessary. @@ -297,8 +299,8 @@ for (Map.Entry 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2020-04-15 19:44:01.483035319 +0100 @@ -160,9 +160,15 @@ } // Use the stream-based implementation. @@ -317,8 +319,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2020-04-15 19:44:01.483035319 +0100 @@ -268,18 +268,30 @@ // 4947205 : Peformance is slow when using pack-effort=0 out = new BufferedOutputStream(out); @@ -353,8 +355,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2020-04-15 19:44:01.483035319 +0100 @@ -399,7 +399,9 @@ int minTimeout = 50; // msec after which there are no retries. @@ -376,8 +378,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DNSDatagramSocketFactory.java 2020-04-15 19:44:01.483035319 +0100 @@ -199,6 +199,10 @@ SocketException e = new SocketException(x.getMessage()); e.initCause(x); @@ -399,8 +401,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java 2020-04-15 19:44:01.483035319 +0100 @@ -503,9 +503,13 @@ try { @@ -441,8 +443,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2020-04-15 19:44:01.483035319 +0100 @@ -912,10 +912,15 @@ java.net.URLConnection uconn = tClass.getResource(tResource).openConnection(); int len = uconn.getContentLength(); @@ -462,8 +464,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2020-04-15 19:44:01.483035319 +0100 @@ -578,12 +578,23 @@ * Returns the Manifest for the specified JAR file name. */ @@ -492,8 +494,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/channels/SocketChannel.java 2020-04-15 19:44:01.483035319 +0100 @@ -188,7 +188,7 @@ } catch (Throwable suppressed) { x.addSuppressed(suppressed); @@ -504,8 +506,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java 2020-04-15 19:44:01.483035319 +0100 @@ -122,9 +122,15 @@ if (attrs.isDirectory()) { Files.createDirectory(target); @@ -533,8 +535,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2020-02-23 05:07:40.729510274 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2020-04-15 19:44:01.487035258 +0100 @@ -2604,7 +2604,9 @@ * Create a FileTreeWalker to walk the file tree, invoking the visitor * for each event. @@ -685,8 +687,8 @@ return path; } 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2020-02-23 05:03:20.185484009 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2020-04-15 19:44:01.487035258 +0100 @@ -241,8 +241,12 @@ File propFile = new File(propsFile); if (propFile.exists()) { @@ -702,8 +704,8 @@ Set keys = props.stringPropertyNames(); Pattern propertiesPattern = 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2020-02-23 05:04:32.404382551 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/jar/JarFile.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/util/jar/JarFile.java 2020-04-15 19:44:01.487035258 +0100 @@ -386,13 +386,18 @@ * META-INF files. */ @@ -725,8 +727,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2020-04-15 19:44:01.487035258 +0100 @@ -144,8 +144,9 @@ buf = new char[(int)len]; int read = 0; @@ -786,8 +788,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2020-04-15 19:44:01.487035258 +0100 @@ -382,9 +382,15 @@ // Load user's implementation of SyncProvider // here. -Drowset.properties=/abc/def/pqr.txt @@ -838,8 +840,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/awt/SunToolkit.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/awt/SunToolkit.java 2020-04-15 19:44:01.487035258 +0100 @@ -899,10 +899,16 @@ protected static boolean imageExists(URL url) { checkPermissions(url); @@ -859,8 +861,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 2020-02-23 04:45:31.677776870 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2020-04-15 17:53:07.624472982 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2020-04-15 19:44:01.487035258 +0100 @@ -555,8 +555,9 @@ if (parent == null) { parent = new File("."); @@ -884,8 +886,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java 2020-04-15 19:44:01.487035258 +0100 @@ -260,8 +260,14 @@ if (fname == null) { return p; @@ -952,8 +954,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java 2020-04-15 19:44:01.487035258 +0100 @@ -194,7 +194,8 @@ * Given a URL, retrieves a JAR file, caches it to disk, and creates a * cached JAR file object. @@ -987,8 +989,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java 2020-04-15 19:44:01.487035258 +0100 @@ -255,7 +255,9 @@ this.entries = new HashMap(); @@ -1012,8 +1014,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/print/PSPrinterJob.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/print/PSPrinterJob.java 2020-04-15 19:44:01.487035258 +0100 @@ -680,25 +680,38 @@ private void handleProcessFailure(final Process failedProcess, @@ -1060,8 +1062,8 @@ public Object run() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java openjdk-boot/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java 2020-02-24 04:57:59.189649645 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java 2020-02-24 05:06:43.205671519 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java 2020-04-15 19:44:01.487035258 +0100 @@ -383,11 +383,15 @@ } } @@ -1080,8 +1082,8 @@ } 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/log/ReliableLog.java 2020-04-15 19:44:01.487035258 +0100 @@ -594,10 +594,16 @@ } else { name = versionFile; @@ -1120,8 +1122,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2020-04-15 19:44:01.487035258 +0100 @@ -1272,13 +1272,16 @@ PipeWriter.plugTogetherPair (child.getInputStream(), System.out, @@ -1143,8 +1145,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 2020-02-23 04:45:31.757775651 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2020-04-15 17:53:07.844469627 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2020-04-15 19:44:01.487035258 +0100 @@ -234,13 +234,14 @@ proxyLog.log(Log.BRIEF, "trying with factory: " + factory); @@ -1174,8 +1176,8 @@ // factory succeeded, open new socket for caller's use diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2020-02-24 05:08:36.903944019 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2020-02-24 06:13:22.404834763 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2020-04-15 17:53:07.624472982 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2020-04-15 19:44:01.491035197 +0100 @@ -582,15 +582,16 @@ throws IOException, KrbException { try { @@ -1210,8 +1212,8 @@ return v; } catch (java.security.PrivilegedActionException pe) { 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2020-04-15 19:44:01.491035197 +0100 @@ -156,18 +156,33 @@ synchronized void init(PrincipalName principal, String name) throws IOException, KrbException { @@ -1295,8 +1297,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2020-04-15 19:44:01.491035197 +0100 @@ -92,9 +92,13 @@ tabName = filename; try { @@ -1365,8 +1367,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java 2020-02-24 04:57:59.213649278 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java 2020-02-24 05:07:07.509302259 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java 2020-04-15 19:44:01.491035197 +0100 @@ -188,7 +188,9 @@ throws IOException, KrbApErrException { Path p = getFileName(source, time.server); @@ -1426,8 +1428,8 @@ makeMine(p2); Files.move(p2, p, 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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2020-04-15 19:44:01.491035197 +0100 @@ -370,8 +370,9 @@ for (int i=1; i <= retries; i++) { @@ -1455,8 +1457,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 2020-02-23 04:45:31.765775529 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2020-04-15 17:53:07.908468651 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2020-04-15 19:44:01.491035197 +0100 @@ -280,7 +280,9 @@ connection.setIfModifiedSince(lastModified); } @@ -1502,8 +1504,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2020-02-23 05:03:20.189483948 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2020-04-15 19:44:01.491035197 +0100 @@ -179,7 +179,9 @@ // The temporary dir File f = new File(p.getProperty("java.io.tmpdir")); @@ -1527,8 +1529,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java 2020-04-15 19:44:01.491035197 +0100 @@ -635,13 +635,15 @@ while (entries.hasMoreElements()) { JarEntry je = entries.nextElement(); @@ -1580,8 +1582,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java 2020-04-15 19:44:01.491035197 +0100 @@ -114,10 +114,15 @@ return null; } @@ -1627,8 +1629,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 2020-02-23 04:45:31.765775529 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2020-04-15 17:53:07.912468590 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/keytool/Main.java 2020-04-15 19:44:01.491035197 +0100 @@ -965,10 +965,15 @@ // Perform the specified command if (command == CERTREQ) { @@ -1801,8 +1803,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/AnchorCertificates.java 2020-04-15 19:44:01.491035197 +0100 @@ -57,7 +57,9 @@ KeyStore cacerts; try { @@ -1828,8 +1830,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2020-04-15 19:44:01.491035197 +0100 @@ -56,7 +56,9 @@ public Void run() { File f = new File(System.getProperty("java.home"), @@ -1859,8 +1861,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/Arguments.java 2020-04-15 19:44:01.491035197 +0100 @@ -99,14 +99,19 @@ } @@ -1890,8 +1892,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 2020-02-23 04:45:31.769775468 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2020-04-15 17:53:07.916468528 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/jcmd/JCmd.java 2020-04-15 19:44:01.491035197 +0100 @@ -116,7 +116,7 @@ e.printStackTrace(); } @@ -1934,8 +1936,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java 2020-04-15 19:44:01.491035197 +0100 @@ -126,9 +126,15 @@ calendarProps = AccessController.doPrivileged(new PrivilegedExceptionAction() { public Properties run() throws IOException { @@ -1954,8 +1956,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/share/demo/jfc/Font2DTest/RangeMenu.java 2020-04-15 19:44:01.491035197 +0100 @@ -200,7 +200,7 @@ } @@ -1966,8 +1968,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2020-04-15 19:44:01.491035197 +0100 @@ -569,11 +569,11 @@ public Void run() throws BackingStoreException { Map m = new TreeMap<>(); @@ -2031,8 +2033,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java 2020-04-15 19:44:01.495035136 +0100 @@ -256,9 +256,16 @@ String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties"; Path file = Paths.get(fstypes); @@ -2052,8 +2054,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 2020-02-19 04:24:34.000000000 +0000 -+++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2020-02-23 05:03:20.193483887 +0000 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2018-06-26 01:10:45.000000000 +0100 ++++ openjdk-boot/jdk/src/solaris/classes/sun/print/UnixPrintJob.java 2020-04-15 19:44:01.495035136 +0100 @@ -960,25 +960,38 @@ private void handleProcessFailure(final Process failedProcess,