Accepting request 1193637 from Java:Factory

July 2024 CPU

OBS-URL: https://build.opensuse.org/request/show/1193637
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-17-openj9?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2024-08-13 11:25:11 +00:00 committed by Git OBS Bridge
commit 2377c21a5e
9 changed files with 32 additions and 45 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38371f6ef59ba89f89135dd5579d0952cc4d28adb452c25c194a248da70dc5fc
size 29265781

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c01a2db59226a198abd2c6eae857ab1028c91b616fbf80ade639aaec2e21021
size 11151844

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23b4784a86e39f6f11b08a701d30516ce600f18e8e7febd2d939f76a5f25b4d4
size 169237014

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddda8eef9dbf5a90ebff67a5ec7bf54c63b2b3ee664ca7da146c9d53bafad23d
size 169255945

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31b067d16c7c9538d99db1fb9aee79d0e208a0173f1c5deb93aaaf96e66c5cca
size 11172351

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a44313209419f44cc293f1d08b545d81fd84672a0813d6e7d632a79b19cb0efa
size 29189918

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Aug 6 08:24:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Update to OpenJDK 17.0.12 with OpenJ9 0.46.0 virtual machine
- Including Oracle July 2024 CPU changes
* CVE-2024-21131 (bsc#1228046), CVE-2024-21138 (bsc#1228047),
CVE-2024-21140 (bsc#1228048), CVE-2024-21147 (bsc#1228052),
CVE-2024-21145 (bsc#1228051)
* OpenJ9 changes, see
https://www.eclipse.org/openj9/docs/version0.46/
- Removed patch:
* openj9-no-narrowing.patch
+ fixed in upstream code
-------------------------------------------------------------------
Thu May 23 17:42:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -31,18 +31,18 @@
# Standard JPackage naming and versioning defines.
%global featurever 17
%global interimver 0
%global updatever 11
%global buildver 9
%global updatever 12
%global buildver 7
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive
%global root_revision 5d7d758b682a0b0f3fd0ee54713abc8f749fc86d
%global root_branch v0.44.0-release
%global root_revision 784bd66222d3a9569eff3335f33b48b5e611b518
%global root_branch v0.46.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision 254af5a0452934f62e3253c5565b183c682d3495
%global omr_branch v0.44.0-release
%global omr_revision 840a9adba4548aa546e36c97a1150b7306a7e07b
%global omr_branch v0.46.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision b0699311c7d9341f3d0ebf9a7a4b5546a7ca7004
%global openj9_branch v0.44.0-release
%global openj9_tag openj9-0.44.0
%global openj9_revision 1a6f6128aa2f639de1e33cae77a31f474ba6b1a9
%global openj9_branch v0.46.0-release
%global openj9_tag openj9-0.46.0
# priority must be 6 digits in total
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
%global priority 2701
@ -110,8 +110,6 @@ Patch3: java-atk-wrapper-security.patch
Patch4: libdwarf-fix.patch
# Allow multiple initialization of PKCS11 libraries
Patch5: multiple-pkcs11-library-init.patch
# Fix narrowing conversion error
Patch6: openj9-no-narrowing.patch
# Fix build with older version of openssl
Patch7: openj9-openssl.patch
# Fix: implicit-pointer-decl
@ -365,7 +363,6 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 13 -p1
@ -841,9 +838,6 @@ fi
%{_jvmdir}/%{sdkdir}/lib/libprefs.so
%{_jvmdir}/%{sdkdir}/lib/librmi.so
%{_jvmdir}/%{sdkdir}/lib/libsctp.so
%ifarch x86_64
%{_jvmdir}/%{sdkdir}/lib/libjsvml.so
%endif
%{_jvmdir}/%{sdkdir}/lib/libsyslookup.so
%{_jvmdir}/%{sdkdir}/lib/libverify.so
%{_jvmdir}/%{sdkdir}/lib/libzip.so

View File

@ -1,21 +0,0 @@
--- a/openj9/runtime/compiler/env/j9methodServer.cpp
+++ b/openj9/runtime/compiler/env/j9methodServer.cpp
@@ -2634,7 +2634,7 @@ TR_ResolvedRelocatableJ9JITServerMethod::validateMethodFieldAttributes(const TR_
return equal;
}
-TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, uintptr_t cpIndex)
+TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, int32_t cpIndex)
: TR_J9Method()
{
TR_ASSERT(cpIndex != -1, "cpIndex shouldn't be -1");
--- a/openj9/runtime/compiler/env/j9methodServer.hpp
+++ b/openj9/runtime/compiler/env/j9methodServer.hpp
@@ -326,6 +326,6 @@ protected:
class TR_J9ServerMethod : public TR_J9Method
{
public:
- TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, uintptr_t cpIndex);
+ TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, int32_t cpIndex);
};
#endif // J9METHODSERVER_H