From 7ac81066595484d9be1c5c336741ee7bf4879a37 Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Mon, 11 Nov 2024 04:14:25 +0000 Subject: [PATCH] Remove redundant patch to fix ci check --- ...5022-Incorrect-error-message-on-clie.patch | 20 ------------------- openjdk-21.spec | 5 ++++- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 Backport-JDK-8325022-Incorrect-error-message-on-clie.patch diff --git a/Backport-JDK-8325022-Incorrect-error-message-on-clie.patch b/Backport-JDK-8325022-Incorrect-error-message-on-clie.patch deleted file mode 100644 index 159f621..0000000 --- a/Backport-JDK-8325022-Incorrect-error-message-on-clie.patch +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Backport JDK-8325022 Incorrect error message on client authentication - ---- - .../classes/sun/security/ssl/CertificateMessage.java | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java -index 155cb4392..8c6ee9151 100644 ---- a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java -+++ b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it --- -2.33.0 - diff --git a/openjdk-21.spec b/openjdk-21.spec index 91cd6a0..d8fc046 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -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: 1 +Release: 2 # 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 @@ -1872,6 +1872,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Mon Nov 11 2024 Dingli Zhang - 1:21.0.5.11-2 +- Remove redundant patch to fix ci check + * Wed Nov 6 2024 Pan Xuefeng - 1:21.0.5.11-1 - update LoongArch64 port to 21.0.5 -- Gitee