diff --git a/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga.tar.gz b/dragonwell-extended-11.0.18.14_jdk-11.0.18-ga.tar.gz similarity index 87% rename from dragonwell-extended-11.0.17.13_jdk-11.0.17-ga.tar.gz rename to dragonwell-extended-11.0.18.14_jdk-11.0.18-ga.tar.gz index 3da0a54b5393d142096b62c63531e422591cd32d..effa9277aa61108f7c9354cc7e4f6cd2e0ece7d3 100644 Binary files a/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga.tar.gz and b/dragonwell-extended-11.0.18.14_jdk-11.0.18-ga.tar.gz differ diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec index abaf118e19d3581a4d71aec872c2ddcbed94a33f..8cf832a79c3ac395bb3dde31b48737166205cd0e 100644 --- a/java-11-alibaba-dragonwell.spec +++ b/java-11-alibaba-dragonwell.spec @@ -15,9 +15,9 @@ %global major_ver 11 %global inter_ver 0 -%global update_ver 17 -%global patch_ver 13 -%global alibaba_ver 8 +%global update_ver 18 +%global patch_ver 14 +%global alibaba_ver 9 %global build_ver 8 %global dragonwell_ver %{major_ver}.%{inter_ver}.%{update_ver} %global newdragonwellver %{major_ver}.%{inter_ver}.%{update_ver}.%{patch_ver} @@ -218,8 +218,6 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for Patch4: pr3694-rh1340845-support_fedora_rhel_system_crypto_policy.patch # PR3695: Allow use of system crypto policy to be disabled by the user Patch7: pr3695-toggle_system_crypto_policy.patch -# JDK-8275535, RH2053256: Retrying a failed authentication on multiple LDAP servers can lead to users blocked -Patch8: jdk8275535-rh2053256-ldap_auth.patch BuildArch: x86_64 aarch64 @@ -677,7 +675,6 @@ pushd %{top_level_dir_name} %patch1009 -p1 %patch1011 -p1 %patch1015 -p1 -%patch8 -p1 popd # Extract systemtap tapsets tar --strip-components=1 -x -I xz -f %{SOURCE11} @@ -2161,6 +2158,9 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %endif %changelog +* Tue Mar 14 2023 zhaoyuanfang - 2:11.0.18.14.9-2 +- update to 11.0.18.14.9 + * Thu Jan 19 2023 happy_orange - 2:11.0.17.13.8-2 - add epoch to make the dragonwell becomes the default java diff --git a/jdk8275535-rh2053256-ldap_auth.patch b/jdk8275535-rh2053256-ldap_auth.patch deleted file mode 100644 index 7a25e4bc3087a95c1a2d1de6312907078ce31925..0000000000000000000000000000000000000000 --- a/jdk8275535-rh2053256-ldap_auth.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git openjdk.orig/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java openjdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java -index 300f3682655..6f3eb6c450b 100644 ---- openjdk.orig/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java -+++ openjdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java -@@ -226,6 +226,10 @@ final public class LdapCtxFactory implements ObjectFactory, InitialContextFactor - ctx = getLdapCtxFromUrl( - r.getDomainName(), url, new LdapURL(u), env); - return ctx; -+ } catch (AuthenticationException e) { -+ // do not retry on a different endpoint to avoid blocking -+ // the user if authentication credentials are wrong. -+ throw e; - } catch (NamingException e) { - // try the next element - lastException = e; -@@ -278,6 +282,10 @@ final public class LdapCtxFactory implements ObjectFactory, InitialContextFactor - for (String u : urls) { - try { - return getUsingURL(u, env); -+ } catch (AuthenticationException e) { -+ // do not retry on a different URL to avoid blocking -+ // the user if authentication credentials are wrong. -+ throw e; - } catch (NamingException e) { - ex = e; - }