packages/openjdk-17
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!22 I6FAU5: Synchronize the master code to the branch to solve the problem of CVE.

Browse Source 
From: @kuenking111 
Reviewed-by: @jvmboy 
Signed-off-by: @jvmboy
This commit is contained in:
openeuler-ci-bot 2023-02-17 02:18:16 +00:00 committed by Gitee
commit 2caf8ca8d1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
add-version-txt.patch
View File

@ -13,7 +13,7 @@ index 000000000..b717bafbe
--- /dev/null --- /dev/null
+++ b/version.txt +++ b/version.txt
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+17.0.5.0.13 +17.0.6.0.13
-- --
2.19.0 2.19.0

BIN
jdk-updates-jdk17u-jdk-17.0.5+8.tar.gz → jdk-updates-jdk17u-jdk-17.0.6+9.tar.gz
View File

Binary file not shown.

29
openjdk-17.spec
View File

@ -155,7 +155,7 @@
# Used via new version scheme. JDK 17 was # Used via new version scheme. JDK 17 was
# GA'ed in March 2021 => 21.9 # GA'ed in March 2021 => 21.9
%global vendor_version_string 21.9 %global vendor_version_string 21.9
%global securityver 5 %global securityver 6
# buildjdkver is usually same as %%{majorver}, # buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1, # but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place # and this it is better to change it here, on single place
@ -175,7 +175,7 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 8 %global buildver 9
# 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 # 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 %if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -885,7 +885,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 2 Release: 0
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
@ -970,16 +970,12 @@ Patch15: Delete-expired-certificate.patch
Patch16: Clean-up-JDK17-codeDEX-fix-Non-static-numa_node_dist.patch Patch16: Clean-up-JDK17-codeDEX-fix-Non-static-numa_node_dist.patch
# 17.0.4 # 17.0.4
Patch17: 8290705_fix_StringConcat_validate_mem_flow_asserts_with_unexpected_userStoreI.patch
Patch18: Apply-TBI-to-ZGC-of-JDK17.patch Patch18: Apply-TBI-to-ZGC-of-JDK17.patch
# 17.0.5 # 17.0.5
Patch19: 8253495-CDS-generates-non-deterministic-outpu.patch Patch19: 8253495-CDS-generates-non-deterministic-outpu.patch
Patch20: 8296480-Fix-the-problem-that-the-TestPolicy.j.patch
Patch21: 8296485-BuildEEBasicConstraints.java-test-fai.patch
Patch22: Fast-Serializer.patch Patch22: Fast-Serializer.patch
Patch23: Apply-TBI-barrier-patch-to-C1.patch Patch23: Apply-TBI-barrier-patch-to-C1.patch
Patch24: Add-Fast-serializer-testcase.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -1213,8 +1209,10 @@ pushd %{top_level_dir_name}
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1
%patch22 -p1
%patch23 -p1
popd # openjdk popd # openjdk
# Extract systemtap tapsets # Extract systemtap tapsets
@ -1760,17 +1758,22 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Tue Jan 10 2023 neu-mobi <liuyulong.work@qq.com> - 1:17.0.5.8-0.2 * Sat Jan 28 2023 kuenking111 <wangkun49@huawei.com> - 1:17.0.6.9-0.rolling
- modified add-version-txt.patch
- del 8290705_fix_StringConcat_validate_mem_flow_asserts_with_unexpected_userStoreI.patch
- del 8296480-Fix-the-problem-that-the-TestPolicy.j.patch
- del 8296485-BuildEEBasicConstraints.java-test-fai.patch
- del Add-Fast-serializer-testcase.patch
- add jdk17.0.6-ga
* Thu Jan 5 2023 neu-mobi <liuyulong.work@qq.com> - 1:17.0.5.8-0.1
- add 8253495-CDS-generates-non-deterministic-outpu.patch - add 8253495-CDS-generates-non-deterministic-outpu.patch
- add: 8296480-Fix-the-problem-that-the-TestPolicy.j.patch - add 8296480-Fix-the-problem-that-the-TestPolicy.j.patch
- add 8296485-BuildEEBasicConstraints.java-test-fai.patch - add 8296485-BuildEEBasicConstraints.java-test-fai.patch
- add Fast-Serializer.patch - add Fast-Serializer.patch
- add Apply-TBI-barrier-patch-to-C1.patch - add Apply-TBI-barrier-patch-to-C1.patch
- add Add-Fast-serializer-testcase.patch - add Add-Fast-serializer-testcase.patch
* Wed Dec 17 2022 kuenking111 <wangkun49@huawei.com> - 1:17.0.5.8-0.1
- fix rpm build failed
* Wed Oct 19 2022 kuenking111 <wangkun49@huawei.com> - 1:17.0.5.8-0.rolling * Wed Oct 19 2022 kuenking111 <wangkun49@huawei.com> - 1:17.0.5.8-0.rolling
- modified add-version-txt.patch - modified add-version-txt.patch
- add jdk17.0.5-ga - add jdk17.0.5-ga