From cec6e9e9cba1098e6a0727c0b01486b4862e80a5 Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Tue, 7 Nov 2023 09:53:58 +0800 Subject: [PATCH 1/2] [a23] Change openjdk_revision --- download | 3 +-- java-1.8.0-openjdk.spec | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/download b/download index edf0f82..ce783ef 100644 --- a/download +++ b/download @@ -1,3 +1,2 @@ -b52d6123ca1d7f61a63553fa9860709e openjdk-shenandoah-jdk8u-shenandoah-jdk8u362-b09-4curve.tar.xz +e6158e3dc90222cf4685c9966992e977 openjdk-shenandoah-jdk8u-shenandoah-jdk8u372-b07-4curve.tar.xz 870d829d8e1c38e251cc7498032a768a tapsets-icedtea-3.15.0.tar.xz -cb2a3885cf55f13058aaee2fc157a7e8 loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index bbca3cd..20efb64 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -13,7 +13,7 @@ # Only produce a release build on x86_64: # $ rhpkg mockbuild --without slowdebug --without fastdebug # -%global anolis_release 1 +%global anolis_release 2 # Enable fastdebug builds by default on relevant arches. %bcond_without fastdebug # Enable slowdebug builds by default on relevant arches. @@ -247,7 +247,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project openjdk %global shenandoah_repo shenandoah-jdk8u -%global openjdk_revision jdk8u362-b09 +%global openjdk_revision jdk8u372-b07 %global shenandoah_revision shenandoah-%{openjdk_revision} # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} @@ -2643,5 +2643,8 @@ cjc.mainProgram(args) %endif %changelog +* Tue Nov 07 2023 Leslie Zhai - 1:1.8.0.372.b07-2 +- Change openjdk_revision + * Fri Oct 27 2023 Leslie Zhai - 1:1.8.0.372.b07-1 - Init LoongArch64 -- Gitee From b65581472b0f0e19cf07203f8e7c0725cb82bb2c Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Tue, 7 Nov 2023 10:07:12 +0800 Subject: [PATCH 2/2] Drop jdk8275535-rh2053256-ldap_auth.patch --- java-1.8.0-openjdk.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 20efb64..c161aea 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1337,8 +1337,6 @@ Patch539: pr2888-rh2055274-support_system_cacerts-%{cacertsver}.patch Patch600: rh1750419-redhat_alt_java.patch # JDK-8281098, PR3836: Extra compiler flags not passed to adlc build Patch112: jdk8281098-pr3836-pass_compiler_flags_to_adlc.patch -# JDK-8275535, RH2053256: Retrying a failed authentication on multiple LDAP servers can lead to users blocked -Patch113: jdk8275535-rh2053256-ldap_auth.patch ############################################# # @@ -1826,7 +1824,6 @@ sh %{SOURCE12} %patch574 %patch112 %patch581 -%patch113 pushd %{top_level_dir_name} # Add crypto policy and FIPS support @@ -2645,6 +2642,7 @@ cjc.mainProgram(args) %changelog * Tue Nov 07 2023 Leslie Zhai - 1:1.8.0.372.b07-2 - Change openjdk_revision +- Drop jdk8275535-rh2053256-ldap_auth.patch * Fri Oct 27 2023 Leslie Zhai - 1:1.8.0.372.b07-1 - Init LoongArch64 -- Gitee