push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
--- a/src/hotspot/os/linux/os_linux.cpp 2025-04-08 14:43:06.765198522 +0200
+++ b/src/hotspot/os/linux/os_linux.cpp 2025-04-08 14:43:27.890301990 +0200
@@ -2758,9 +2758,7 @@
assert(ret, "cannot locate libjvm");
char *rp = nullptr;
if (ret && dli_fname[0] != '\0') {
- rp = os::realpath(dli_fname, buf, buflen);
- }
- if (rp == nullptr) {
+ snprintf(buf, buflen, "%s", dli_fname);
return;
}

View File

@@ -0,0 +1,25 @@
diff --git a/make/PreInit.gmk b/make/PreInit.gmk
index 3df44308dd..490d7c24e9 100644
--- a/make/PreInit.gmk
+++ b/make/PreInit.gmk
@@ -60,13 +60,19 @@
# Extract non-global targets that require a spec file.
CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
+# GNU make-4.4 (and later) include not just single-letter form of the
+# options MAKEFILES but also long for and even some of the arguments.
+# Skip long form and use only short form:
+# MAKEFLAGS=' --debug=basic -- LOG=trace ...'
+MAKEFLAGS_SINGLE_LETTER := $(firstword -$(MAKEFLAGS))
+
# If we have only global targets, or if we are called with -qp (assuming an
# external part, e.g. bash completion, is trying to understand our targets),
# we will skip SPEC location and the sanity checks.
ifeq ($(CALLED_SPEC_TARGETS), )
SKIP_SPEC := true
endif
-ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
+ifeq ($(findstring p, $(MAKEFLAGS_SINGLE_LETTER))$(findstring q, $(MAKEFLAGS_SINGLE_LETTER)), pq)
SKIP_SPEC := true
endif

View File

@@ -0,0 +1,30 @@
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400
@@ -71,6 +71,7 @@
*
* The preference of the default trusted KeyStore is:
* javax.net.ssl.trustStore
+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
* jssecacerts
* cacerts
*/
@@ -125,7 +126,8 @@
static TrustStoreDescriptor run() {
// Get the system properties for trust store.
String storePropName = System.getProperty(
- "javax.net.ssl.trustStore", jsseDefaultStore);
+ "javax.net.ssl.trustStore",
+ System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));
String storePropType = System.getProperty(
"javax.net.ssl.trustStoreType",
KeyStore.getDefaultType());
@@ -137,6 +139,9 @@
String temporaryName = "";
File temporaryFile = null;
long temporaryTime = 0L;
+ if (storePropName == null) {
+ storePropName = jsseDefaultStore;
+ }
if (!"NONE".equals(storePropName)) {
String[] fileNames =
new String[] {storePropName, defaultStore};

View File

@@ -0,0 +1,6 @@
{
"hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=",
"owner": "openjdk",
"repo": "jdk25u",
"rev": "refs/tags/jdk-25+36"
}