This commit is contained in:
parent
f3e5179cf6
commit
6a32a44336
@ -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