packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I5IFXZ: upgrade to jdk8u342-ga

Browse Source
This commit is contained in:
kuenking111 2022-07-22 15:27:58 +08:00
parent 5c172903b9
commit bd3cf55c14
10 changed files with 75 additions and 1575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
7092821-java.security.Provider.getService-is-synchro.patch
View File

@ -43,21 +43,22 @@ Bug url: https://bugs.openjdk.java.net/browse/JDK-7092821
create mode 100644 jdk/test/micro/org/openeuler/bench/security/provider/GetServiceBenchmark.java
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java b/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
index efe8031fe..472439b86 100644
index 1e5b5dd0..66a26db2 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -28,6 +28,10 @@ package com.sun.crypto.provider;
@@ -28,7 +28,10 @@ package com.sun.crypto.provider;
import java.security.AccessController;
import java.security.Provider;
import java.security.SecureRandom;
-
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
/**
@@ -78,16 +82,6 @@ public final class SunJCE extends Provider {
* The "SunJCE" Cryptographic Service Provider.
@@ -78,16 +81,6 @@ public final class SunJCE extends Provider {
"(implements RSA, DES, Triple DES, AES, Blowfish, ARCFOUR, RC2, PBE, "
+ "Diffie-Hellman, HMAC)";
@ -74,11 +75,10 @@ index efe8031fe..472439b86 100644
/* Are we debugging? -- for developers */
static final boolean debug = false;
@@ -102,10 +96,116 @@ public final class SunJCE extends Provider {
@@ -102,10 +95,115 @@ public final class SunJCE extends Provider {
}
static SecureRandom getRandom() { return SecureRandomHolder.RANDOM; }
+
+ // create an aliases List from the specified aliases
+ public static List<String> createAliases(String ... aliases) {
+ return Arrays.asList(aliases);
@ -191,7 +191,7 @@ index efe8031fe..472439b86 100644
final String BLOCK_MODES = "ECB|CBC|PCBC|CTR|CTS|CFB|OFB" +
"|CFB8|CFB16|CFB24|CFB32|CFB40|CFB48|CFB56|CFB64" +
"|OFB8|OFB16|OFB24|OFB32|OFB40|OFB48|OFB56|OFB64";
@@ -114,676 +214,516 @@ public final class SunJCE extends Provider {
@@ -114,694 +212,529 @@ public final class SunJCE extends Provider {
"|OFB72|OFB80|OFB88|OFB96|OFB104|OFB112|OFB120|OFB128";
final String BLOCK_PADS = "NOPADDING|PKCS5PADDING|ISO10126PADDING";
@ -788,7 +788,19 @@ index efe8031fe..472439b86 100644
- put("Alg.Alias.Mac.1.2.840.113549.2.11", "HmacSHA512");
-
- put("Mac.HmacPBESHA1",
- "com.sun.crypto.provider.HmacPKCS12PBESHA1");
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1");
- put("Mac.HmacPBESHA224",
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224");
- put("Mac.HmacPBESHA256",
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256");
- put("Mac.HmacPBESHA384",
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384");
- put("Mac.HmacPBESHA512",
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512");
- put("Mac.HmacPBESHA512/224",
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224");
- put("Mac.HmacPBESHA512/256",
- "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256");
-
- // PBMAC1
-
@ -815,6 +827,12 @@ index efe8031fe..472439b86 100644
- put("Mac.HmacSHA384 SupportedKeyFormats", "RAW");
- put("Mac.HmacSHA512 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA1 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA224 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA256 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA384 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA512 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA512/224 SupportedKeyFormats", "RAW");
- put("Mac.HmacPBESHA512/256 SupportedKeyFormats", "RAW");
- put("Mac.PBEWithHmacSHA1 SupportedKeyFormatS", "RAW");
- put("Mac.PBEWithHmacSHA224 SupportedKeyFormats", "RAW");
- put("Mac.PBEWithHmacSHA256 SupportedKeyFormats", "RAW");
@ -1324,8 +1342,21 @@ index efe8031fe..472439b86 100644
+ ps("Mac", "HmacSHA512", "com.sun.crypto.provider.HmacCore$HmacSHA512",
+ macSHA512Aliases, attrs);
+ // TODO: aliases with OIDs
+ ps("Mac", "HmacPBESHA1", "com.sun.crypto.provider.HmacPKCS12PBESHA1",
+ ps("Mac", "HmacPBESHA1", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1",
+ null, attrs);
+ ps("Mac", "HmacPBESHA224", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224",
+ null, attrs);
+ ps("Mac", "HmacPBESHA256", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256",
+ null, attrs);
+ ps("Mac", "HmacPBESHA384", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384",
+ null, attrs);
+ ps("Mac", "HmacPBESHA512", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512",
+ null, attrs);
+ ps("Mac", "HmacPBESHA512/224", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224",
+ null, attrs);
+ ps("Mac", "HmacPBESHA512/256", "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256",
+ null, attrs);
+
+ // PBMAC1
+ ps("Mac", "PBEWithHmacSHA1",
+ "com.sun.crypto.provider.PBMAC1Core$HmacSHA1", null, attrs);

85
8168926.patch
View File

@ -1,85 +0,0 @@
From 72853c670c97aae4eab64a5e9edb3c7176beaf6a Mon Sep 17 00:00:00 2001
Date: Fri, 22 Jan 2021 16:36:41 +0800
Subject: 8168926: C2: Bytecode escape analyzer crashes due to
stack overflow
Summary: <C2>:8168926: C2: Bytecode escape analyzer crashes due to stack overflow
LLT: N/A
Bug url: https://bugs.openjdk.java.net/browse/JDK-8168926
---
hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp | 30 ++++++++++++++++++--
hotspot/src/share/vm/ci/ciMethod.hpp | 12 +++++---
2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
index 2b9e0e514..34bdbe94d 100644
--- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
+++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
@@ -894,9 +894,33 @@ void BCEscapeAnalyzer::iterate_one_block(ciBlock *blk, StateInfo &state, Growabl
ciMethod* target = s.get_method(ignored_will_link, &declared_signature);
ciKlass* holder = s.get_declared_method_holder();
assert(declared_signature != NULL, "cannot be null");
- // Push appendix argument, if one.
- if (s.has_appendix()) {
- state.apush(unknown_obj);
+ // If the current bytecode has an attached appendix argument,
+ // push an unknown object to represent that argument. (Analysis
+ // of dynamic call sites, especially invokehandle calls, needs
+ // the appendix argument on the stack, in addition to "regular" arguments
+ // pushed onto the stack by bytecode instructions preceding the call.)
+ //
+ // The escape analyzer does _not_ use the ciBytecodeStream::has_appendix(s)
+ // method to determine whether the current bytecode has an appendix argument.
+ // The has_appendix() method obtains the appendix from the
+ // ConstantPoolCacheEntry::_f1 field, which can happen concurrently with
+ // resolution of dynamic call sites. Callees in the
+ // ciBytecodeStream::get_method() call above also access the _f1 field;
+ // interleaving the get_method() and has_appendix() calls in the current
+ // method with call site resolution can lead to an inconsistent view of
+ // the current method's argument count. In particular, some interleaving(s)
+ // can cause the method's argument count to not include the appendix, which
+ // then leads to stack over-/underflow in the escape analyzer.
+ //
+ // Instead of pushing the argument if has_appendix() is true, the escape analyzer
+ // pushes an appendix for all call sites targeted by invokedynamic and invokehandle
+ // instructions, except if the call site is the _invokeBasic intrinsic
+ // (that intrinsic is always targeted by an invokehandle instruction but does
+ // not have an appendix argument).
+ if (target->is_loaded() &&
+ Bytecodes::has_optional_appendix(s.cur_bc_raw()) &&
+ target->intrinsic_id() != vmIntrinsics::_invokeBasic) {
+ state.apush(unknown_obj);
}
// Pass in raw bytecode because we need to see invokehandle instructions.
invoke(state, s.cur_bc_raw(), target, holder);
diff --git a/hotspot/src/share/vm/ci/ciMethod.hpp b/hotspot/src/share/vm/ci/ciMethod.hpp
index 307452422..99d8dbe67 100644
--- a/hotspot/src/share/vm/ci/ciMethod.hpp
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp
@@ -133,15 +133,19 @@ class ciMethod : public ciMetadata {
check_is_loaded();
return _signature->size() + (_flags.is_static() ? 0 : 1);
}
- // Report the number of elements on stack when invoking this method.
- // This is different than the regular arg_size because invokedynamic
- // has an implicit receiver.
+ // Report the number of elements on stack when invoking the current method.
+ // If the method is loaded, arg_size() gives precise information about the
+ // number of stack elements (using the method's signature and its flags).
+ // However, if the method is not loaded, the number of stack elements must
+ // be determined differently, as the method's flags are not yet available.
+ // The invoke_arg_size() method assumes in that case that all bytecodes except
+ // invokestatic and invokedynamic have a receiver that is also pushed onto the
+ // stack by the caller of the current method.
int invoke_arg_size(Bytecodes::Code code) const {
if (is_loaded()) {
return arg_size();
} else {
int arg_size = _signature->size();
- // Add a receiver argument, maybe:
if (code != Bytecodes::_invokestatic &&
code != Bytecodes::_invokedynamic) {
arg_size++;
--
2.19.0

156
8194154.patch
View File

@ -1,156 +0,0 @@
From 5547d1f77577ad8514136255eed16921e4d02845 Mon Sep 17 00:00:00 2001
Date: Fri, 22 Jan 2021 15:23:47 +0800
Subject: 8194154: System property user.dir should not be changed
Summary: <io>: System property user.dir should not be changed
LLT: jdk/test/java/io/File/UserDirChangedTest.java
Bug url: https://bugs.openjdk.java.net/browse/JDK-8194154
---
.../classes/java/io/UnixFileSystem.java | 11 +++-
.../classes/java/io/WinNTFileSystem.java | 11 +++-
jdk/test/java/io/File/UserDirChangedTest.java | 51 +++++++++++++++++++
3 files changed, 69 insertions(+), 4 deletions(-)
create mode 100644 jdk/test/java/io/File/UserDirChangedTest.java
diff --git a/jdk/src/solaris/classes/java/io/UnixFileSystem.java b/jdk/src/solaris/classes/java/io/UnixFileSystem.java
index fb0fef636..a6ef2d3a6 100644
--- a/jdk/src/solaris/classes/java/io/UnixFileSystem.java
+++ b/jdk/src/solaris/classes/java/io/UnixFileSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -34,6 +34,7 @@ class UnixFileSystem extends FileSystem {
private final char slash;
private final char colon;
private final String javaHome;
+ private final String userDir;
public UnixFileSystem() {
slash = AccessController.doPrivileged(
@@ -42,6 +43,8 @@ class UnixFileSystem extends FileSystem {
new GetPropertyAction("path.separator")).charAt(0);
javaHome = AccessController.doPrivileged(
new GetPropertyAction("java.home"));
+ userDir = AccessController.doPrivileged(
+ new GetPropertyAction("user.dir"));
}
@@ -130,7 +133,11 @@ class UnixFileSystem extends FileSystem {
public String resolve(File f) {
if (isAbsolute(f)) return f.getPath();
- return resolve(System.getProperty("user.dir"), f.getPath());
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPropertyAccess("user.dir");
+ }
+ return resolve(userDir, f.getPath());
}
// Caches for canonicalization results to improve startup performance.
diff --git a/jdk/src/windows/classes/java/io/WinNTFileSystem.java b/jdk/src/windows/classes/java/io/WinNTFileSystem.java
index caa47f80c..1844a662a 100644
--- a/jdk/src/windows/classes/java/io/WinNTFileSystem.java
+++ b/jdk/src/windows/classes/java/io/WinNTFileSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -40,6 +40,7 @@ class WinNTFileSystem extends FileSystem {
private final char slash;
private final char altSlash;
private final char semicolon;
+ private final String userDir;
// Whether to enable alternative data streams (ADS) by suppressing
// checking the path for invalid characters, in particular ":".
@@ -47,6 +48,8 @@ class WinNTFileSystem extends FileSystem {
semicolon = AccessController.doPrivileged(
new GetPropertyAction("path.separator")).charAt(0);
altSlash = (this.slash == '\\') ? '/' : '\\';
+ userDir = AccessController.doPrivileged(
+ new GetPropertyAction("user.dir"));
}
private boolean isSlash(char c) {
@@ -343,7 +346,11 @@ class WinNTFileSystem extends FileSystem {
private String getUserPath() {
/* For both compatibility and security,
we must look this up every time */
- return normalize(System.getProperty("user.dir"));
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPropertyAccess("user.dir");
+ }
+ return normalize(userDir);
}
private String getDrive(String path) {
diff --git a/jdk/test/java/io/File/UserDirChangedTest.java b/jdk/test/java/io/File/UserDirChangedTest.java
new file mode 100644
index 000000000..9eccb768e
--- /dev/null
+++ b/jdk/test/java/io/File/UserDirChangedTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ @bug 8194154
+ @summary Test changing property user.dir on impacting getCanonicalPath
+ @run main/othervm UserDirChangedTest
+ */
+
+import java.io.File;
+
+public class UserDirChangedTest {
+ public static void main(String[] args) throws Exception {
+ String keyUserDir = "user.dir";
+ String userDirNew = "/home/a/b/c/";
+ String fileName = "./a";
+
+ String userDir = System.getProperty(keyUserDir);
+ File file = new File(fileName);
+ String canFilePath = file.getCanonicalPath();
+
+ // now reset user.dir, this will cause crash on linux without bug 8194154 fixed.
+ System.setProperty(keyUserDir, userDirNew);
+ String newCanFilePath = file.getCanonicalPath();
+ System.out.format("%24s %48s%n", "Canonical Path = ", canFilePath);
+ System.out.format("%24s %48s%n", "new Canonical Path = ", newCanFilePath);
+ if (!canFilePath.equals(newCanFilePath)) {
+ throw new RuntimeException("Changing property user.dir should have no effect on getCanonicalPath");
+ }
+ }
+}
--
2.19.0

1185
8202142-jfr-event-io-TestInstrumentation-is-unstable.patch
View File

File diff suppressed because it is too large Load Diff

15
8268819-SA-Remove-libthread_db-dependency-on-Linux.patch
View File

@ -314,23 +314,16 @@ index 802e5b0bb..a8e0c2a5c 100644
-
#endif /* _PROC_SERVICE_H_ */
diff --git a/hotspot/agent/src/os/linux/ps_core.c b/hotspot/agent/src/os/linux/ps_core.c
index b7fe4c095..6da43f195 100644
index 6fb8c940..5728bcc4 100644
--- a/hotspot/agent/src/os/linux/ps_core.c
+++ b/hotspot/agent/src/os/linux/ps_core.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -31,6 +31,7 @@
#include <elf.h>
#include <link.h>
#include "libproc_impl.h"
+#include "proc_service.h"
#include "salibelf.h"
// This file has the libproc implementation to read core files.
@@ -546,8 +547,7 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size
prstatus_t* prstat = (prstatus_t*) buf;
@ -338,9 +331,9 @@ index b7fe4c095..6da43f195 100644
print_debug("got integer regset for lwp %d\n", prstat->pr_pid);
- // we set pthread_t to -1 for core dump
- if((newthr = add_thread_info(ph, (pthread_t) -1, prstat->pr_pid)) == NULL)
+ if((newthr = add_thread_info(ph, prstat->pr_pid)) == NULL)
+ if((newthr = add_thread_info(ph, prstat->pr_pid)) == NULL)
return false;
// copy regs
diff --git a/hotspot/agent/src/os/linux/ps_proc.c b/hotspot/agent/src/os/linux/ps_proc.c
index c4d6a9ecc..748cc1397 100644

16
debuginfo.diz-should-not-contain-the-path-after-unzip.patch
View File

@ -1,16 +0,0 @@
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 0e0346374..2d9bdbeed 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -537,7 +537,7 @@ define SetupNativeCompilation
# to be rebuilt properly.
$$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
$(CD) $$($1_OBJECT_DIR) \
- && $(ZIP) -q $$@ $$($1_DEBUGINFO_FILES)
+ && $(ZIP) -q $$@ $$(subst $$($1_OBJECT_DIR)/,,$$($1_DEBUGINFO_FILES))
endif
else
ifneq ($$($1_STRIP_POLICY), no_strip)
--
2.22.0

80
fix-log-bug-enhance-aes-hmac-performance.patch
View File

@ -17,38 +17,10 @@ Signed-off-by: He Dongbo <hedongbo@huawei.com>
create mode 100644 jdk/test/micro/org/openeuler/bench/security/openssl/HMacBenchmark.java
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 60298422f..bdfdd207b 100644
index 27cff542..d19c772e 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4288,7 +4288,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
################################################################################
# The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2010 2012 2013 2015 2017"
+VALID_VS_VERSIONS="2010 2012 2013 2015 2017 2019"
VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
VS_VERSION_INTERNAL_2010=100
@@ -4346,6 +4346,18 @@ VS_SDK_INSTALLDIR_2017=
VS_VS_PLATFORM_NAME_2017="v141"
VS_SDK_PLATFORM_NAME_2017=
+VS_DESCRIPTION_2019="Microsoft Visual Studio 2019 - CURRENTLY NOT WORKING"
+VS_VERSION_INTERNAL_2019=141
+VS_MSVCR_2019=vcruntime140.dll
+VS_MSVCP_2019=msvcp140.dll
+VS_ENVVAR_2019="VS150COMNTOOLS"
+VS_USE_UCRT_2019="true"
+VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019"
+VS_EDITIONS_2019="Community Professional Enterprise"
+VS_SDK_INSTALLDIR_2019=
+VS_VS_PLATFORM_NAME_2019="v141"
+VS_SDK_PLATFORM_NAME_2019=
+
################################################################################
@@ -25694,10 +25706,10 @@ $as_echo "$as_me: Valid Visual Studio versions: $VALID_VS_VERSIONS." >&6;}
@@ -25937,10 +25937,10 @@ $as_echo "$as_me: Valid Visual Studio versions: $VALID_VS_VERSIONS." >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -61,7 +33,7 @@ index 60298422f..bdfdd207b 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -25751,10 +25763,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
@@ -25994,10 +25994,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -74,7 +46,7 @@ index 60298422f..bdfdd207b 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -25790,8 +25802,6 @@ $as_echo "$as_me: directory within the Visual Studio installation" >&6;}
@@ -26033,8 +26033,6 @@ $as_echo "$as_me: directory within the Visual Studio installation" >&6;}
fi
fi
@ -83,7 +55,7 @@ index 60298422f..bdfdd207b 100644
if test "x$VS_COMNTOOLS" != x; then
if test "x$VS_ENV_CMD" = x; then
@@ -25824,10 +25834,10 @@ $as_echo "$as_me: directory within the Visual Studio installation" >&6;}
@@ -26067,10 +26065,10 @@ $as_echo "$as_me: directory within the Visual Studio installation" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -96,7 +68,7 @@ index 60298422f..bdfdd207b 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -25883,10 +25893,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
@@ -26126,10 +26124,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -109,7 +81,7 @@ index 60298422f..bdfdd207b 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -25944,10 +25954,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
@@ -26187,10 +26185,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -122,7 +94,7 @@ index 60298422f..bdfdd207b 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -26002,10 +26012,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
@@ -26245,10 +26243,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -135,7 +107,7 @@ index 60298422f..bdfdd207b 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -26059,10 +26069,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
@@ -26302,10 +26300,10 @@ $as_echo "$as_me: Warning: None of $VCVARSFILES were found, Visual Studio instal
{ $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS_BASE using $METHOD" >&5
$as_echo "$as_me: Found Visual Studio installation at $VS_BASE using $METHOD" >&6;}
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -149,38 +121,10 @@ index 60298422f..bdfdd207b 100644
for VCVARSFILE in $VCVARSFILES; do
diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
index a78f9ac66..0b5efdad2 100644
index 9e617c33..f024da1e 100644
--- a/common/autoconf/toolchain_windows.m4
+++ b/common/autoconf/toolchain_windows.m4
@@ -25,7 +25,7 @@
################################################################################
# The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2010 2012 2013 2015 2017"
+VALID_VS_VERSIONS="2010 2012 2013 2015 2017 2019"
VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
VS_VERSION_INTERNAL_2010=100
@@ -83,6 +83,18 @@ VS_SDK_INSTALLDIR_2017=
VS_VS_PLATFORM_NAME_2017="v141"
VS_SDK_PLATFORM_NAME_2017=
+VS_DESCRIPTION_2019="Microsoft Visual Studio 2019 - CURRENTLY NOT WORKING"
+VS_VERSION_INTERNAL_2019=141
+VS_MSVCR_2019=vcruntime140.dll
+VS_MSVCP_2019=msvcp140.dll
+VS_ENVVAR_2019="VS150COMNTOOLS"
+VS_USE_UCRT_2019="true"
+VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019"
+VS_EDITIONS_2019="Community Professional Enterprise"
+VS_SDK_INSTALLDIR_2019=
+VS_VS_PLATFORM_NAME_2019="v141"
+VS_SDK_PLATFORM_NAME_2019=
+
################################################################################
AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
@@ -107,10 +119,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
@@ -121,10 +121,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
if test -d "$VS_BASE"; then
AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
@ -193,7 +137,7 @@ index a78f9ac66..0b5efdad2 100644
fi
for VCVARSFILE in $VCVARSFILES; do
@@ -198,8 +210,6 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
@@ -212,8 +212,6 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
fi
fi

27
fix-make-bugs-when-git-and-hg-not-exist.patch
View File

@ -1,27 +0,0 @@
From a447db8644fe785db481a425fe3efa62cb11122f Mon Sep 17 00:00:00 2001
Date: Mon, 25 Apr 2022 17:12:39 +0800
Subject: [PATCH] Fix make bugs when git and hg not exist
---
make/common/MakeBase.gmk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 2ba3d04..c97a42a 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -318,9 +318,9 @@ SCM_TIP_FILECMD := $(PRINTF) "$(SCM):%s" \
# Emit the scm:id pair to $@
define GetSourceTips
$(CD) $(SRC_ROOT) ; \
- if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \
+ if [ -d "$(SCM_DIR)" -a "$(SCM_VERSION)" != "" ] ; then \
$(ID_COMMAND) >> $@ ; \
- elif [ -f $(SCM_TIP_FILENAME) ] ; then \
+ elif [ -f "$(SCM_TIP_FILENAME)" ] ; then \
$(SCM_TIP_FILECMD) >> $@ ; \
fi;
$(PRINTF) "\n" >> $@
--
1.8.3.1

BIN
jdk8u-jdk8u332-b09.tar.xz → jdk8u-jdk8u342-b07.tar.xz
View File

Binary file not shown.

37
openjdk-1.8.0.spec
View File

@ -146,13 +146,13 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global repo jdk8u
%global revision jdk8u332-b09
%global revision jdk8u342-b07
%global full_revision %{repo}-%{revision}
# Define IcedTea version used for SystemTap tapsets and desktop files
%global icedteaver 3.15.0
%global updatever 332
%global buildver b09
%global updatever 342
%global buildver b07
# priority must be 7 digits in total. The expression is workarounding tip
%global priority 1800%{updatever}
@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 7
Release: 0
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@ -993,7 +993,6 @@ Patch58: Reduce-the-probability-of-the-crash-related-to-ciObj.patch
Patch62: 8165857.patch
Patch63: 8033552.patch
Patch67: 8165860.patch
Patch68: 8194154.patch
Patch70: 8164948.patch
# 8u242
@ -1044,7 +1043,6 @@ Patch142: 8207160.patch
Patch144: add-appcds-test-case.patch
# 8u282
Patch146: 8168926.patch
Patch147: 8215047.patch
Patch148: 8237894.patch
Patch149: Remove-the-parentheses-around-company-name.patch
@ -1080,7 +1078,6 @@ Patch184: set-vm.vendor-by-configure.patch
Patch185: update-cacerts-and-VerifyCACerts.java-test.patch
Patch186: update-to-keep-same-with-master.patch
Patch188: 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch
Patch189: 8266187_Memory_leak_in_appendBootClassPath.patch
Patch192: add_kae_implementation_add_default_conf_file.patch
Patch193: improve_algorithmConstraints_checkAlgorithm_performance.patch
Patch194: modify_the_default_iteration_time_and_forks_in_the_JMH_of_KAEProvider.patch
@ -1104,7 +1101,6 @@ Patch212: enhance-the-TimeZone-s-path-solution-on-Euler.patch
Patch214: fix-appcds-s-option-AppCDSLockFile.patch
Patch215: PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch
Patch216: Parallel-Full-GC-for-G1.patch
Patch217: 8202142-jfr-event-io-TestInstrumentation-is-unstable.patch
Patch218: 8143251-Thread-suspend-on-VM_G1IncCollectionPause-do.patch
Patch219: G1Uncommit-Introduce-G1PeriodGCNotRetry-control-whet.patch
Patch220: JDK-debug-version-crash-when-using-AppCDS.patch
@ -1120,7 +1116,6 @@ Patch229: downgrade-the-symver-of-fcntl64.patch
# 8u322
Patch230: add-system-property-swing.JComboBox.useLegacyMode.patch
Patch231: debuginfo.diz-should-not-contain-the-path-after-unzip.patch
Patch232: 8173361-various-crashes-in-JvmtiExport-post_compiled.patch
Patch233: fix-TestUseCompressedOopsErgo-run-failed.patch
Patch235: fix-testme-Test6929067-run-faild.patch
@ -1132,7 +1127,6 @@ Patch240: 8207011-Remove-uses-of-the-register-storage-class-specifier.patch
Patch241: 8268819-SA-Remove-libthread_db-dependency-on-Linux.patch
# 8u332
Patch242: fix-make-bugs-when-git-and-hg-not-exist.patch
Patch243: Fix-compile-and-runtime-failures-for-minimal1-versio.patch
Patch244: fix_X509TrustManagerImpl_symantec_distrust.patch
Patch245: change-sa-jdi.jar-make-file-for-BEP.PATCH
@ -1140,6 +1134,8 @@ Patch246: 7092821-java.security.Provider.getService-is-synchro.patch
Patch247: 8173339-AArch64-Fix-minimum-stack-size-computations.patch
Patch248: 8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch
# 8u342
#############################################
#
# Upstreamable patches
@ -1497,7 +1493,6 @@ pushd %{top_level_dir_name}
%patch62 -p1
%patch63 -p1
%patch67 -p1
%patch68 -p1
%patch70 -p1
%patch75 -p1
%patch83 -p1
@ -1536,7 +1531,6 @@ pushd %{top_level_dir_name}
%patch141 -p1
%patch142 -p1
%patch144 -p1
%patch146 -p1
%patch147 -p1
%patch148 -p1
%patch149 -p1
@ -1570,7 +1564,6 @@ pushd %{top_level_dir_name}
%patch185 -p1
%patch186 -p1
%patch188 -p1
%patch189 -p1
%patch192 -p1
%patch194 -p1
%patch195 -p1
@ -1591,7 +1584,6 @@ pushd %{top_level_dir_name}
%patch214 -p1
%patch215 -p1
%patch216 -p1
%patch217 -p1
%patch218 -p1
%patch219 -p1
%patch220 -p1
@ -1603,7 +1595,6 @@ pushd %{top_level_dir_name}
%patch228 -p1
%patch229 -p1
%patch230 -p1
%patch231 -p1
%patch232 -p1
%patch233 -p1
%patch235 -p1
@ -1613,7 +1604,6 @@ pushd %{top_level_dir_name}
%patch239 -p1
%patch240 -p1
%patch241 -p1
%patch242 -p1
%patch243 -p1
%patch244 -p1
%patch245 -p1
@ -2244,6 +2234,17 @@ cjc.mainProgram(arg)
%endif
%changelog
* Fri Jul 22 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.342-b07.0
- del 8168926.patch
- del 8194154.patch
- del 8202142-jfr-event-io-TestInstrumentation-is-unstable.patch
- del 8266187_Memory_leak_in_appendBootClassPath.patch
- del debuginfo.diz-should-not-contain-the-path-after-unzip.patch
- del fix-make-bugs-when-git-and-hg-not-exist.patch
- modified 7092821-java.security.Provider.getService-is-synchro.patch
- modified 8268819-SA-Remove-libthread_db-dependency-on-Linux.patch
- modified fix-log-bug-enhance-aes-hmac-performance.patch
* Fri Jul 15 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.7
- del remove-gnu-debuglink-when-using-enable-debug-.patch
@ -2256,7 +2257,7 @@ cjc.mainProgram(arg)
* Mon Jul 4 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.4
- add 7092821-java.security.Provider.getService-is-synchro.patch
* Fri Jun 30 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.3
* Thu Jun 30 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.3
- add change-sa-jdi.jar-make-file-for-BEP.PATCH
* Thu Apr 28 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.2
@ -2306,7 +2307,7 @@ cjc.mainProgram(arg)
- deleted Delete-expired-certificate-globalsignr2ca.patch
- deleted inline-optimize-for-aarch64.patch
* Wed Jan 05 2021 noah <hedongbo@huawei.com> - 1:1.8.0.312-b07.11
* Tue Jan 05 2021 noah <hedongbo@huawei.com> - 1:1.8.0.312-b07.11
- adapted to newst cjc to fix issue with rpm 4.17
* Tue Dec 21 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.312-b07.10