Accepting request 1244210 from Java:Factory
January 2025 CPU OBS-URL: https://build.opensuse.org/request/show/1244210 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-17-openj9?expand=0&rev=17
This commit is contained in:
commit
b0c4b41c98
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38371f6ef59ba89f89135dd5579d0952cc4d28adb452c25c194a248da70dc5fc
|
||||
size 29265781
|
3
3c3d179854a524d7f95225999169ee09fda46033.zip
Normal file
3
3c3d179854a524d7f95225999169ee09fda46033.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df644d51276ffeeb66096b374ca2693b1ffdc384b771bea376640e00f33cbf42
|
||||
size 29523888
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ddda8eef9dbf5a90ebff67a5ec7bf54c63b2b3ee664ca7da146c9d53bafad23d
|
||||
size 169255945
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31b067d16c7c9538d99db1fb9aee79d0e208a0173f1c5deb93aaaf96e66c5cca
|
||||
size 11172351
|
3
cbbc8b94a625528b517fc01a8050d5f14c893962.zip
Normal file
3
cbbc8b94a625528b517fc01a8050d5f14c893962.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59c671e9b369d5e345450a76b217ac18f19724010e699d5396ef10e5926f7246
|
||||
size 170203900
|
3
e49875871c2862e0d132e3695d55273bfbac08b6.zip
Normal file
3
e49875871c2862e0d132e3695d55273bfbac08b6.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9630132f3973f2e44cf589e93ba466dda5350856ee93fbcfa8e59d515938bc31
|
||||
size 11213109
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 7 16:57:24 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to OpenJDK 17.0.14 with OpenJ9 0.49.0 virtual machine
|
||||
- Including Oracle October 2024 and January 2025 CPU changes
|
||||
* CVE-2024-21208 (bsc#1231702), CVE-2024-21210 (bsc#1231711),
|
||||
CVE-2024-21217 (bsc#1231716), CVE-2024-21235 (bsc#1231719),
|
||||
CVE-2025-21502 (bsc#1236278)
|
||||
* OpenJ9 changes, see
|
||||
https://www.eclipse.org/openj9/docs/version0.49/
|
||||
- Added patch:
|
||||
* openssl-OSSL_LIB_CTX.patch
|
||||
+ allow building with openssl < 3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 5 12:25:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
|
@ -31,18 +31,18 @@
|
||||
# Standard JPackage naming and versioning defines.
|
||||
%global featurever 17
|
||||
%global interimver 0
|
||||
%global updatever 12
|
||||
%global updatever 14
|
||||
%global buildver 7
|
||||
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive
|
||||
%global root_revision 784bd66222d3a9569eff3335f33b48b5e611b518
|
||||
%global root_branch v0.46.0-release
|
||||
%global root_revision cbbc8b94a625528b517fc01a8050d5f14c893962
|
||||
%global root_branch v0.49.0-release
|
||||
%global omr_repository https://github.com/eclipse/openj9-omr/archive
|
||||
%global omr_revision 840a9adba4548aa546e36c97a1150b7306a7e07b
|
||||
%global omr_branch v0.46.0-release
|
||||
%global omr_revision e49875871c2862e0d132e3695d55273bfbac08b6
|
||||
%global omr_branch v0.49.0-release
|
||||
%global openj9_repository https://github.com/eclipse/openj9/archive
|
||||
%global openj9_revision 1a6f6128aa2f639de1e33cae77a31f474ba6b1a9
|
||||
%global openj9_branch v0.46.0-release
|
||||
%global openj9_tag openj9-0.46.0
|
||||
%global openj9_revision 3c3d179854a524d7f95225999169ee09fda46033
|
||||
%global openj9_branch v0.49.0-release
|
||||
%global openj9_tag openj9-0.49.0
|
||||
# priority must be 6 digits in total
|
||||
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
|
||||
%global priority 2701
|
||||
@ -111,6 +111,7 @@ Patch4: libdwarf-fix.patch
|
||||
# Allow multiple initialization of PKCS11 libraries
|
||||
Patch5: multiple-pkcs11-library-init.patch
|
||||
# Fix build with older version of openssl
|
||||
Patch6: openssl-OSSL_LIB_CTX.patch
|
||||
Patch7: openj9-openssl.patch
|
||||
# Fix: implicit-pointer-decl
|
||||
Patch13: implicit-pointer-decl.patch
|
||||
@ -362,6 +363,7 @@ 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
|
||||
|
||||
@ -417,6 +419,7 @@ bash configure \
|
||||
--disable-warnings-as-errors-omr \
|
||||
--disable-warnings-as-errors-openj9 \
|
||||
--disable-keep-packaged-modules \
|
||||
--enable-jfr \
|
||||
--with-debug-level=%{debugbuild} \
|
||||
--with-conf-name=%{debugbuild} \
|
||||
--with-zlib=system \
|
||||
@ -742,6 +745,7 @@ fi
|
||||
%dir %{_jvmdir}/%{sdkdir}/lib/desktop
|
||||
%dir %{_jvmdir}/%{sdkdir}/lib/security
|
||||
%dir %{_jvmdir}/%{sdkdir}/lib/j9vm
|
||||
%dir %{_jvmdir}/%{sdkdir}/lib/jfr
|
||||
%dir %{_jvmdir}/%{sdkdir}/conf
|
||||
%dir %{_jvmdir}/%{sdkdir}/conf/security
|
||||
%dir %{_jvmdir}/%{sdkdir}/conf/security/policy
|
||||
@ -754,6 +758,7 @@ fi
|
||||
|
||||
%{_jvmdir}/%{sdkdir}/release
|
||||
%{_jvmdir}/%{sdkdir}/bin/java
|
||||
%{_jvmdir}/%{sdkdir}/bin/jfr
|
||||
%{_jvmdir}/%{sdkdir}/bin/jitserver
|
||||
%{_jvmdir}/%{sdkdir}/bin/keytool
|
||||
%{_jvmdir}/%{sdkdir}/bin/rmiregistry
|
||||
@ -804,6 +809,8 @@ fi
|
||||
%{_jvmdir}/%{sdkdir}/lib/desktop/jconsole.desktop
|
||||
%{_jvmdir}/%{sdkdir}/lib/java*.properties
|
||||
%{_jvmdir}/%{sdkdir}/lib/jexec
|
||||
%{_jvmdir}/%{sdkdir}/lib/jfr/default.jfc
|
||||
%{_jvmdir}/%{sdkdir}/lib/jfr/profile.jfc
|
||||
%{_jvmdir}/%{sdkdir}/lib/jrt-fs.jar
|
||||
%{_jvmdir}/%{sdkdir}/lib/jspawnhelper
|
||||
%{_jvmdir}/%{sdkdir}/lib/jvm.cfg
|
||||
@ -840,6 +847,7 @@ fi
|
||||
%{_jvmdir}/%{sdkdir}/lib/libsyslookup.so
|
||||
%{_jvmdir}/%{sdkdir}/lib/libverify.so
|
||||
%{_jvmdir}/%{sdkdir}/lib/libzip.so
|
||||
%{_jvmdir}/%{sdkdir}/lib/metadata.blob
|
||||
%{_jvmdir}/%{sdkdir}/lib/modules
|
||||
#%{_jvmdir}/%{sdkdir}/lib/openj9-notices.html
|
||||
%{_jvmdir}/%{sdkdir}/lib/options.default
|
||||
@ -854,6 +862,7 @@ fi
|
||||
%{_jvmdir}/%{sdkdir}/lib/security/public_suffix_list.dat
|
||||
|
||||
%{_mandir}/man1/java-%{sdklnk}.1%{?ext_man}
|
||||
%{_mandir}/man1/jfr-%{sdklnk}.1%{?ext_man}
|
||||
%{_mandir}/man1/keytool-%{sdklnk}.1%{?ext_man}
|
||||
%{_mandir}/man1/rmiregistry-%{sdklnk}.1%{?ext_man}
|
||||
|
||||
|
15
openssl-OSSL_LIB_CTX.patch
Normal file
15
openssl-OSSL_LIB_CTX.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c b/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
|
||||
index 2e53d0a8e1e..1226f96f1f8 100644
|
||||
--- a/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
|
||||
+++ b/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
|
||||
@@ -64,6 +64,10 @@
|
||||
# include <pthread.h>
|
||||
#endif /* defined(WINDOWS) */
|
||||
|
||||
+#if OPENSSL_VERSION_MAJOR < 3
|
||||
+typedef struct ossl_lib_ctx_st OSSL_LIB_CTX;
|
||||
+#endif
|
||||
+
|
||||
/* Header for RSA algorithm using 1.0.2 OpenSSL. */
|
||||
int OSSL102_RSA_set0_key(RSA *, BIGNUM *, BIGNUM *, BIGNUM *);
|
||||
int OSSL102_RSA_set0_factors(RSA *, BIGNUM *, BIGNUM *);
|
Loading…
x
Reference in New Issue
Block a user