- Update to jdk-14.0.2+12
- remove jdk8237879-make_4_3_build_fixes.patch - remove jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch - remove jdk8243059-build_fails_when_with_vendor_contains_comma.patch
This commit is contained in:
parent
72b7105847
commit
f6746a8420
@ -152,7 +152,7 @@
|
|||||||
# Used via new version scheme. JDK 14 was
|
# Used via new version scheme. JDK 14 was
|
||||||
# GA'ed in March 2020 => 20.3
|
# GA'ed in March 2020 => 20.3
|
||||||
%global vendor_version_string 20.3
|
%global vendor_version_string 20.3
|
||||||
%global securityver 1
|
%global securityver 2
|
||||||
# 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
|
||||||
@ -167,8 +167,8 @@
|
|||||||
%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 7
|
%global buildver 12
|
||||||
%global rpmrelease 1
|
%global rpmrelease 0
|
||||||
# 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} )
|
||||||
@ -963,33 +963,21 @@ Source14: TestECDSA.java
|
|||||||
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
|
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
|
||||||
|
|
||||||
# Ignore AWTError when assistive technologies are loaded
|
# Ignore AWTError when assistive technologies are loaded
|
||||||
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
|
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
|
||||||
# Restrict access to java-atk-wrapper classes
|
# Restrict access to java-atk-wrapper classes
|
||||||
Patch2: rh1648644-java_access_bridge_privileged_security.patch
|
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
|
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
|
||||||
# Follow system wide crypto policy RHBZ#1249083
|
# Follow system wide crypto policy RHBZ#1249083
|
||||||
Patch4: pr3183-rh1340845-support_system_crypto_policy.patch
|
Patch4: pr3183-rh1340845-support_system_crypto_policy.patch
|
||||||
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
# 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
|
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||||
|
|
||||||
|
|
||||||
#############################################
|
|
||||||
#
|
|
||||||
# OpenJDK patches appearing in 14.0.2
|
|
||||||
#
|
|
||||||
#############################################
|
|
||||||
|
|
||||||
# JDK-8237879: make 4.3 breaks build
|
|
||||||
Patch7: jdk8237879-make_4_3_build_fixes.patch
|
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
#
|
#
|
||||||
# OpenJDK patches in need of upstreaming
|
# OpenJDK patches in need of upstreaming
|
||||||
#
|
#
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
Patch8: jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
|
||||||
Patch9: jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch
|
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -1215,9 +1203,6 @@ pushd %{top_level_dir_name}
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
|
||||||
%patch8 -p1
|
|
||||||
%patch9 -p1
|
|
||||||
popd # openjdk
|
popd # openjdk
|
||||||
|
|
||||||
%patch1000
|
%patch1000
|
||||||
@ -1744,5 +1729,11 @@ require "copy_jdk_configs.lua"
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 1 2020 jdkboy <guoge1@huawei.com> - 1:14.0.2.12-1.rolling
|
||||||
|
- Update to jdk-14.0.2+12
|
||||||
|
- remove jdk8237879-make_4_3_build_fixes.patch
|
||||||
|
- remove jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch
|
||||||
|
- remove jdk8243059-build_fails_when_with_vendor_contains_comma.patch
|
||||||
|
|
||||||
* Tue Jun 16 2020 jdkboy <guoge1@huawei.com> - 1:14.0.1.7-1
|
* Tue Jun 16 2020 jdkboy <guoge1@huawei.com> - 1:14.0.1.7-1
|
||||||
- Initial load
|
- Initial load
|
||||||
|
|||||||
Binary file not shown.
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357
|
SHA512 (jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357
|
||||||
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
|
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
|
||||||
|
|||||||
@ -34,8 +34,7 @@ fi
|
|||||||
# OpenJDK from Shenandoah project
|
# OpenJDK from Shenandoah project
|
||||||
export PROJECT_NAME="jdk-updates"
|
export PROJECT_NAME="jdk-updates"
|
||||||
export REPO_NAME="jdk14u"
|
export REPO_NAME="jdk14u"
|
||||||
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
|
export VERSION="jdk-14.0.2-ga"
|
||||||
export VERSION="jdk-14.0.1+7"
|
|
||||||
export COMPRESSION=xz
|
export COMPRESSION=xz
|
||||||
# unset tapsets overrides
|
# unset tapsets overrides
|
||||||
export OPENJDK_URL=""
|
export OPENJDK_URL=""
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user