/hg/release/icedtea7-2.6: 9 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 1 19:39:25 UTC 2019
changeset ab8c62f8f70f in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=ab8c62f8f70f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 29 03:23:26 2019 +0000
Start 2.6.18 release cycle.
2019-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
Start 2.6.18 release cycle.
* NEWS: Add section for 2.6.18.
* configure.ac: Bump to 2.6.18pre00.
changeset 1863f09b36f6 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=1863f09b36f6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 29 03:24:00 2019 +0000
Added tag icedtea-2.6.18pre00 for changeset ab8c62f8f70f
changeset 34da4e3e5b82 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=34da4e3e5b82
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Apr 29 21:25:18 2019 +0100
PR3730: Change policytool.desktop.in category Development to Settings
2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3730: Change policytool.desktop.in category
Development to Settings
* NEWS: Updated.
* policytool.desktop.in: Change category.
changeset 946652f83ac1 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=946652f83ac1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Apr 29 21:27:13 2019 +0100
PR3731: Use JRE bin directory in policytool.desktop.in
2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3731: Use JRE bin directory in policytool.desktop.in
* Makefile.am:
(policytool- at JAVA_VER@.desktop): Replace _JREBINDIR_
with the JRE bin directory ($(prefix)/jre/bin).
* NEWS: Updated.
* policytool.desktop.in: Use _JREBINDIR_ instead of
_BINDIR_.
changeset 291f31c475c0 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=291f31c475c0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Apr 29 21:29:15 2019 +0100
PR3732: Use SDK bin directory in jconsole.desktop.in
2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3732: Use SDK bin directory in jconsole.desktop.in
* Makefile.am:
(jconsole- at JAVA_VER@.desktop): Replace _SDKBINDIR_
with the SDK bin directory ($(bindir)).
* NEWS: Updated.
* jconsole.desktop.in: Use _SDKBINDIR_ instead of
_BINDIR_.
changeset 132b423f5a80 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=132b423f5a80
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Apr 29 21:30:27 2019 +0100
PR3733: Use shortened Java version first in Name field of desktop files
2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3733: Use shortened Java version first in
Name field of desktop files
* NEWS: Updated.
* jconsole.desktop.in:
Use @JAVA_VER@ in first part of Name field,
with the longer @OPENJDK_VER@ appearing at the end.
* policytool.desktop.in: Likewise.
changeset 4c302dfe945e in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=4c302dfe945e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Apr 30 15:12:45 2019 +0100
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 at 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.
changeset aeb0a2018e59 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=aeb0a2018e59
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed May 01 06:03:41 2019 +0100
Set release date to today (2019-05-01).
2019-05-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Set release date to today (2019-05-01).
changeset 5eb02011bcb3 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=5eb02011bcb3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed May 01 06:09:32 2019 +0100
Remove duplicate OpenJDK 7u221 fixes resolved locally in earlier IcedTea releases.
2019-05-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Remove duplicate OpenJDK 7u221 fixes
resolved locally in earlier IcedTea releases.
diffstat:
.hgtags | 1 +
ChangeLog | 80 ++++++++++++
Makefile.am | 30 ++--
NEWS | 32 +++++
acinclude.m4 | 2 +-
configure.ac | 2 +-
hotspot.map.in | 2 +-
jconsole.desktop.in | 4 +-
patches/boot/ecj-diamond.patch | 33 +++++
patches/boot/ecj-trywithresources.patch | 198 +++++++++++++++----------------
policytool.desktop.in | 6 +-
11 files changed, 267 insertions(+), 123 deletions(-)
diffs (truncated from 818 to 500 lines):
diff -r c60216439d9b -r 5eb02011bcb3 .hgtags
--- a/.hgtags Mon Mar 18 16:30:04 2019 +0000
+++ b/.hgtags Wed May 01 06:09:32 2019 +0100
@@ -88,3 +88,4 @@
a29153cf8a25218d46a49be55353a1c8ca1bb85d icedtea-2.6.17pre00
819dcedbcb0231013520600a8a32c5dd2f26c9f0 icedtea-2.6.17
98565b0caec9798114991d6df34fcd0f7d9d0869 icedtea-2.6.17-r1
+ab8c62f8f70f58cf9724ce05c16547ddaf09c168 icedtea-2.6.18pre00
diff -r c60216439d9b -r 5eb02011bcb3 ChangeLog
--- a/ChangeLog Mon Mar 18 16:30:04 2019 +0000
+++ b/ChangeLog Wed May 01 06:09:32 2019 +0100
@@ -1,3 +1,83 @@
+2019-05-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Remove duplicate OpenJDK 7u221 fixes
+ resolved locally in earlier IcedTea releases.
+
+2019-05-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Set release date to today (2019-05-01).
+
+2019-04-29 Andrew John Hughes <gnu_andrew at 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 at member.fsf.org>
+
+ PR3733: Use shortened Java version first in
+ Name field of desktop files
+ * NEWS: Updated.
+ * jconsole.desktop.in:
+ Use @JAVA_VER@ in first part of Name field,
+ with the longer @OPENJDK_VER@ appearing at the end.
+ * policytool.desktop.in: Likewise.
+
+2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3732: Use SDK bin directory in jconsole.desktop.in
+ * Makefile.am:
+ (jconsole- at JAVA_VER@.desktop): Replace _SDKBINDIR_
+ with the SDK bin directory ($(bindir)).
+ * NEWS: Updated.
+ * jconsole.desktop.in: Use _SDKBINDIR_ instead of
+ _BINDIR_.
+
+2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3731: Use JRE bin directory in policytool.desktop.in
+ * Makefile.am:
+ (policytool- at JAVA_VER@.desktop): Replace _JREBINDIR_
+ with the JRE bin directory ($(prefix)/jre/bin).
+ * NEWS: Updated.
+ * policytool.desktop.in: Use _JREBINDIR_ instead of
+ _BINDIR_.
+
+2019-04-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3730: Change policytool.desktop.in category
+ Development to Settings
+ * NEWS: Updated.
+ * policytool.desktop.in: Change category.
+
+2019-03-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ Start 2.6.18 release cycle.
+ * NEWS: Add section for 2.6.18.
+ * configure.ac: Bump to 2.6.18pre00.
+
2019-03-18 Andrew John Hughes <gnu_andrew at member.fsf.org>
Update OpenJDK version to match sources.
diff -r c60216439d9b -r 5eb02011bcb3 Makefile.am
--- a/Makefile.am Mon Mar 18 16:30:04 2019 +0000
+++ b/Makefile.am Wed May 01 06:09:32 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
@@ -3099,13 +3099,13 @@
# File substitution
policytool- at JAVA_VER@.desktop: policytool.desktop
- cat $< | $(SED) "s#_BINDIR_#$(bindir)#" > $@
+ cat $< | $(SED) "s#_JREBINDIR_#$(prefix)/jre/bin#" > $@
clean-policytool- at JAVA_VER@.desktop:
rm -f policytool- at JAVA_VER@.desktop
jconsole- at JAVA_VER@.desktop: jconsole.desktop
- cat $< | $(SED) "s#_BINDIR_#$(bindir)#" > $@
+ cat $< | $(SED) "s#_SDKBINDIR_#$(bindir)#" > $@
clean-jconsole- at JAVA_VER@.desktop:
rm -f jconsole- at JAVA_VER@.desktop
diff -r c60216439d9b -r 5eb02011bcb3 NEWS
--- a/NEWS Mon Mar 18 16:30:04 2019 +0000
+++ b/NEWS Wed May 01 06:09:32 2019 +0100
@@ -12,6 +12,38 @@
CVE-XXXX-YYYY: http://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release 2.6.18 (2019-05-01):
+
+* 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
+ - S8129361: ISO 4217 amendment 160
+ - S8129822: Define "headful" jtreg keyword
+ - S8145952: ISO 4217 amendment 161
+ - 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
+ - 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):
* Security fixes
diff -r c60216439d9b -r 5eb02011bcb3 acinclude.m4
--- a/acinclude.m4 Mon Mar 18 16:30:04 2019 +0000
+++ b/acinclude.m4 Wed May 01 06:09:32 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}
diff -r c60216439d9b -r 5eb02011bcb3 configure.ac
--- a/configure.ac Mon Mar 18 16:30:04 2019 +0000
+++ b/configure.ac Wed May 01 06:09:32 2019 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.17], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.18], [distro-pkg-dev at openjdk.java.net])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r c60216439d9b -r 5eb02011bcb3 hotspot.map.in
--- a/hotspot.map.in Mon Mar 18 16:30:04 2019 +0000
+++ b/hotspot.map.in Wed May 01 06:09:32 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
diff -r c60216439d9b -r 5eb02011bcb3 jconsole.desktop.in
--- a/jconsole.desktop.in Mon Mar 18 16:30:04 2019 +0000
+++ b/jconsole.desktop.in Wed May 01 06:09:32 2019 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
-Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console
+Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
Comment=Monitor and manage OpenJDK applications
-Exec=_BINDIR_/jconsole
+Exec=_SDKBINDIR_/jconsole
Icon=java- at JAVA_VER@- at JAVA_VENDOR@
Terminal=false
Type=Application
diff -r c60216439d9b -r 5eb02011bcb3 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Mar 18 16:30:04 2019 +0000
+++ b/patches/boot/ecj-diamond.patch Wed May 01 06:09:32 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",
diff -r c60216439d9b -r 5eb02011bcb3 patches/boot/ecj-trywithresources.patch
--- a/patches/boot/ecj-trywithresources.patch Mon Mar 18 16:30:04 2019 +0000
+++ b/patches/boot/ecj-trywithresources.patch Wed May 01 06:09:32 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
More information about the distro-pkg-dev
mailing list