From 87ce7d60ddfbf643ccd2ff916b227b82000e08e5703205c885523aa663039984 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Jan 2021 16:29:49 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=360 --- JDK-8247619.patch | 93 ++++++++++++++++++++++++++++++++++++++ java-1_8_0-openjdk.changes | 8 ++++ java-1_8_0-openjdk.spec | 10 ++-- 3 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 JDK-8247619.patch diff --git a/JDK-8247619.patch b/JDK-8247619.patch new file mode 100644 index 0000000..c123c36 --- /dev/null +++ b/JDK-8247619.patch @@ -0,0 +1,93 @@ + +# HG changeset patch +# User mbalao +# Date 1596041533 25200 +# Node ID 6fe9792e7893a43c0718cf6d5082f62f9bc52787 +# Parent 4b5e357b4beb37ce221d1cc84b1d1de9d5b803e8 +8247619: Improve Direct Buffering of Characters +Reviewed-by: alanb, ahgross, rhalade, psandoz, andrew + +diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java +--- a/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 ++++ b/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 +@@ -242,8 +242,8 @@ + public final Buffer position(int newPosition) { + if ((newPosition > limit) || (newPosition < 0)) + throw new IllegalArgumentException(); ++ if (mark > newPosition) mark = -1; + position = newPosition; +- if (mark > position) mark = -1; + return this; + } + +@@ -388,7 +388,8 @@ + * @return The number of elements remaining in this buffer + */ + public final int remaining() { +- return limit - position; ++ int rem = limit - position; ++ return rem > 0 ? rem : 0; + } + + /** +diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.java.template +--- a/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 ++++ b/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -234,7 +234,9 @@ + public $Type$Buffer compact() { + #if[rw] + int pos = position(); +- int rem = limit() - pos; ++ int lim = limit(); ++ assert (pos <= lim); ++ int rem = (pos <= lim ? lim - pos : 0); + System.arraycopy(hb, ix(pos), hb, ix(0), rem); + position(rem); + limit(capacity()); +diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/X-Buffer.java.template +--- a/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 ++++ b/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -414,15 +414,23 @@ + */ + public int read(CharBuffer target) throws IOException { + // Determine the number of bytes n that can be transferred ++ int limit = limit(); ++ int pos = position(); ++ int remaining = limit - pos; ++ assert remaining >= 0; ++ if (remaining <= 0) // include equality condition when remaining == 0 ++ return -1; ++ + int targetRemaining = target.remaining(); +- int limit = limit(); +- int remaining = limit - position(); +- if (remaining == 0) +- return -1; ++ assert targetRemaining >= 0; ++ if (targetRemaining <= 0) // include condition targetRemaining == 0 ++ return 0; ++ + int n = Math.min(remaining, targetRemaining); ++ + // Set source limit to prevent target overflow + if (targetRemaining < remaining) +- limit(position() + n); ++ limit(pos + n); + try { + if (n > 0) + target.put(this); + diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 99f5ccf..ff2f61a 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 29 16:28:08 UTC 2021 - Fridrich Strba + +- Added patch: + * JDK-8247619.patch + + Fix security bug of January 2021 CPU + + 8247619: Improve Direct Buffering of Characters + ------------------------------------------------------------------- Thu Nov 26 19:13:31 UTC 2020 - Fridrich Strba diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index e4bf0c9..aeedf2e 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -1,7 +1,7 @@ # # spec file for package java-1_8_0-openjdk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -201,6 +201,7 @@ Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch Patch1002: icedtea-3.8.0-s390.patch Patch2001: disable-doclint-by-default.patch Patch2002: JDK_1_8_0-8208602.patch +Patch2003: JDK-8247619.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf @@ -313,7 +314,7 @@ Requires: jpackage-utils # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: tzdata-java8 # Standard JPackage base provides. Provides: java-%{javaver}-headless = %{version}-%{release} @@ -352,7 +353,7 @@ Requires: %{name} = %{version}-%{release} # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun): update-alternatives +Requires(postun):update-alternatives # Standard JPackage devel provides. Provides: java-%{javaver}-devel = %{version} Provides: java-devel = %{javaver} @@ -388,7 +389,7 @@ Requires: jpackage-utils # Post requires update-alternatives to install javadoc alternative. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall javadoc alternative. -Requires(postun): update-alternatives +Requires(postun):update-alternatives # Standard JPackage javadoc provides. Provides: java-%{javaver}-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} @@ -539,6 +540,7 @@ patch -p0 -i %{PATCH103} patch -p0 -i %{PATCH2001} patch -p0 -i %{PATCH2002} +patch -p0 -i %{PATCH2003} (cd openjdk/common/autoconf bash ./autogen.sh From 3f0b91357158ef6fa6d3a9780316fd65b82be7c4fe4c4ab15d7876e8963c6152 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Jan 2021 16:36:28 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=361 --- JDK-8247619.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/JDK-8247619.patch b/JDK-8247619.patch index c123c36..4db1e78 100644 --- a/JDK-8247619.patch +++ b/JDK-8247619.patch @@ -8,8 +8,8 @@ Reviewed-by: alanb, ahgross, rhalade, psandoz, andrew diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java ---- a/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 -+++ b/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 +--- openjdk/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 ++++ openjdk/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 @@ -242,8 +242,8 @@ public final Buffer position(int newPosition) { if ((newPosition > limit) || (newPosition < 0)) @@ -31,8 +31,8 @@ diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java /** diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.java.template ---- a/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 -+++ b/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 +--- openjdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 ++++ openjdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -52,8 +52,8 @@ diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.ja position(rem); limit(capacity()); diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/X-Buffer.java.template ---- a/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 -+++ b/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 +--- openjdk/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 ++++ openjdk/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. From d7e5364d2030f218a542195e030740f8ffbf9dd8cb5b5470f6ebffb01978f311 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Jan 2021 16:38:09 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=362 --- JDK-8247619.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/JDK-8247619.patch b/JDK-8247619.patch index 4db1e78..386d10d 100644 --- a/JDK-8247619.patch +++ b/JDK-8247619.patch @@ -8,8 +8,8 @@ Reviewed-by: alanb, ahgross, rhalade, psandoz, andrew diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java ---- openjdk/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 -+++ openjdk/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 +--- openjdk/jdk/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 ++++ openjdk/jdk/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 @@ -242,8 +242,8 @@ public final Buffer position(int newPosition) { if ((newPosition > limit) || (newPosition < 0)) @@ -31,8 +31,8 @@ diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java /** diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.java.template ---- openjdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 -+++ openjdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 +--- openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 ++++ openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -52,8 +52,8 @@ diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.ja position(rem); limit(capacity()); diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/X-Buffer.java.template ---- openjdk/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 -+++ openjdk/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 +--- openjdk/jdk/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 ++++ openjdk/jdk/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. From 778208b2b52098a9d510c020ed2a3b1c1989223c9e445158426e81e9b972f092 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Jan 2021 18:08:56 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=363 --- JDK-8247619.patch | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/JDK-8247619.patch b/JDK-8247619.patch index 386d10d..44a3103 100644 --- a/JDK-8247619.patch +++ b/JDK-8247619.patch @@ -1,13 +1,3 @@ - -# HG changeset patch -# User mbalao -# Date 1596041533 25200 -# Node ID 6fe9792e7893a43c0718cf6d5082f62f9bc52787 -# Parent 4b5e357b4beb37ce221d1cc84b1d1de9d5b803e8 -8247619: Improve Direct Buffering of Characters -Reviewed-by: alanb, ahgross, rhalade, psandoz, andrew - -diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java --- openjdk/jdk/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 +++ openjdk/jdk/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 @@ -242,8 +242,8 @@ @@ -30,16 +20,8 @@ diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Buffer.java } /** -diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.java.template --- openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 +++ openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -234,7 +234,9 @@ public $Type$Buffer compact() { #if[rw] @@ -51,16 +33,8 @@ diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/Heap-X-Buffer.ja System.arraycopy(hb, ix(pos), hb, ix(0), rem); position(rem); limit(capacity()); -diff -r 4b5e357b4beb -r 6fe9792e7893 src/share/classes/java/nio/X-Buffer.java.template --- openjdk/jdk/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 +++ openjdk/jdk/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -414,15 +414,23 @@ */ public int read(CharBuffer target) throws IOException { From a9ca11d596bdb7c64a984ef8a825cd1c755267052807ba23a30e586a3fbea8ad Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Feb 2021 08:11:26 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=364 --- JDK-8247619.patch | 67 ------------- aarch32.tar.xz | 4 +- corba.tar.xz | 4 +- hotspot.tar.xz | 4 +- icedtea-3.17.1.tar.xz | 3 - icedtea-3.18.0.tar.xz | 3 + java-1_8_0-openjdk.changes | 193 +++++++++++++++++++++++++++++++++++++ java-1_8_0-openjdk.spec | 8 +- jaxp.tar.xz | 4 +- jaxws.tar.xz | 4 +- jdk.tar.xz | 4 +- langtools.tar.xz | 4 +- nashorn.tar.xz | 4 +- openjdk.tar.xz | 4 +- shenandoah.tar.xz | 4 +- 15 files changed, 219 insertions(+), 95 deletions(-) delete mode 100644 JDK-8247619.patch delete mode 100644 icedtea-3.17.1.tar.xz create mode 100644 icedtea-3.18.0.tar.xz diff --git a/JDK-8247619.patch b/JDK-8247619.patch deleted file mode 100644 index 44a3103..0000000 --- a/JDK-8247619.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- openjdk/jdk/src/share/classes/java/nio/Buffer.java Tue Dec 29 00:56:45 2020 +0000 -+++ openjdk/jdk/src/share/classes/java/nio/Buffer.java Wed Jul 29 09:52:13 2020 -0700 -@@ -242,8 +242,8 @@ - public final Buffer position(int newPosition) { - if ((newPosition > limit) || (newPosition < 0)) - throw new IllegalArgumentException(); -+ if (mark > newPosition) mark = -1; - position = newPosition; -- if (mark > position) mark = -1; - return this; - } - -@@ -388,7 +388,8 @@ - * @return The number of elements remaining in this buffer - */ - public final int remaining() { -- return limit - position; -+ int rem = limit - position; -+ return rem > 0 ? rem : 0; - } - - /** ---- openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 -+++ openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 -@@ -234,7 +234,9 @@ - public $Type$Buffer compact() { - #if[rw] - int pos = position(); -- int rem = limit() - pos; -+ int lim = limit(); -+ assert (pos <= lim); -+ int rem = (pos <= lim ? lim - pos : 0); - System.arraycopy(hb, ix(pos), hb, ix(0), rem); - position(rem); - limit(capacity()); ---- openjdk/jdk/src/share/classes/java/nio/X-Buffer.java.template Tue Dec 29 00:56:45 2020 +0000 -+++ openjdk/jdk/src/share/classes/java/nio/X-Buffer.java.template Wed Jul 29 09:52:13 2020 -0700 -@@ -414,15 +414,23 @@ - */ - public int read(CharBuffer target) throws IOException { - // Determine the number of bytes n that can be transferred -+ int limit = limit(); -+ int pos = position(); -+ int remaining = limit - pos; -+ assert remaining >= 0; -+ if (remaining <= 0) // include equality condition when remaining == 0 -+ return -1; -+ - int targetRemaining = target.remaining(); -- int limit = limit(); -- int remaining = limit - position(); -- if (remaining == 0) -- return -1; -+ assert targetRemaining >= 0; -+ if (targetRemaining <= 0) // include condition targetRemaining == 0 -+ return 0; -+ - int n = Math.min(remaining, targetRemaining); -+ - // Set source limit to prevent target overflow - if (targetRemaining < remaining) -- limit(position() + n); -+ limit(pos + n); - try { - if (n > 0) - target.put(this); - diff --git a/aarch32.tar.xz b/aarch32.tar.xz index a3ec578..2436dd9 100644 --- a/aarch32.tar.xz +++ b/aarch32.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b2eb1a9e2b7c5d7011bbc42ba4193d57c8101148c490dc6d9dd67d0c0b8b5d5 -size 7054944 +oid sha256:d41b9df79e09256e10f4bf387955b67132d5eac6f7e66d805846e3a77e71f15d +size 7057736 diff --git a/corba.tar.xz b/corba.tar.xz index 4ab2c53..6c6842b 100644 --- a/corba.tar.xz +++ b/corba.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cda3a7108ce3a5f400ef43225007617426ac14ca3926508e8f929ae10a2f5a02 -size 948536 +oid sha256:72762977b4d53df53cd110df6e518848c7c74e94da822186f7c90913bf4f5355 +size 948504 diff --git a/hotspot.tar.xz b/hotspot.tar.xz index 89f604f..1cc27c4 100644 --- a/hotspot.tar.xz +++ b/hotspot.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9205bc1f1dd558c726bcd3770ef4a4960c505e96a48f07d9fd1a7bf40627af22 -size 7109408 +oid sha256:14da112dfc7cc123ecaa3a4eda3e83785263e31330aaf67e4a9c8232b79a9359 +size 7110964 diff --git a/icedtea-3.17.1.tar.xz b/icedtea-3.17.1.tar.xz deleted file mode 100644 index 5e97416..0000000 --- a/icedtea-3.17.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ce91e5dbb952ed2eb091397fe4d73a900d8d2d461a792c9c3bcf272c3bf08e7 -size 1565996 diff --git a/icedtea-3.18.0.tar.xz b/icedtea-3.18.0.tar.xz new file mode 100644 index 0000000..082d70a --- /dev/null +++ b/icedtea-3.18.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe26e4d7aa33e2cdeb3817ed082154c9a2927839c0417e95a18c632197298267 +size 1565468 diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index ff2f61a..8773c3f 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,196 @@ +------------------------------------------------------------------- +Mon Feb 8 08:08:11 UTC 2021 - Fridrich Strba + +- Update to version jdk8u282 (icedtea 3.18.0) + * January 2021 CPU (bsc#1181239) + * Security fixes + + JDK-8247619: Improve Direct Buffering of Characters + * Import of OpenJDK 8 u282 build 01 + + JDK-6962725: Regtest javax/swing/JFileChooser/6738668/ + /bug6738668.java fails under Linux + + JDK-8025936: Windows .pdb and .map files does not have proper + dependencies setup + + JDK-8030350: Enable additional compiler warnings for GCC + + JDK-8031423: Test java/awt/dnd/DisposeFrameOnDragCrash/ + /DisposeFrameOnDragTest.java fails by Timeout on Windows + + JDK-8036122: Fix warning 'format not a string literal' + + JDK-8051853: new + URI("x/").resolve("..").getSchemeSpecificPart() returns null! + + JDK-8132664: closed/javax/swing/DataTransfer/DefaultNoDrop/ + /DefaultNoDrop.java locks on Windows + + JDK-8134632: Mark javax/sound/midi/Devices/ + /InitializationHang.java as headful + + JDK-8148854: Class names "SomeClass" and "LSomeClass;" + treated by JVM as an equivalent + + JDK-8148916: Mark bug6400879.java as intermittently failing + + JDK-8148983: Fix extra comma in changes for JDK-8148916 + + JDK-8160438: javax/swing/plaf/nimbus/8057791/bug8057791.java + fails + + JDK-8165808: Add release barriers when allocating objects + with concurrent collection + + JDK-8185003: JMX: Add a version of + ThreadMXBean.dumpAllThreads with a maxDepth argument + + JDK-8202076: test/jdk/java/io/File/WinSpecialFiles.java on + windows with VS2017 + + JDK-8207766: [testbug] Adapt tests for Aix. + + JDK-8212070: Introduce diagnostic flag to abort VM on failed + JIT compilation + + JDK-8213448: [TESTBUG] enhance jfr/jvm/TestDumpOnCrash + + JDK-8215727: Restore JFR thread sampler loop to old / + previous behavior + + JDK-8220657: JFR.dump does not work when filename is set + + JDK-8221342: [TESTBUG] Generate Dockerfile for docker testing + + JDK-8224502: [TESTBUG] JDK docker test TestSystemMetrics.java + fails with access issues and OOM + + JDK-8231209: [REDO] ThreadMXBean::getThreadAllocatedBytes() + can be quicker for self thread + + JDK-8231968: getCurrentThreadAllocatedBytes default + implementation s/b getThreadAllocatedBytes + + JDK-8232114: JVM crashed at imjpapi.dll in native code + + JDK-8234270: [REDO] JDK-8204128 NMT might report incorrect + numbers for Compiler area + + JDK-8234339: replace JLI_StrTok in java_md_solinux.c + + JDK-8238448: RSASSA-PSS signature verification fail when + using certain odd key sizes + + JDK-8242335: Additional Tests for RSASSA-PSS + + JDK-8244225: stringop-overflow warning on strncpy call from + compile_the_world_in + + JDK-8245400: Upgrade to LittleCMS 2.11 + + JDK-8248214: Add paddings for TaskQueueSuper to reduce + false-sharing cache contention + + JDK-8249176: Update GlobalSignR6CA test certificates + + JDK-8250665: Wrong translation for the month name of May in + ar_JO,LB,SY + + JDK-8250928: JFR: Improve hash algorithm for stack traces + + JDK-8251469: Better cleanup for + test/jdk/javax/imageio/SetOutput.java + + JDK-8251840: Java_sun_awt_X11_XToolkit_getDefaultScreenData + should not be in make/mapfiles/libawt_xawt/mapfile-vers + + JDK-8252384: [TESTBUG] Some tests refer to COMPAT provider + rather than JRE + + JDK-8252395: [8u] --with-native-debug-symbols=external + doesn't include debuginfo files for binaries + + JDK-8252497: Incorrect numeric currency code for ROL + + JDK-8252754: Hash code calculation of JfrStackTrace is + inconsistent + + JDK-8252904: VM crashes when JFR is used and JFR event class + is transformed + + JDK-8252975: [8u] JDK-8252395 breaks the build for + --with-native-debug-symbols=internal + + JDK-8253284: Zero OrderAccess barrier mappings are incorrect + + JDK-8253550: [8u] JDK-8252395 breaks the build for make + STRIP_POLICY=no_strip + + JDK-8253752: test/sun/management/jmxremote/bootstrap/ + /RmiBootstrapTest.java fails randomly + + JDK-8254081: java/security/cert/PolicyNode/ + /GetPolicyQualifiers.java fails due to an expired certificate + + JDK-8254144: Non-x86 Zero builds fail with return-type + warning in os_linux_zero.cpp + + JDK-8254166: Zero: return-type warning in + zeroInterpreter_zero.cpp + + JDK-8254683: [TEST_BUG] jdk/test/sun/tools/jconsole/ + /WorkerDeadlockTest.java fails + + JDK-8255003: Build failures on Solaris + * Import of OpenJDK 8 u282 build 02 + + JDK-8253837: JFR 8u fix symbol and cstring hashtable equals + implementaion + + JDK-8255269: Unsigned overflow in g1Policy.cpp + * Import of OpenJDK 8 u282 build 03 + + JDK-8163161: [PIT][TEST_BUG] increase timeout in + javax/swing/plaf/nimbus/8057791/bug8057791.java + + JDK-8168292: [TESTBUG] [macosx] Test + java/awt/TrayIcon/DragEventSource/DragEventSource.java fails + on OS X + + JDK-8168682: jdk/test/java/lang/ClassLoader/forNameLeak/ + /ClassForNameLeak.java fails with -Xcomp + + JDK-8223108: Test java/awt/EventQueue/ + /NonComponentSourcePost.java is unstable + + JDK-8255603: Memory/Performance regression after JDK-8210985 + * Import of OpenJDK 8 u282 build 04 + + JDK-8022535: [TEST BUG] javax/swing/text/html/parser/ + /Test8017492.java fails + + JDK-8043899: compiler/5091921/Test7005594.java fails if + specified -Xmx is less than 1600m + + JDK-8046221: [TEST_BUG] Cleanup datatransfer tests + + JDK-8058805: [TEST_BUG]Test java/awt/TrayIcon/SecurityCheck/ + /NoPermissionTest/NoPermissionTest.java fails + + JDK-8068275: Some tests failed after JDK-8063104 + + JDK-8069211: (zipfs) ZipFileSystem creates corrupted zip if + entry output stream gets closed more than once + + JDK-8130772: Util.hitMnemonics does not work: + getSystemMnemonicKeyCodes() returns ALT_MASK rather than + VK_ALT + + JDK-8156803: Turn StressLCM/StressGCM flags to diagnostic + + JDK-8160761: [TESTBUG] Several compiler tests fail with + product bits + + JDK-8166015: [PIT][TEST_BUG] stray character in java/awt/ + /Focus/ModalDialogActivationTest/ + /ModalDialogActivationTest.java + + JDK-8166583: Add oopDesc::klass_or_null_acquire() + + JDK-8166663: Simplify oops_on_card_seq_iterate_careful + + JDK-8166862: CMS needs klass_or_null_acquire + + JDK-8179083: Uninitialized notifier in Java Monitor Wait + tracing event + + JDK-8205507: jdk/javax/xml/crypto/dsig/GenerationTests.java + timed out + + JDK-8217362: Emergency dump does not work when disk=false is + set + + JDK-8217766: Container Support doesn't work for some Join + Controllers combinations + + JDK-8219013: Update Apache Santuario (XML Signature) to + version 2.1.3 + + JDK-8219562: Line of code in osContainer_linux.cpp L102 + appears unreachable + + JDK-8220579: [Containers] SubSystem.java out of sync with + osContainer_linux.cpp + + JDK-8221340: [TESTBUG] TestCgroupMetrics.java fails after fix + for JDK-8219562 + + JDK-8221710: [TESTBUG] more configurable parameters for + docker testing + + JDK-8227006: [linux] Runtime.availableProcessors execution + time increased by factor of 100 + + JDK-8229868: Update Apache Santuario TPRM version + + JDK-8233548: Update CUP to v0.11b + + JDK-8242480: Negative value may be returned by + getFreeSwapSpaceSize() in the docker + + JDK-8246648: issue with OperatingSystemImpl + getFreeSwapSpaceSize in docker after 8242480 + + JDK-8249846: Change of behavior after JDK-8237117: Better + ForkJoinPool behavior + + JDK-8250636: iso8601_time returns incorrect offset part on + MacOS + + JDK-8251365: Build failure on AIX after 8250636 + + JDK-8255717: Fix JFR crash in WriteObjectSampleStacktrace due + to object not initialized + + JDK-8256618: Zero: Linux x86_32 build still fails + + JDK-8256671: Incorrect assignment operator used in + guarantee() in genCollectedHeap + + JDK-8256752: 8252395 incorrect copy rule for macos .dSYM + folder + + JDK-8257397: [TESTBUG] test/lib/containers/docker/Common.java + refers to -Xlog:os+container=trace + * Import of OpenJDK 8 u282 build 05 + + JDK-8254982: (tz) Upgrade time-zone data to tzdata2020c + * Import of OpenJDK 8 u282 build 06 + + JDK-8255226: (tz) Upgrade time-zone data to tzdata2020d + * Import of OpenJDK 8 u282 build 07 + + JDK-8225072: Add LuxTrust certificate that is expiring in + March 2021 to list of allowed but expired certs + + JDK-8239105: Add exception for expiring Digicert root + certificates to VerifyCACerts test + + JDK-8258630: Add expiry exception for QuoVadis root + certificate + * Bug fixes + + PR3819: Installation can't handle existing tapset symlinks + * Shenandoah + + Shenandoah: Fix racy update of code roots + * AArch32 port + + JDK-8253036: Support building the Zero assembler port on + AArch64 +- Removed patch: + * JDK-8247619.patch + + unneeded with this version + ------------------------------------------------------------------- Fri Jan 29 16:28:08 UTC 2021 - Fridrich Strba diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index aeedf2e..e41bb38 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -18,7 +18,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} -%global icedtea_version 3.17.1 +%global icedtea_version 3.18.0 %global icedtea_sound_version 1.0.1 %global buildoutputdir openjdk.build/ # Convert an absolute path to a relative path. Each symbolic link is @@ -32,8 +32,8 @@ # priority must be 6 digits in total %global priority 1805 %global javaver 1.8.0 -%global updatever 275 -%global buildver 01 +%global updatever 282 +%global buildver 07 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -201,7 +201,6 @@ Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch Patch1002: icedtea-3.8.0-s390.patch Patch2001: disable-doclint-by-default.patch Patch2002: JDK_1_8_0-8208602.patch -Patch2003: JDK-8247619.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf @@ -540,7 +539,6 @@ patch -p0 -i %{PATCH103} patch -p0 -i %{PATCH2001} patch -p0 -i %{PATCH2002} -patch -p0 -i %{PATCH2003} (cd openjdk/common/autoconf bash ./autogen.sh diff --git a/jaxp.tar.xz b/jaxp.tar.xz index cfa73a2..7c90710 100644 --- a/jaxp.tar.xz +++ b/jaxp.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ac06b706129fb5443f9590be860ff246442340f06808197dc209ca1502b8b74 -size 2267932 +oid sha256:84d29f9e969a301607547f3479689e2e34f94c851091e8cf1eedf445a049afca +size 2268136 diff --git a/jaxws.tar.xz b/jaxws.tar.xz index 5cf5475..135290f 100644 --- a/jaxws.tar.xz +++ b/jaxws.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e487665bc4fcbc597c3b3d3e9c9819e03adfa63f904ba3c650b36a5c5d4b67a5 -size 2277028 +oid sha256:2f304535f1fa7c916975e8972cb748bf2679d0eb7d2b3fd1230ded58e2e1ecf2 +size 2277356 diff --git a/jdk.tar.xz b/jdk.tar.xz index 84711d6..9cb420f 100644 --- a/jdk.tar.xz +++ b/jdk.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd62ed755c9e1ddbe1d3ff58722b70c8e867c4d280adaa0c0fcce40820039cf -size 40596084 +oid sha256:c265bbd54c1ac4e4ba0dc9e77329fc59ec7d130b45228ccefda8d08fee458134 +size 40637140 diff --git a/langtools.tar.xz b/langtools.tar.xz index c41072b..c1731b6 100644 --- a/langtools.tar.xz +++ b/langtools.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d5f936dc5d8280686d511aedb21009d0075b4fd5c7b5f2d7897b3fa940f7069 -size 2080096 +oid sha256:4d76c80df0443d0e3aef8577468afeb517a14d1d741cfb3baa65acc21b6eafb5 +size 2080068 diff --git a/nashorn.tar.xz b/nashorn.tar.xz index 8debc59..79dd5dd 100644 --- a/nashorn.tar.xz +++ b/nashorn.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:206bcc49633138cc09128aa4ec71d0259ecea4f8d6a55981bd0dc1fb76bf1728 -size 2319500 +oid sha256:4aae629c96ac941739a7a2893b823375ab7d9221032b9e03903cf82be0211693 +size 2323912 diff --git a/openjdk.tar.xz b/openjdk.tar.xz index 3f07689..b94927a 100644 --- a/openjdk.tar.xz +++ b/openjdk.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1ef1d1dc3c3eac88b7bece739251b479fe0fefa122a62d1911f811b853408de -size 364724 +oid sha256:6de67e0ff2b27ab158e86f2484f1bce3481a9090f8ad8c744f2e9b736525c1f4 +size 364932 diff --git a/shenandoah.tar.xz b/shenandoah.tar.xz index 7984bd7..06e472f 100644 --- a/shenandoah.tar.xz +++ b/shenandoah.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2dfc5105336d1b5dcd08641358d66a40d87be637d2f2e7491a71b8fb5161668 -size 7276688 +oid sha256:5a8fc20326573b96eaa36a80f40d1fcd35cd2bd93e81d7621ff5eb95253a4ecf +size 7279864 From 6716708751032da0519f58cf5fbac30d623f02014bfd9b89270277713e551a8f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Feb 2021 08:43:47 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=365 --- java-1_8_0-openjdk.changes | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 8773c3f..71fd663 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -187,17 +187,6 @@ Mon Feb 8 08:08:11 UTC 2021 - Fridrich Strba * AArch32 port + JDK-8253036: Support building the Zero assembler port on AArch64 -- Removed patch: - * JDK-8247619.patch - + unneeded with this version - -------------------------------------------------------------------- -Fri Jan 29 16:28:08 UTC 2021 - Fridrich Strba - -- Added patch: - * JDK-8247619.patch - + Fix security bug of January 2021 CPU - + 8247619: Improve Direct Buffering of Characters ------------------------------------------------------------------- Thu Nov 26 19:13:31 UTC 2020 - Fridrich Strba