diff --git a/0001-add-abstract-method-for-class-JSSUtil.patch b/0001-add-abstract-method-for-class-JSSUtil.patch deleted file mode 100644 index f726bc3315ccc4be7f145f565638e2dae1cdefdd..0000000000000000000000000000000000000000 --- a/0001-add-abstract-method-for-class-JSSUtil.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 2921cf92d8968fef21d3459523f0c469ac64089a Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Wed, 25 May 2022 16:47:46 +0800 -Subject: [PATCH] add abstract method for class JSSUtil - ---- - .../main/java/org/dogtagpki/tomcat/JSSUtil.java | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java -index 8370370..9c3326d 100644 ---- a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java -+++ b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java -@@ -19,6 +19,8 @@ - - package org.dogtagpki.tomcat; - -+import java.security.NoSuchAlgorithmException; -+ - import java.util.Arrays; - import java.util.Collections; - import java.util.HashSet; -@@ -28,6 +30,7 @@ import java.util.Set; - import javax.net.ssl.KeyManager; - import javax.net.ssl.KeyManagerFactory; - import javax.net.ssl.SSLEngine; -+import javax.net.ssl.SSLSessionContext; - import javax.net.ssl.TrustManager; - import javax.net.ssl.TrustManagerFactory; - -@@ -48,6 +51,7 @@ public class JSSUtil extends SSLUtilBase { - private Set protocols; - private Set ciphers; - -+ - public JSSUtil(SSLHostConfigCertificate cert) { - super(cert); - -@@ -95,13 +99,11 @@ public class JSSUtil extends SSLUtilBase { - return new TrustManager[] { new JSSNativeTrustManager() }; - } - -- @Override - public SSLContext createSSLContextInternal(List negotiableProtocols) throws Exception { - logger.debug("JSSUtil createSSLContextInternal(...) keyAlias=" + keyAlias); - return new JSSContext(keyAlias); - } - -- @Override - public boolean isTls13RenegAuthAvailable() { - logger.debug("JSSUtil: isTls13RenegAuthAvailable()"); - return true; -@@ -127,4 +129,14 @@ public class JSSUtil extends SSLUtilBase { - - return ciphers; - } -+ -+ @Override -+ public void configureSessionContext(SSLSessionContext sslSessionContext) { -+ logger.debug("JSSUtil: configureSessionContext"); -+ } -+ -+ @Override -+ public SSLContext createSSLContext(List negotiableProtocols) throws NoSuchAlgorithmException { -+ return new JSSContext(keyAlias); -+ } - } --- -2.27.0 - diff --git a/tomcatjss.spec b/tomcatjss.spec index 23f7ff4456d5914ade544d50ced9fa2d4d272355..744ef725bd66875e8a2b75403046aca1f09f4368 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -4,7 +4,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch Version: 8.1.0 -Release: 2 +Release: 3 Source: https://github.com/dogtagpki/tomcatjss/archive/refs/tags/v8.1.0.tar.gz BuildRequires: ant apache-commons-lang3 java-latest-openjdk-devel slf4j BuildRequires: slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7 @@ -12,8 +12,6 @@ Requires: apache-commons-lang3 java-latest-openjdk-headless jpackage-uti Conflicts: pki-base < 10.6.5 %define _sharedstatedir /var/lib -Patch0: 0001-add-abstract-method-for-class-JSSUtil.patch - %description Apache Tomcat of JSS Connector. @@ -50,6 +48,9 @@ export JAVA_HOME=/usr/lib/jvm/${home_path} %{_javadir}/* %changelog +* Wed Nov 13 2024 wangkai <13474090681@163.com> - 8.1.0-3 +- Fix build fail for tomcat upgrade + * Mon Nov 21 2022 wulei - 8.1.0-2 - Rectify the tomcatjss compilation failure caused by the openjdk-latest upgrade