aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2020-08-19 22:40:04 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2020-08-19 22:40:04 +0000
commitd859457c021e7cf0ce2f4356c4cb87ccd50f228d (patch)
treef49bb9b12ec9594bcc83e045fd44e40ec37cfcb5 /java
parentf2230368a853310b21fd95f1739153c2ee8ca1cc (diff)
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c17
-rw-r--r--java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h18
-rw-r--r--java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c19
-rw-r--r--java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h17
4 files changed, 71 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c b/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c
new file mode 100644
index 000000000000..13cf826b7a8a
--- /dev/null
+++ b/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.c
@@ -0,0 +1,17 @@
+--- jdk/src/solaris/native/java/lang/childproc.c.orig 2020-08-01 01:24:39 UTC
++++ jdk/src/solaris/native/java/lang/childproc.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2013, 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
+@@ -33,6 +33,7 @@
+
+ #include "childproc.h"
+
++const char * const *parentPathv;
+
+ ssize_t
+ restartableWrite(int fd, const void *buf, size_t count)
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h b/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h
new file mode 100644
index 000000000000..39ab4e0d96ce
--- /dev/null
+++ b/java/openjdk8/files/patch-jdk_src_solaris_native_java_lang_childproc.h
@@ -0,0 +1,18 @@
+--- jdk/src/solaris/native/java/lang/childproc.h.orig 2020-08-01 01:24:39 UTC
++++ jdk/src/solaris/native/java/lang/childproc.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2013, 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
+@@ -119,7 +119,7 @@ typedef struct _SpawnInfo {
+ * The cached and split version of the JDK's effective PATH.
+ * (We don't support putenv("PATH=...") in native code)
+ */
+-const char * const *parentPathv;
++extern const char * const *parentPathv;
+
+ ssize_t restartableWrite(int fd, const void *buf, size_t count);
+ int restartableDup2(int fd_from, int fd_to);
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c
new file mode 100644
index 000000000000..7626da868e03
--- /dev/null
+++ b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c
@@ -0,0 +1,19 @@
+--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.orig 2020-08-01 01:24:39 UTC
++++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 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
+@@ -27,6 +27,9 @@
+ #include <stdlib.h>
+ #include <dlfcn.h>
+ #include "NativeFunc.h"
++
++/* global GSS function table */
++GSS_FUNCTION_TABLE_PTR ftab;
+
+ /* standard GSS method names (ordering is from mapfile) */
+ static const char RELEASE_NAME[] = "gss_release_name";
diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h
new file mode 100644
index 000000000000..e1300e34988a
--- /dev/null
+++ b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h
@@ -0,0 +1,17 @@
+--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.orig 2020-08-01 01:24:39 UTC
++++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 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
+@@ -265,6 +265,6 @@ typedef struct GSS_FUNCTION_TABLE {
+ typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
+
+ /* global GSS function table */
+-GSS_FUNCTION_TABLE_PTR ftab;
++extern GSS_FUNCTION_TABLE_PTR ftab;
+
+ #endif