!22 update to jdk21.0.4+7
From: @Autistic_boyya Reviewed-by: @kuenking111 Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot
Gitee
commit
e5bc5ac731
File diff suppressed because it is too large
Load Diff
27
add-downgrade-the-glibc-symbol-of-fcntl.patch
Normal file
27
add-downgrade-the-glibc-symbol-of-fcntl.patch
Normal file
@ -0,0 +1,27 @@
|
||||
Subject: add downgrade the glibc symbol of fcntl
|
||||
|
||||
---
|
||||
src/hotspot/os/linux/os_linux.cpp | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
|
||||
index aa8be1d89..0aa9b57d8 100644
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -127,6 +127,13 @@
|
||||
#include <sched.h>
|
||||
#endif
|
||||
|
||||
+#if defined(AARCH64)
|
||||
+ __asm__(".symver fcntl64,fcntl@GLIBC_2.17");
|
||||
+#elif defined(AMD64)
|
||||
+ __asm__(".symver fcntl64,fcntl@GLIBC_2.2.5");
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
// if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling
|
||||
// getrusage() is prepared to handle the associated failure.
|
||||
#ifndef RUSAGE_THREAD
|
||||
--
|
||||
2.19.1
|
||||
|
||||
Binary file not shown.
@ -158,7 +158,7 @@
|
||||
# Used via new version scheme. JDK 19 was
|
||||
# GA'ed in March 2022 => 22.3
|
||||
%global vendor_version_string BiSheng
|
||||
%global securityver 2
|
||||
%global securityver 4
|
||||
# buildjdkver is usually same as %%{majorver},
|
||||
# but in time of bootstrap of next jdk, it is majorver-1,
|
||||
# and this it is better to change it here, on single place
|
||||
@ -178,7 +178,7 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 12
|
||||
%global buildver 7
|
||||
%global rpmrelease 1
|
||||
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
@ -897,7 +897,7 @@ Name: java-21-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
# This package needs `.rolling` as part of Release so as to not conflict on install with
|
||||
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
|
||||
Release: 2
|
||||
Release: 0
|
||||
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
@ -966,9 +966,7 @@ Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
|
||||
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
|
||||
# Restrict access to java-atk-wrapper classes
|
||||
Patch2: rh1648644-java_access_bridge_privileged_security.patch
|
||||
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
|
||||
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
||||
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -979,6 +977,7 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
|
||||
# 21.0.1
|
||||
Patch7: add-downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
|
||||
Patch8: add-downgrade-the-glibc-symver-of-memcpy.patch
|
||||
Patch9: add-downgrade-the-glibc-symbol-of-fcntl.patch
|
||||
|
||||
############################################
|
||||
#
|
||||
@ -1019,11 +1018,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: zip
|
||||
BuildRequires: javapackages-filesystem
|
||||
%ifarch loongarch64
|
||||
BuildRequires: java-21-openjdk-devel
|
||||
%else
|
||||
BuildRequires: java-latest-openjdk-devel
|
||||
%endif
|
||||
# Zero-assembler build requirement
|
||||
%ifnarch %{jit_arches}
|
||||
BuildRequires: libffi-devel
|
||||
@ -1217,10 +1212,9 @@ sh %{SOURCE12}
|
||||
pushd %{top_level_dir_name}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
popd # openjdk
|
||||
%endif
|
||||
|
||||
@ -1798,9 +1792,27 @@ cjc.mainProgram(arg)
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jun 21 2024 peng.zou <peng.zou@shingroup.cn> - 1:21.0.2.12-2
|
||||
* Thu Jul 18 2024 Autistic_boyya <wangzhongyi7@huawei.com> -1:21.0.4.7-rolling
|
||||
- update to jdk21.0.4-ga
|
||||
|
||||
* Tue Jul 16 2024 zhaosaisai <zhaosaisai@kylinos.cn> - 1:21.0.3.9-5
|
||||
- change to depend on the specific version
|
||||
|
||||
* Tue Jul 16 2024 songliyang <songliyang@kylinos.cn> - 1:21.0.3.9-4
|
||||
- null the arg to solve openjdk-headless install error
|
||||
|
||||
* Tue Jun 25 2024 peng.zou <peng.zou@shingroup.cn> - 1:21.0.3.9-3
|
||||
- init support of ppc64le
|
||||
|
||||
* Thu Jun 20 2024 aoqi <aoqi@loongson.cn> - 1:21.0.3.9-2
|
||||
- update LoongArch64 port to jdk21.0.3
|
||||
|
||||
* Thu Apr 25 2024 kuenking111 <wangkun49@huawei.com> - 1:21.0.3.9-1
|
||||
- add add-downgrade-the-glibc-symbol-of-fcntl.patch
|
||||
|
||||
* Mon Apr 22 2024 kuenking111 <wangkun49@huawei.com> - 1:21.0.3.9-0
|
||||
- upgrade to jdk21.0.23-ga
|
||||
|
||||
* Tue Feb 20 2024 Leslie Zhai <zhaixiang@loongson.cn> - 1:21.0.2.12-1
|
||||
- init support of LoongArch64
|
||||
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||
index bacff32efbc..ff7b3dcc81c 100644
|
||||
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||
+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||
@@ -46,8 +46,8 @@ class PlatformPCSC {
|
||||
|
||||
private static final String PROP_NAME = "sun.security.smartcardio.library";
|
||||
|
||||
- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
||||
- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
||||
+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
||||
+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
||||
private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
||||
|
||||
PlatformPCSC() {
|
||||
@ -1,19 +0,0 @@
|
||||
Remove uses of FAR in jpeg code
|
||||
|
||||
Upstream libjpeg-trubo removed the (empty) FAR macro:
|
||||
http://sourceforge.net/p/libjpeg-turbo/code/1312/
|
||||
|
||||
Adjust our code to not use the undefined FAR macro anymore.
|
||||
|
||||
diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
|
||||
--- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
|
||||
+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
|
||||
@@ -1385,7 +1385,7 @@
|
||||
/* and fill it in */
|
||||
dst_ptr = icc_data;
|
||||
for (seq_no = first; seq_no < last; seq_no++) {
|
||||
- JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
|
||||
+ JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
|
||||
unsigned int length =
|
||||
icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user