This commit is contained in:
parent
601774ab5f
commit
19560ca567
18
fips.patch
18
fips.patch
@ -120,7 +120,7 @@
|
||||
|
||||
################################################################################
|
||||
# Determine which libraries are needed for this configuration
|
||||
@@ -134,6 +135,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
@@ -128,6 +129,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
LIB_SETUP_X11
|
||||
|
||||
LIB_TESTS_SETUP_GTEST
|
||||
@ -130,7 +130,7 @@
|
||||
BASIC_JDKLIB_LIBS_TARGET=""
|
||||
--- a/make/autoconf/spec.gmk.in
|
||||
+++ b/make/autoconf/spec.gmk.in
|
||||
@@ -873,6 +873,11 @@ PANDOC_MARKDOWN_FLAG := @PANDOC_MARKDOWN_FLAG@
|
||||
@@ -831,6 +831,11 @@ PANDOC_MARKDOWN_FLAG := @PANDOC_MARKDOWN_FLAG@
|
||||
# Libraries
|
||||
#
|
||||
|
||||
@ -139,9 +139,9 @@
|
||||
+NSS_CFLAGS:=@NSS_CFLAGS@
|
||||
+NSS_LIBDIR:=@NSS_LIBDIR@
|
||||
+
|
||||
USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
|
||||
LCMS_CFLAGS:=@LCMS_CFLAGS@
|
||||
LCMS_LIBS:=@LCMS_LIBS@
|
||||
USE_EXTERNAL_LCMS := @USE_EXTERNAL_LCMS@
|
||||
LCMS_CFLAGS := @LCMS_CFLAGS@
|
||||
LCMS_LIBS := @LCMS_LIBS@
|
||||
--- a/make/modules/java.base/Gendata.gmk
|
||||
+++ b/make/modules/java.base/Gendata.gmk
|
||||
@@ -98,3 +98,17 @@ $(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS_JDK) $(GENDATA_JAVA_SECURITY_SRC) $(REST
|
||||
@ -164,7 +164,7 @@
|
||||
+################################################################################
|
||||
--- a/make/modules/java.base/Lib.gmk
|
||||
+++ b/make/modules/java.base/Lib.gmk
|
||||
@@ -163,6 +163,29 @@ ifeq ($(call isTargetOsType, unix), true)
|
||||
@@ -164,6 +164,29 @@ ifeq ($(call isTargetOsType, unix), true)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -689,7 +689,7 @@
|
||||
}
|
||||
--- a/src/java.base/share/classes/module-info.java
|
||||
+++ b/src/java.base/share/classes/module-info.java
|
||||
@@ -158,6 +158,7 @@
|
||||
@@ -168,6 +168,7 @@
|
||||
java.naming,
|
||||
java.rmi,
|
||||
jdk.charsets,
|
||||
@ -1866,7 +1866,7 @@
|
||||
private static final String PUBLIC = "public";
|
||||
private static final String PRIVATE = "private";
|
||||
private static final String SECRET = "secret";
|
||||
@@ -401,8 +406,10 @@ static PrivateKey privateKey(Session session, long keyID, String algorithm,
|
||||
@@ -395,8 +400,10 @@ static PrivateKey privateKey(Session session, long keyID, String algorithm,
|
||||
new CK_ATTRIBUTE(CKA_EXTRACTABLE),
|
||||
});
|
||||
|
||||
@ -1879,7 +1879,7 @@
|
||||
|
||||
return switch (algorithm) {
|
||||
case "RSA" -> P11RSAPrivateKeyInternal.of(session, keyID, algorithm,
|
||||
@@ -454,7 +461,8 @@ private static class P11SecretKey extends P11Key implements SecretKey {
|
||||
@@ -448,7 +455,8 @@ private static class P11SecretKey extends P11Key implements SecretKey {
|
||||
|
||||
public String getFormat() {
|
||||
token.ensureValid();
|
||||
|
@ -33,7 +33,7 @@
|
||||
# Standard JPackage naming and versioning defines.
|
||||
%global featurever 22
|
||||
%global interimver 0
|
||||
#global updatever 1
|
||||
%global updatever 1
|
||||
%global buildver 8
|
||||
%global openjdk_repo jdk22u
|
||||
%global openjdk_tag jdk-%{featurever}%{?updatever:.%{interimver}.%{updatever}}%{?patchver:.%{patchver}}+%{buildver}
|
||||
@ -923,6 +923,7 @@ fi
|
||||
%{_jvmdir}/%{sdkdir}/lib/libsystemconf.so
|
||||
%ifarch x86_64
|
||||
%{_jvmdir}/%{sdkdir}/lib/libjsvml.so
|
||||
%{_jvmdir}/%{sdkdir}/lib/libsimdsort.so
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir}/lib/libsyslookup.so
|
||||
%{_jvmdir}/%{sdkdir}/lib/libverify.so
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3abc5e4cb673dd241e2471481cd2724e83242124ebe3ef36f132d05803dda876
|
||||
size 112306180
|
3
jdk-22.0.1+8.tar.gz
Normal file
3
jdk-22.0.1+8.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0cfb7f2799384df43a9832df638f31c9be33a4a8650f8478f35272ee70dd7173
|
||||
size 112015695
|
@ -1,6 +1,6 @@
|
||||
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||
@@ -589,7 +589,7 @@
|
||||
@@ -591,7 +591,7 @@
|
||||
"Initial heap size (in bytes); zero means use ergonomics") \
|
||||
constraint(InitialHeapSizeConstraintFunc,AfterErgo) \
|
||||
\
|
||||
|
@ -52,14 +52,14 @@
|
||||
+])
|
||||
--- a/make/autoconf/spec.gmk.in
|
||||
+++ b/make/autoconf/spec.gmk.in
|
||||
@@ -805,6 +805,7 @@ TAR_SUPPORTS_TRANSFORM := @TAR_SUPPORTS_TRANSFORM@
|
||||
@@ -814,6 +814,7 @@ TAR_SUPPORTS_TRANSFORM := @TAR_SUPPORTS_TRANSFORM@
|
||||
# Build setup
|
||||
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
|
||||
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
|
||||
USE_EXTERNAL_LIBJPEG := @USE_EXTERNAL_LIBJPEG@
|
||||
USE_EXTERNAL_LIBGIF := @USE_EXTERNAL_LIBGIF@
|
||||
+USE_EXTERNAL_LIBPCSCLITE:=@USE_EXTERNAL_LIBPCSCLITE@
|
||||
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
|
||||
LIBZ_CFLAGS:=@LIBZ_CFLAGS@
|
||||
LIBZ_LIBS:=@LIBZ_LIBS@
|
||||
USE_EXTERNAL_LIBZ := @USE_EXTERNAL_LIBZ@
|
||||
LIBZ_CFLAGS := @LIBZ_CFLAGS@
|
||||
LIBZ_LIBS := @LIBZ_LIBS@
|
||||
--- a/make/modules/java.smartcardio/Lib.gmk
|
||||
+++ b/make/modules/java.smartcardio/Lib.gmk
|
||||
@@ -30,12 +30,12 @@ include LibCommon.gmk
|
||||
|
Loading…
x
Reference in New Issue
Block a user