forked from pool/java-1_8_0-openj9
Accepting request 845444 from Java:Factory
Oracle July and Octobre 2020 CPU OBS-URL: https://build.opensuse.org/request/show/845444 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=5
This commit is contained in:
3
0394ef7545243942a4b27227a22174c1be67ed60.zip
Normal file
3
0394ef7545243942a4b27227a22174c1be67ed60.zip
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1acd0b760017d08d9f6694aa4c22aade6a313c86c9130529990aca8a59d23f52
|
||||
size 26632201
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2e5435019f0abc09eb7308c13fec438b56fcd0293dc50003f5d4153b357c9392
|
||||
size 26375543
|
3
41f03341d596924e866595d8c94ab3bff33066a4.zip
Normal file
3
41f03341d596924e866595d8c94ab3bff33066a4.zip
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:48a0244ded895e22bd1fc9f6c4571f30af279a83fc752acbc17698dfed94218e
|
||||
size 124676997
|
3
582366ae54510a48f7815921091db00357c4338a.zip
Normal file
3
582366ae54510a48f7815921091db00357c4338a.zip
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:239797fcd77ea53151537b993975dcb3c7a8cd791b5b8f81fb9d77ea36208b16
|
||||
size 10827012
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1b46d971d0778a6670b27e3a4e96955a8938b6b8a9e6f4f43bac14967eaf449c
|
||||
size 122005046
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a24dd8e344ce23bac93c2537a7952c1fcb211e8f3fe4182b0f5a277ec6d9dbeb
|
||||
size 10561824
|
120
gcc10.patch
120
gcc10.patch
@@ -1,120 +0,0 @@
|
||||
diff -urEbwB openjdk.orig/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c openjdk/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
|
||||
--- openjdk.orig/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c 2020-06-26 09:42:58.999803937 +0200
|
||||
+++ openjdk/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c 2020-06-26 09:59:50.543324257 +0200
|
||||
@@ -29,6 +29,9 @@
|
||||
#include "jlong.h"
|
||||
#include <jni.h>
|
||||
|
||||
+/* global GSS function table */
|
||||
+GSS_FUNCTION_TABLE_PTR ftab;
|
||||
+
|
||||
/* Constants for indicating what type of info is needed for inquiries */
|
||||
const int TYPE_CRED_NAME = 10;
|
||||
const int TYPE_CRED_TIME = 11;
|
||||
diff -urEbwB openjdk.orig/jdk/src/solaris/native/java/lang/childproc.c openjdk/jdk/src/solaris/native/java/lang/childproc.c
|
||||
--- openjdk.orig/jdk/src/solaris/native/java/lang/childproc.c 2020-06-26 09:42:59.039804239 +0200
|
||||
+++ openjdk/jdk/src/solaris/native/java/lang/childproc.c 2020-06-26 10:31:35.896900177 +0200
|
||||
@@ -33,6 +33,11 @@
|
||||
|
||||
#include "childproc.h"
|
||||
|
||||
+/**
|
||||
+ * The cached and split version of the JDK's effective PATH.
|
||||
+ * (We don't support putenv("PATH=...") in native code)
|
||||
+ */
|
||||
+const char * const *parentPathv;
|
||||
|
||||
ssize_t
|
||||
restartableWrite(int fd, const void *buf, size_t count)
|
||||
diff -urEbwB openjdk.orig/jdk/src/solaris/native/java/lang/childproc.h openjdk/jdk/src/solaris/native/java/lang/childproc.h
|
||||
--- openjdk.orig/jdk/src/solaris/native/java/lang/childproc.h 2020-06-26 09:42:59.039804239 +0200
|
||||
+++ openjdk/jdk/src/solaris/native/java/lang/childproc.h 2020-06-26 10:29:56.588194377 +0200
|
||||
@@ -119,7 +119,7 @@
|
||||
* 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 -urEbwB openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h
|
||||
--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h 2020-06-26 09:42:59.047804301 +0200
|
||||
+++ openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h 2020-06-26 10:48:28.280138949 +0200
|
||||
@@ -322,12 +322,12 @@
|
||||
|
||||
#endif /* __linux__ */
|
||||
|
||||
-sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
-sctp_bindx_func* nio_sctp_bindx;
|
||||
-sctp_peeloff_func* nio_sctp_peeloff;
|
||||
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
+extern sctp_bindx_func* nio_sctp_bindx;
|
||||
+extern sctp_peeloff_func* nio_sctp_peeloff;
|
||||
|
||||
jboolean loadSocketExtensionFuncs(JNIEnv* env);
|
||||
|
||||
diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
|
||||
--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c 2020-06-26 09:42:59.047804301 +0200
|
||||
+++ openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c 2020-06-26 10:48:01.103944370 +0200
|
||||
@@ -51,6 +51,13 @@
|
||||
static int preCloseFD = -1; /* File descriptor to which we dup other fd's
|
||||
before closing them for real */
|
||||
|
||||
+sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
+sctp_bindx_func* nio_sctp_bindx;
|
||||
+sctp_peeloff_func* nio_sctp_peeloff;
|
||||
+
|
||||
/**
|
||||
* Loads the native sctp library that contains the socket extension
|
||||
* functions, as well as locating the individual functions.
|
||||
diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
|
||||
--- openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-06-26 09:42:59.047804301 +0200
|
||||
+++ openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-06-26 09:43:05.211851045 +0200
|
||||
@@ -265,6 +265,6 @@
|
||||
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
|
||||
|
||||
/* global GSS function table */
|
||||
-GSS_FUNCTION_TABLE_PTR ftab;
|
||||
+extern GSS_FUNCTION_TABLE_PTR ftab;
|
||||
|
||||
#endif
|
||||
diff -urEbwB openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
|
||||
--- openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c 2020-06-26 09:43:37.492095839 +0200
|
||||
+++ openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c 2020-06-26 09:41:42.243256411 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
static jvmtiExtensionFunction subscribe = NULL;
|
||||
static jvmtiExtensionFunction unsubscribe = NULL;
|
||||
|
||||
-void *subscriptionID;
|
||||
+void *subscriptionID1;
|
||||
volatile static jint bufferCount = 0;
|
||||
volatile static int alarmed = 0;
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
jvmtiError err;
|
||||
jvmtiEnv *jvmti_env = env->jvmtiEnv;
|
||||
|
||||
- err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID);
|
||||
+ err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID1);
|
||||
if (err != JVMTI_ERROR_NONE) {
|
||||
error(env, err, "RegisterVerboseGCSubscriber failed");
|
||||
return FALSE;
|
||||
@@ -147,7 +147,7 @@
|
||||
jvmtiError err = JVMTI_ERROR_NONE;
|
||||
jvmtiEnv *jvmti_env = env->jvmtiEnv;
|
||||
|
||||
- err = unsubscribe(jvmti_env, subscriptionID, NULL);
|
||||
+ err = unsubscribe(jvmti_env, subscriptionID1, NULL);
|
||||
if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_NOT_AVAILABLE) {
|
||||
error(env, err, "DeregisterVerboseGCSubscriber failed");
|
||||
return -1;
|
@@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 2 09:07:50 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to OpenJDK 8u2732 build 10 with OpenJ9 0.23.0 virtual
|
||||
machine
|
||||
* including Oracle July 2020 CPU changes (bsc#1174157) and
|
||||
October 2020 CPU changes (bsc#1177943)
|
||||
+ fixes CVE-2020-14556, CVE-2020-14577, CVE-2020-14578,
|
||||
CVE-2020-14579, CVE-2020-14581, CVE-2020-14583,
|
||||
CVE-2020-14593, CVE-2020-14621, CVE-2020-14779,
|
||||
CVE-2020-14781, CVE-2020-14782, CVE-2020-14792,
|
||||
CVE-2020-14796, CVE-2020-14797, CVE-2020-14798 and
|
||||
CVE-2020-14803
|
||||
- Removed patch:
|
||||
* gcc10.patch
|
||||
+ not needed any more in this version
|
||||
- Modified patches:
|
||||
* java-atk-wrapper-security.patch
|
||||
* openj9-no-werror.patch
|
||||
* system-lcms.patch
|
||||
+ rediff to changed context
|
||||
- Added patch:
|
||||
* omr-no-return-in-nonvoid-function.patch
|
||||
+ fix build error on some systems
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 26 09:12:17 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
@@ -24,7 +49,7 @@ Fri Apr 24 06:26:21 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
Wed Apr 15 09:07:59 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- The pack200 and unpack200 alternatives should be slaves of java
|
||||
and not of javac, since they are part of JRE.
|
||||
and not of javac, since they are part of JRE (bsc#1171352).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 27 11:50:27 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
@@ -25,18 +25,18 @@
|
||||
%global abs2rel perl -e %{script}
|
||||
%global syslibdir %{_libdir}
|
||||
# Standard JPackage naming and versioning defines.
|
||||
%global updatever 252
|
||||
%global buildver b09
|
||||
%global updatever 272
|
||||
%global buildver b10
|
||||
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
|
||||
%global root_revision cfa47e66cd5f48491f6e235e0bf41cf753a2cacd
|
||||
%global root_branch openj9-0.20.0
|
||||
%global root_revision 41f03341d596924e866595d8c94ab3bff33066a4
|
||||
%global root_branch openj9-0.23.0
|
||||
%global omr_repository https://github.com/eclipse/openj9-omr/archive
|
||||
%global omr_revision d4365f371ce896bead71bc601cbdb53cc35ab47b
|
||||
%global omr_branch v0.20.0-release
|
||||
%global omr_revision 582366ae54510a48f7815921091db00357c4338a
|
||||
%global omr_branch v0.23.0-release
|
||||
%global openj9_repository https://github.com/eclipse/openj9/archive
|
||||
%global openj9_revision 05fa2d3611f757a1ca7bd45d7312f99dd60403cc
|
||||
%global openj9_branch v0.20.0-release
|
||||
%global openj9_tag openj9-0.20.0
|
||||
%global openj9_revision 0394ef7545243942a4b27227a22174c1be67ed60
|
||||
%global openj9_branch v0.23.0-release
|
||||
%global openj9_tag openj9-0.23.0
|
||||
%global icedtea_sound_version 1.0.1
|
||||
%global freemarker_version 2.3.29
|
||||
# priority must be 6 digits in total
|
||||
@@ -127,7 +127,7 @@ Patch203: system-lcms.patch
|
||||
Patch205: link-with-as-needed.patch
|
||||
|
||||
Patch210: openj9-no-werror.patch
|
||||
Patch211: gcc10.patch
|
||||
Patch211: omr-no-return-in-nonvoid-function.patch
|
||||
|
||||
Patch300: alternative-path-to-tzdb_dat.patch
|
||||
|
||||
@@ -369,7 +369,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
|
||||
%patch205 -p1
|
||||
|
||||
%patch210
|
||||
%patch211 -p1
|
||||
%patch211
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
@@ -1,22 +1,22 @@
|
||||
--- jdk8/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200
|
||||
+++ jdk8/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200
|
||||
@@ -224,7 +224,9 @@
|
||||
com.ibm.oti.,\
|
||||
openj9.internal.,\
|
||||
jdk.xml.internal.,\
|
||||
- com.sun.activation.registries.
|
||||
+ com.sun.activation.registries.,\
|
||||
--- openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200
|
||||
+++ openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200
|
||||
@@ -227,7 +227,9 @@
|
||||
com.sun.activation.registries.,\
|
||||
jdk.jfr.events.,\
|
||||
jdk.jfr.internal.,\
|
||||
- jdk.management.jfr.internal.
|
||||
+ jdk.management.jfr.internal.\
|
||||
+ org.GNOME.Accessibility.,\
|
||||
+ org.GNOME.Bonobo.
|
||||
|
||||
#
|
||||
# List of comma-separated packages that start with or equal this string
|
||||
@@ -274,7 +276,9 @@
|
||||
jdk.nashorn.internal.,\
|
||||
jdk.nashorn.tools.,\
|
||||
jdk.xml.internal.,\
|
||||
- com.sun.activation.registries.
|
||||
+ com.sun.activation.registries.,\
|
||||
@@ -280,7 +282,9 @@
|
||||
com.sun.activation.registries.,\
|
||||
jdk.jfr.events.,\
|
||||
jdk.jfr.internal.,\
|
||||
- jdk.management.jfr.internal.
|
||||
+ jdk.management.jfr.internal.\
|
||||
+ org.GNOME.Accessibility.,\
|
||||
+ org.GNOME.Bonobo.
|
||||
|
||||
|
11
omr-no-return-in-nonvoid-function.patch
Normal file
11
omr-no-return-in-nonvoid-function.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- omr/compiler/z/env/OMRCPU.cpp
|
||||
+++ omr/compiler/z/env/OMRCPU.cpp
|
||||
@@ -586,6 +586,8 @@ OMR::Z::CPU::setSupportsMiscellaneousInstructionExtensions2Facility(bool value)
|
||||
{
|
||||
_flags.reset(S390SupportsMIE2);
|
||||
}
|
||||
+
|
||||
+ return value;
|
||||
}
|
||||
|
||||
bool
|
@@ -26,23 +26,23 @@
|
||||
endif
|
||||
--- omr/omrmakefiles/rules.linux.mk 2020-04-14 14:43:05.000000000 +0200
|
||||
+++ omr/omrmakefiles/rules.linux.mk 2020-06-26 08:19:16.264774446 +0200
|
||||
@@ -348,15 +348,15 @@
|
||||
@@ -345,15 +345,15 @@
|
||||
ifeq ($(OMR_WARNINGS_AS_ERRORS),1)
|
||||
ifeq (ppc,$(OMR_HOST_ARCH))
|
||||
ifeq (gcc,$(OMR_TOOLCHAIN))
|
||||
- GLOBAL_CFLAGS += -Wreturn-type -Werror
|
||||
- GLOBAL_CXXFLAGS += -Wreturn-type -Werror
|
||||
+ GLOBAL_CFLAGS += -Wreturn-type
|
||||
+ GLOBAL_CXXFLAGS += -Wreturn-type
|
||||
else
|
||||
GLOBAL_CFLAGS += -qhalt=w
|
||||
GLOBAL_CXXFLAGS += -qhalt=w
|
||||
endif
|
||||
ifeq (ppc,$(OMR_HOST_ARCH))
|
||||
ifeq (gcc,$(OMR_TOOLCHAIN))
|
||||
- GLOBAL_CFLAGS += -Wreturn-type -Werror
|
||||
- GLOBAL_CXXFLAGS += -Wreturn-type -Werror
|
||||
+ GLOBAL_CFLAGS += -Wreturn-type
|
||||
+ GLOBAL_CXXFLAGS += -Wreturn-type
|
||||
else
|
||||
- GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type -Werror
|
||||
- GLOBAL_CXXFLAGS+=-Wreturn-type -Werror
|
||||
+ GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type
|
||||
+ GLOBAL_CXXFLAGS+=-Wreturn-type
|
||||
GLOBAL_CFLAGS += -qhalt=w
|
||||
GLOBAL_CXXFLAGS += -qhalt=w
|
||||
endif
|
||||
else
|
||||
- GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type -Werror
|
||||
- GLOBAL_CXXFLAGS+=-Wreturn-type -Werror
|
||||
+ GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type
|
||||
+ GLOBAL_CXXFLAGS+=-Wreturn-type
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@@ -50,7 +50,7 @@
|
||||
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:49:00.981751504 +0200
|
||||
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:50:22.897853978 +0200
|
||||
@@ -669,8 +669,8 @@
|
||||
##########################################################################################
|
||||
endif
|
||||
|
||||
# TODO: Update awt lib path when awt is converted
|
||||
-$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
|
||||
|
Reference in New Issue
Block a user