diff -Nru openjdk-lts-11.0.7+9/debian/changelog openjdk-lts-11.0.7+10/debian/changelog --- openjdk-lts-11.0.7+9/debian/changelog 2020-03-26 09:58:31.000000000 +0000 +++ openjdk-lts-11.0.7+10/debian/changelog 2020-04-16 12:54:17.000000000 +0000 @@ -1,3 +1,53 @@ +openjdk-lts (11.0.7+10-3ubuntu1) focal; urgency=medium + + * Sync packages with 11.0.7+10-3: + * Backport the fix for JDK-8214571, -Xdoclint of array serialField gives + "error: array type not allowed here". Introduced with 11.0.7. + * Enable running the testsuite on release architectures. + + -- Matthias Klose Thu, 16 Apr 2020 14:54:17 +0200 + +openjdk-lts (11.0.7+10-2ubuntu1) focal; urgency=medium + + * Sync packages with 11.0.7+10-1: + * OpenJDK 11.0.7+10 build (release). + * Security fixes + - JDK-8223898, CVE-2020-2754: Forward references to Nashorn + - JDK-8223904, CVE-2020-2755: Improve Nashorn matching + - JDK-8224541, CVE-2020-2756: Better mapping of serial ENUMs + - JDK-8224549, CVE-2020-2757: Less Blocking Array Queues + - JDK-8225603: Enhancement for big integers + - JDK-8226346: Build better binary builders + - JDK-8227467: Better class method invocations + - JDK-8227542: Manifest improved jar headers + - JDK-8229733: TLS message handling improvements + - JDK-8231415, CVE-2020-2773: Better signatures in XML + - JDK-8231785: Improved socket permissions + - JDK-8232424, CVE-2020-2778: More constrained algorithms + - JDK-8232581, CVE-2020-2767: Improve TLS verification + - JDK-8233250: Better X11 rendering + - JDK-8233410: Better Build Scripting + - JDK-8234027: Better JCEKS key support + - JDK-8234408, CVE-2020-2781: Improve TLS session handling + - JDK-8234825, CVE-2020-2800: Better Headings for HTTP Servers + - JDK-8234841, CVE-2020-2803: Enhance buffering of byte buffers + - JDK-8235274, CVE-2020-2805: Enhance typing of methods + - JDK-8235691, CVE-2020-2816: Enhance TLS connectivity + - JDK-8236201, CVE-2020-2830: Better Scanner conversions + - JDK-8238960: linux-i586 builds are inconsistent as the newly build + jdk is not able to reserve enough space for object heap + * Refresh patches. + * Configure --with-jtreg=/usr/share/jtreg. + * Enable the buildwatch script on sh4 (Adrian Glaubitz). Closes: #956728. + * Build with -march=z13 -mtune=z15 on Ubuntu/s390x. + + * Sync packages with 11.0.7+10-2: + * Backport the fix for 8228407, JVM crashes with shared archive file mismatch. + * Enable again bootcycle build for all hotspot architectures. + * Build again with -march=zEC12 on Ubuntu/s390x. + + -- Matthias Klose Wed, 15 Apr 2020 16:06:06 +0200 + openjdk-lts (11.0.7+9-1ubuntu1) focal; urgency=medium * Sync packages with 11.0.7+9-1: diff -Nru openjdk-lts-11.0.7+9/debian/patches/8214571.diff openjdk-lts-11.0.7+10/debian/patches/8214571.diff --- openjdk-lts-11.0.7+9/debian/patches/8214571.diff 1970-01-01 00:00:00.000000000 +0000 +++ openjdk-lts-11.0.7+10/debian/patches/8214571.diff 2020-04-16 12:54:17.000000000 +0000 @@ -0,0 +1,181 @@ + +# HG changeset patch +# User hannesw +# Date 1544096068 -3600 +# Node ID 7f1d59ca120715bc64fb0c8c0797d568a97ec6f3 +# Parent 966fc6d784a737ec25cd0b1be48109a4a3fa02ad +8214571: -Xdoclint of array serialField gives "error: array type not allowed here" +Reviewed-by: jjg, sundar + +diff -r 966fc6d784a7 -r 7f1d59ca1207 src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java +--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java Mon Mar 02 12:30:59 2020 +0100 ++++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java Thu Dec 06 12:34:28 2018 +0100 +@@ -869,8 +869,6 @@ + String sig = tree.getSignature(); + if (sig.contains("<") || sig.contains(">")) { + env.messages.error(REFERENCE, tree, "dc.type.arg.not.allowed"); +- } else if (isArrayType(sig)) { +- env.messages.error(REFERENCE, tree, "dc.array.type.not.allowed"); + } else { + Element e = env.trees.getElement(getCurrentPath()); + if (e == null) +@@ -948,12 +946,6 @@ + return scan(tree.getDescription(), ignore); + } + +- private boolean isArrayType(String signature) { +- int brackets = signature.indexOf('['); +- int parens = signature.indexOf('('); +- return brackets >= 0 && (parens < 0 || brackets < parens); +- } +- + private boolean isThrowable(TypeMirror tm) { + switch (tm.getKind()) { + case DECLARED: +diff -r 966fc6d784a7 -r 7f1d59ca1207 src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties +--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties Mon Mar 02 12:30:59 2020 +0100 ++++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties Thu Dec 06 12:34:28 2018 +0100 +@@ -25,7 +25,6 @@ + + dc.anchor.already.defined = anchor already defined: "{0}" + dc.anchor.value.missing = no value given for anchor +-dc.array.type.not.allowed = array type not allowed here + dc.attr.lacks.value = attribute lacks value + dc.attr.not.number = attribute value is not a number + dc.attr.not.supported.html4 = attribute not supported in HTML4: {0} +diff -r 966fc6d784a7 -r 7f1d59ca1207 src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java +--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java Mon Mar 02 12:30:59 2020 +0100 ++++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java Thu Dec 06 12:34:28 2018 +0100 +@@ -443,11 +443,7 @@ + // we first check if qualifierExpression identifies a type, + // and if not, then we check to see if it identifies a package. + Type t = attr.attribType(ref.qualifierExpression, env); +- +- if (t.getKind() == TypeKind.ARRAY) { +- // cannot refer to an array type +- return null; +- } else if (t.isErroneous()) { ++ if (t.isErroneous()) { + JCCompilationUnit toplevel = + treeMaker.TopLevel(List.nil()); + final ModuleSymbol msym = modules.getDefaultModule(); +@@ -478,7 +474,11 @@ + } + } + } else { +- tsym = t.tsym; ++ Type e = t; ++ // If this is an array type convert to element type ++ while (e instanceof ArrayType) ++ e = ((ArrayType)e).elemtype; ++ tsym = e.tsym; + memberName = (Name) ref.memberName; + } + } +diff -r 966fc6d784a7 -r 7f1d59ca1207 test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java +--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java Mon Mar 02 12:30:59 2020 +0100 ++++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java Thu Dec 06 12:34:28 2018 +0100 +@@ -95,7 +95,7 @@ + checkOutput("badref/Test.html", true, + "
\n" + + "
See Also:
\n" +- + "
Object[], \n" ++ + "
Object, \n" + + "Foo
\n" + + "
"); + } +diff -r 966fc6d784a7 -r 7f1d59ca1207 test/langtools/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java +--- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java Mon Mar 02 12:30:59 2020 +0100 ++++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/SerializedForm.java Thu Dec 06 12:34:28 2018 +0100 +@@ -31,13 +31,15 @@ + + /** + * @serialField name String a test ++ * @serialField longs Long[] the longs + * @see TestSerializedForm + */ + @Deprecated + private static final ObjectStreamField[] serialPersistentFields = { + new ObjectStreamField("i", int.class), + new ObjectStreamField("count", Integer.TYPE), +- new ObjectStreamField("name", String.class) ++ new ObjectStreamField("name", String.class), ++ new ObjectStreamField("longs", Long[].class) + }; + + /** +diff -r 966fc6d784a7 -r 7f1d59ca1207 test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java +--- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java Mon Mar 02 12:30:59 2020 +0100 ++++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java Thu Dec 06 12:34:28 2018 +0100 +@@ -84,6 +84,19 @@ + + "pkg1.ProtectedInnerClass.ProInnerClass extends java.lang.Object implements Serializable", + "

Class pkg1.PublicExcludeInnerClass.PubInnerClass extends java.lang.Object implements " + + "Serializable

"); ++ ++ checkOutput("serialized-form.html", true, ++ "

Serialized Fields

\n" + ++ "